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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 556-561)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 122-124)

   - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
   - Update from CVS

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/format.el
Simple merge

diff --cc lisp/gnus/gnus-start.el
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/international/mule-diag.el
Simple merge

diff --cc lisp/international/mule.el
index 52a981455341f3f6bdf72d4c89e636000d5de321,a4a1ca76e2c1c88d54cf741ba902e206fdd4c2d6..322f432d8dce4cee178cc1afd8ded78e12033b7d
--- 1/lisp/international/mule.el
--- 2/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -1175,12 -1195,11 +1175,12 @@@ usual for visiting a file.
    "Set coding system for decoding and encoding file names to CODING-SYSTEM.
  It actually just set the variable `file-name-coding-system' (which
  see) to CODING-SYSTEM."
-   (interactive "zCoding system for file names (default, nil): ")
+   (interactive "zCoding system for file names (default nil): ")
    (check-coding-system coding-system)
    (if (and coding-system
 -         (coding-system-get coding-system 'ascii-incompatible))
 -      (error "%s is not ASCII-compatible" coding-system))
 +         (not (coding-system-get coding-system :ascii-compatible-p))
 +         (not (coding-system-get coding-system :suitable-for-file-name)))
 +      (error "%s is not suitable for file names" coding-system))
    (setq file-name-coding-system coding-system))
  
  (defvar default-terminal-coding-system nil
@@@ -1303,9 -1321,9 +1303,9 @@@ This setting is effective for the next 
    (interactive
     (list (read-coding-system
          (if last-next-selection-coding-system
-             (format "Coding system for the next selection (default, %S): "
 -            (format "Coding system for the next X selection (default %S): "
++            (format "Coding system for the next selection (default %S): "
                      last-next-selection-coding-system)
 -          "Coding system for the next X selection: ")
 +          "Coding system for the next selection: ")
          last-next-selection-coding-system)))
    (if coding-system
        (setq last-next-selection-coding-system coding-system)

diff --cc lisp/international/quail.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/ps-print.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge

diff --cc lisp/textmodes/tex-mode.el
Simple merge

diff --cc lisp/w32-fns.el
Simple merge

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

diff --cc src/ChangeLog
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge