shr.el: No need to declare `declare-function' since shr.el is for only Emacsen that...

dgnushack.el: Remove `(defvar iswitchb-temp-buflist)', that is effective only in a file it is referred to.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 42f0b87..384db33 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -130,7 +130,6 @@
 
 (eval-and-compile
   (unless (featurep 'xemacs)
-    (defvar iswitchb-temp-buflist)
     (defalias 'get-popup-menu-response 'ignore)
     (defalias 'event-object 'ignore)
     (autoload 'iswitchb-read-buffer "iswitchb")

diff --git a/lisp/shr.el b/lisp/shr.el
index a577474..cc3855b 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -30,10 +30,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile (require 'cl))
 (require 'browse-url)
 (unless (aref (char-category-set (make-char 'japanese-jisx0208 33 35)) ?>)