Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-10

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-59
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-68
   Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/textmodes/ispell.el
index c554b74,c403422..3f3529f
--- 1/lisp/textmodes/ispell.el
--- 2/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@@ -1074,9 -1043,32 +1043,11 @@@ Protects against bogus binding of `enab
        (decode-coding-string str (ispell-get-coding-system))
      str))
  
 -(put 'ispell-unified-chars-table 'char-table-extra-slots 0)
 -
 -;; Char-table that maps an Unicode character (charset:
 -;; latin-iso8859-1, mule-unicode-0100-24ff, mule-unicode-2500-34ff) to
 -;; a string in which all equivalent characters are listed.
 -
 -(defconst ispell-unified-chars-table
 -  (let ((table (make-char-table 'ispell-unified-chars-table)))
 -    (map-char-table
 -     #'(lambda (c v)
 -       (if (and v (/= c v))
 -           (let ((unified (or (aref table v) (string v))))
 -             (aset table v (concat unified (string c))))))
 -     ucs-mule-8859-to-mule-unicode)
 -    table))
 -
 -;; Return a string decoded from Nth element of the current dictionary
 -;; while splicing equivalent characters into the string.  This splicing
 -;; is done only if the string is a regular expression of the form
 -;; "[...]" because, otherwise, splicing will result in incorrect
 -;; regular expression matching.
 -
 +;; Return a string decoded from Nth element of the current dictionary.
  (defun ispell-get-decoded-string (n)
-   (let* ((slot (assoc ispell-dictionary ispell-dictionary-alist))
+   (let* ((slot (or
+               (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+               (assoc ispell-current-dictionary ispell-dictionary-alist)))
         (str (nth n slot)))
      (when (and (> (length str) 0)
               (not (multibyte-string-p str)))

diff --cc lisp/wid-edit.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/casetab.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge