Move the `defvar's to the top level.

5 files changed, 45 insertions, 36 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88c099f68da..3fae8c6e91f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,13 @@
 
 2005-08-26  Juanma Barranquero  <lekktu@gmail.com>
 
+        * emerge.el:
+        * ibuffer.el:
+        * info-xref.el:
+        * obsolete/bg-mouse.el:
+        * obsolete/sun-curs.el:
+        * obsolete/swedish.el: Move the `defvar's to the top level.
+
         * smerge-mode.el (smerge-refined-change): Add :group.
 
 2005-08-25  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -10185,7 +10192,7 @@
 
 2005-01-21  Ren,Ai(B Kyllingstad  <listmailxemacs@kyllingstad.com>
 
-        * pcomplete.el: define pcomplete-read-event instead of read-event,
+        * pcomplete.el: Define pcomplete-read-event instead of read-event,
         since it's not a complete read-event implementation
 
 2005-01-20  Jay Belanger  <belanger@truman.edu>
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 1a9b196a764..18d64cf0a1c 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -138,27 +138,25 @@ should open up the purported top file and see what subfiles it says."
 ;; Some dynamic variables are used to share information with sub-functions
 ;; below.
 ;;
-(eval-when-compile
-  ;;
-  ;; info-xref-filename-header - a heading message for the current top-level
-  ;;     filename, or "" when it's been printed.
-  ;;
-  (defvar info-xref-xfile-alist)
-  ;;
-  ;; info-xref-good - count of good cross references.
-  ;;
-  (defvar info-xref-good)
-  ;;
-  ;; info-xref-bad - count of bad cross references.
-  ;;
-  (defvar info-xref-bad)
-  ;;
-  ;; info-xref-xfile-alist - indexed by "(foo)" with value nil or t according
-  ;;     to whether "(foo)" exists or not.  This is used to suppress duplicate
-  ;;     messages about foo not being available.  (Duplicates within one
-  ;;     top-level file that is.)
-  ;;
-  (defvar info-xref-filename-heading))
+;; info-xref-filename-header - a heading message for the current top-level
+;;     filename, or "" when it's been printed.
+;;
+(defvar info-xref-xfile-alist)
+;;
+;; info-xref-good - count of good cross references.
+;;
+(defvar info-xref-good)
+;;
+;; info-xref-bad - count of bad cross references.
+;;
+(defvar info-xref-bad)
+;;
+;; info-xref-xfile-alist - indexed by "(foo)" with value nil or t according
+;;     to whether "(foo)" exists or not.  This is used to suppress duplicate
+;;     messages about foo not being available.  (Duplicates within one
+;;     top-level file that is.)
+;;
+(defvar info-xref-filename-heading)
 
 (defun info-xref-check-list (filename-list)
   "Check external references in info documents in FILENAME-LIST."
diff --git a/lisp/obsolete/bg-mouse.el b/lisp/obsolete/bg-mouse.el
index 7bb378c544e..687619a051b 100644
--- a/lisp/obsolete/bg-mouse.el
+++ b/lisp/obsolete/bg-mouse.el
@@ -50,11 +50,12 @@
 ;;; semicolon screws up indenting, so use this instead
 (defconst semicolon ?\;)
 
-(eval-when-compile
-  (defvar bg-mouse-x) (defvar bg-mouse-y) (defvar bg-cursor-window)
-  ;; This variable does not exist since 1991, so it's a safe bet
-  ;; this package is not really used anymore.  Still...
-  (defvar mouse-map))
+(defvar bg-mouse-x)
+(defvar bg-mouse-y)
+(defvar bg-cursor-window)
+;; This variable does not exist since 1991, so it's a safe bet
+;; this package is not really used anymore.  Still...
+(defvar mouse-map)
 
 ;;;  Defuns:
 
diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el
index de372fe6836..769d4de868f 100644
--- a/lisp/obsolete/sun-curs.el
+++ b/lisp/obsolete/sun-curs.el
@@ -32,11 +32,15 @@
 ;;;
 ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <peck@sun.com>
 
-(eval-when-compile
-  (require 'cl)
-  (defvar *edit-icon*) (defvar char)
-  ;; These are from term/sun-mouse.el
-  (defvar *mouse-window*) (defvar *mouse-x*) (defvar *mouse-y*) (defvar menu))
+(eval-when-compile (require 'cl))
+
+(defvar *edit-icon*)
+(defvar char)
+;; These are from term/sun-mouse.el
+(defvar *mouse-window*)
+(defvar *mouse-x*)
+(defvar *mouse-y*)
+(defvar menu)
 
 (require 'sun-fns)
 
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index 5e1794705a9..65e109ec8b4 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -33,10 +33,9 @@
 
 (require 'latin-1)
 
-(eval-when-compile
-  (defvar news-inews-hook)
-  (defvar news-group-hook-alist)
-  (defvar mail-send-hook))
+(defvar mail-send-hook)
+(defvar news-group-hook-alist)
+(defvar news-inews-hook)
 
 (defvar swedish-re
   "[ \t\n]\\(och\\|att\\|en\\|{r\\|\\[R\\|p}\\|P\\]\\|som\\|det\\|av\\|den\\|f|r\\|F\\\\R\\)[ \t\n.,?!:;'\")}]"