From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 9 Nov 2000 23:05:07 +0000 (+0000)
Subject: (toplevel): Use byte-compiling-files-p
X-Git-Tag: emacs-pretest-21.0.90~179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=730c746cac7f9a817d543460fd5a11732f2f77af;p=emacs.git

(toplevel): Use byte-compiling-files-p
if it is there.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ef8a4e941c..c505059bc75 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2000-11-09  Gerd Moellmann  <gerd@gnu.org>
 
+	* simple.el (byte-compiling-files-p): New function.
+
+	* textmodes/ispell.el (toplevel): Use byte-compiling-files-p
+	if it is there.
+
+	* emacs-lisp/bytecomp.el (byte-compile-current-file): Bind it to
+	nil again.
+
 	* textmodes/ispell.el (ispell-library-path): Don't call
 	check-ispell-version when byte-compiling because that starts
 	an ispell process, and ispell might not be installed.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index fcb182c7842..77c98d9cf4d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -810,8 +810,9 @@ and added as a submenu of the \"Edit\" menu.")
        (not xemacsp)
        'reload))
 
-(defvar ispell-library-path (unless (boundp 'byte-compile-current-file)
-			      (check-ispell-version))
+(defvar ispell-library-path (if (or (not (fboundp 'byte-compiling-files-p))
+				    (not (byte-compiling-files-p)))
+				(check-ispell-version))
   "The directory where ispell dictionaries reside.")
 
 (defvar ispell-process nil
@@ -828,7 +829,8 @@ and added as a submenu of the \"Edit\" menu.")
 
 ;;;###autoload
 (if (and ispell-menu-map-needed
-	 (not (boundp 'byte-compile-current-file)))
+	 (or (not (fboundp 'byte-compiling-files-p))
+	     (not (byte-compiling-files-p))))
     (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist)))
 	  ;; `ispell-library-path' intentionally not defined in autoload
 	  (path (and (boundp 'ispell-library-path) ispell-library-path))
@@ -861,7 +863,8 @@ and added as a submenu of the \"Edit\" menu.")
 ;;; define commands in menu in opposite order you want them to appear.
 ;;;###autoload
 (if (and ispell-menu-map-needed
-	 (not (boundp 'byte-compile-current-file)))
+	 (or (not (fboundp 'byte-compiling-files-p))
+	     (not (byte-compiling-files-p))))
     (progn
       (define-key ispell-menu-map [ispell-change-dictionary]
 	'(menu-item "Change Dictionary..." ispell-change-dictionary
@@ -889,7 +892,8 @@ and added as a submenu of the \"Edit\" menu.")
 
 ;;;###autoload
 (if (and ispell-menu-map-needed
-	 (not (boundp 'byte-compile-current-file)))
+	 (or (not (fboundp 'byte-compiling-files-p))
+	     (not (byte-compiling-files-p))))
     (progn
       (define-key ispell-menu-map [ispell-continue]
 	'(menu-item "Continue Spell-Checking" ispell-continue
@@ -907,7 +911,8 @@ and added as a submenu of the \"Edit\" menu.")
 
 ;;;###autoload
 (if (and ispell-menu-map-needed
-	 (not (boundp 'byte-compile-current-file)))
+	 (or (not (fboundp 'byte-compiling-files-p))
+	     (not (byte-compiling-files-p))))
     (progn
       (define-key ispell-menu-map [ispell-region]
 	'(menu-item "Spell-Check Region" ispell-region