aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-09 16:09:04 +0000
committerGerd Moellmann2000-11-09 16:09:04 +0000
commitf52ef7391257a911434cc4a1cf283a95b6aaa7bd (patch)
treef1e62fd79bfd29c5efd1524564048fe4d71c31ac
parent6a619620dea1ea319a5f2a7bab1d6e15cf4d3331 (diff)
downloademacs-f52ef7391257a911434cc4a1cf283a95b6aaa7bd.tar.gz
emacs-f52ef7391257a911434cc4a1cf283a95b6aaa7bd.zip
(ispell-library-path): Don't call
check-ispell-version when byte-compiling because that starts an ispell process, and ispell might not be installed. (toplevel): Don't set up a menu when byte-compiling.
-rw-r--r--lisp/textmodes/ispell.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index b85a75ec382..fcb182c7842 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -810,7 +810,8 @@ and added as a submenu of the \"Edit\" menu.")
810 (not xemacsp) 810 (not xemacsp)
811 'reload)) 811 'reload))
812 812
813(defvar ispell-library-path (check-ispell-version) 813(defvar ispell-library-path (unless (boundp 'byte-compile-current-file)
814 (check-ispell-version))
814 "The directory where ispell dictionaries reside.") 815 "The directory where ispell dictionaries reside.")
815 816
816(defvar ispell-process nil 817(defvar ispell-process nil
@@ -826,7 +827,8 @@ and added as a submenu of the \"Edit\" menu.")
826 "Non-nil means that the OS supports asynchronous processes.") 827 "Non-nil means that the OS supports asynchronous processes.")
827 828
828;;;###autoload 829;;;###autoload
829(if ispell-menu-map-needed 830(if (and ispell-menu-map-needed
831 (not (boundp 'byte-compile-current-file)))
830 (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist))) 832 (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist)))
831 ;; `ispell-library-path' intentionally not defined in autoload 833 ;; `ispell-library-path' intentionally not defined in autoload
832 (path (and (boundp 'ispell-library-path) ispell-library-path)) 834 (path (and (boundp 'ispell-library-path) ispell-library-path))
@@ -858,7 +860,8 @@ and added as a submenu of the \"Edit\" menu.")
858 860
859;;; define commands in menu in opposite order you want them to appear. 861;;; define commands in menu in opposite order you want them to appear.
860;;;###autoload 862;;;###autoload
861(if ispell-menu-map-needed 863(if (and ispell-menu-map-needed
864 (not (boundp 'byte-compile-current-file)))
862 (progn 865 (progn
863 (define-key ispell-menu-map [ispell-change-dictionary] 866 (define-key ispell-menu-map [ispell-change-dictionary]
864 '(menu-item "Change Dictionary..." ispell-change-dictionary 867 '(menu-item "Change Dictionary..." ispell-change-dictionary
@@ -885,7 +888,8 @@ and added as a submenu of the \"Edit\" menu.")
885 :help "Complete word fragment at cursor")))) 888 :help "Complete word fragment at cursor"))))
886 889
887;;;###autoload 890;;;###autoload
888(if ispell-menu-map-needed 891(if (and ispell-menu-map-needed
892 (not (boundp 'byte-compile-current-file)))
889 (progn 893 (progn
890 (define-key ispell-menu-map [ispell-continue] 894 (define-key ispell-menu-map [ispell-continue]
891 '(menu-item "Continue Spell-Checking" ispell-continue 895 '(menu-item "Continue Spell-Checking" ispell-continue
@@ -902,7 +906,8 @@ and added as a submenu of the \"Edit\" menu.")
902 :help "Spell-check only comments and strings")))) 906 :help "Spell-check only comments and strings"))))
903 907
904;;;###autoload 908;;;###autoload
905(if ispell-menu-map-needed 909(if (and ispell-menu-map-needed
910 (not (boundp 'byte-compile-current-file)))
906 (progn 911 (progn
907 (define-key ispell-menu-map [ispell-region] 912 (define-key ispell-menu-map [ispell-region]
908 '(menu-item "Spell-Check Region" ispell-region 913 '(menu-item "Spell-Check Region" ispell-region