[Emacs-diffs] Changes to emacs/lisp/textmodes/ispell.el

[Stefan Monnier]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.130 
emacs/lisp/textmodes/ispell.el:1.131
*** emacs/lisp/textmodes/ispell.el:1.130        Thu May 30 13:09:58 2002
--- emacs/lisp/textmodes/ispell.el      Fri May 31 14:43:28 2002
***************
*** 830,836 ****
  ;;;###autoload
  (if ispell-menu-map-needed
      (let ((dicts (reverse (cons (cons "default" nil) 
ispell-dictionary-alist)))
!         (dir ispell-library-directory)
          name load-dict)
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
        ;; add the dictionaries to the bottom of the list.
--- 830,836 ----
  ;;;###autoload
  (if ispell-menu-map-needed
      (let ((dicts (reverse (cons (cons "default" nil) 
ispell-dictionary-alist)))
!         (dir (if (boundp 'ispell-library-directory) ispell-library-directory))
          name load-dict)
        (setq ispell-menu-map (make-sparse-keymap "Spell"))
        ;; add the dictionaries to the bottom of the list.
***************
*** 839,850 ****
              load-dict (car (cdr (member "-d" (nth 5 (car dicts)))))
              dicts (cdr dicts))
        (cond ((not (stringp name))
!              (define-key ispell-menu-map (vector 'default)
!                (cons "Select Default Dict"
!                      (cons "Dictionary for which Ispell was configured"
!                            (list 'lambda () '(interactive)
!                                  (list
!                                    'ispell-change-dictionary "default"))))))
              ((or (not dir)            ; load all if library dir not defined
                   (file-exists-p (concat dir "/" name ".hash"))
                   (file-exists-p (concat dir "/" name ".has"))
--- 839,849 ----
              load-dict (car (cdr (member "-d" (nth 5 (car dicts)))))
              dicts (cdr dicts))
        (cond ((not (stringp name))
!              (define-key ispell-menu-map [default]
!                '("Select Default Dict"
!                  "Dictionary for which Ispell was configured"
!                  . (lambda () (interactive)
!                      (ispell-change-dictionary "default")))))
              ((or (not dir)            ; load all if library dir not defined
                   (file-exists-p (concat dir "/" name ".hash"))
                   (file-exists-p (concat dir "/" name ".has"))
***************
*** 853,860 ****
                            (file-exists-p (concat dir "/" load-dict ".has")))))
               (define-key ispell-menu-map (vector (intern name))
                 (cons (concat "Select " (capitalize name) " Dict")
!                      (list 'lambda () '(interactive)
!                            (list 'ispell-change-dictionary name)))))))))
  
  
  ;;; define commands in menu in opposite order you want them to appear.
--- 852,859 ----
                            (file-exists-p (concat dir "/" load-dict ".has")))))
               (define-key ispell-menu-map (vector (intern name))
                 (cons (concat "Select " (capitalize name) " Dict")
!                      `(lambda () (interactive)
!                         (ispell-change-dictionary ,name)))))))))
  
  
  ;;; define commands in menu in opposite order you want them to appear.