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

[Agustin Martin Domingo]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Agustin Martin Domingo <agmartin>       09/01/16 14:04:39

Modified files:
        lisp           : ChangeLog 
        lisp/textmodes : ispell.el 

Log message:
        Protect against declare-function undefined in xemacs.
        (ispell-program-name): Search also for hunspell when setting default.
        (ispell-find-aspell-dictionaries): Better error message. Use correct
        dictionary alist for default. Better fallback default dictionary.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15117&r2=1.15118
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/ispell.el?cvsroot=emacs&r1=1.243&r2=1.244

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15117
retrieving revision 1.15118
diff -u -b -r1.15117 -r1.15118
--- ChangeLog   16 Jan 2009 12:36:20 -0000      1.15117
+++ ChangeLog   16 Jan 2009 14:04:35 -0000      1.15118
@@ -1,3 +1,11 @@
+2009-01-16  Agustín Martín <address@hidden>
+
+       * textmodes/ispell.el: Protect against declare-function undefined
+       in xemacs.
+       (ispell-program-name): Search also for hunspell when setting default.
+       (ispell-find-aspell-dictionaries): Better error message. Use correct
+       dictionary alist for default. Better fallback default dictionary.
+
 2009-01-16  Ulrich Mueller  <address@hidden>
 
        * international/quail.el (quail-insert-kbd-layout): Delete

Index: textmodes/ispell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/ispell.el,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- textmodes/ispell.el 9 Jan 2009 02:59:55 -0000       1.243
+++ textmodes/ispell.el 16 Jan 2009 14:04:38 -0000      1.244
@@ -198,6 +198,9 @@
 
 ;;; Compatibility code for xemacs and (not too) older emacsen:
 
+(eval-and-compile ;; Protect against declare-function undefined in xemacs
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (declare-function ispell-check-minver "ispell" (v1 v2))
 
 (if (fboundp 'version<=)
@@ -329,6 +332,8 @@
 
 (defcustom ispell-program-name
   (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
+      (locate-file "ispell"   exec-path exec-suffixes 'file-executable-p)
+      (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
       "ispell")
   "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
   :type 'string
@@ -911,8 +916,8 @@
 
 (defun ispell-find-aspell-dictionaries ()
   "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
-  (unless ispell-really-aspell
-    (error "This function only works with aspell"))
+  (unless (and ispell-really-aspell ispell-encoding8-command)
+    (error "This function only works with aspell >= 0.60."))
   (let* ((dictionaries
          (split-string
           (with-temp-buffer
@@ -932,10 +937,10 @@
        (setq found (nconc found (list dict)))))
     (setq ispell-aspell-dictionary-alist found)
     ;; Add a default entry
-    (let* ((english-dict (assoc "en" ispell-dictionary-alist))
+    (let* ((english-dict (assoc "en" ispell-aspell-dictionary-alist))
           (default-dict
             (cons nil (or (cdr english-dict)
-                          (cdr (car ispell-dictionary-base-alist))))))
+                          '("[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-B") nil 
utf-8)))))
       (push default-dict ispell-aspell-dictionary-alist))))
 
 (defvar ispell-aspell-data-dir nil