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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 485-492)

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

 * gnus--rel--5.10  (patch 92-94)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/arc-mode.el
Simple merge

diff --cc lisp/composite.el
Simple merge

diff --cc lisp/descr-text.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/faces.el
index 0b301a2,638e05c..733d7ca
--- 1/lisp/faces.el
--- 2/lisp/faces.el
+++ b/lisp/faces.el
@@@ -1095,10 -1095,10 +1095,10 @@@ of a global face.  Value is the new att
  
  (defun read-face-font (face &optional frame)
    "Read the name of a font for FACE on FRAME.
- If optional argument FRAME Is nil or omitted, use the selected frame."
+ If optional argument FRAME is nil or omitted, use the selected frame."
    (let ((completion-ignore-case t))
      (completing-read (format "Set font attributes of face `%s' from font: " face)
 -                   (x-list-fonts "*" nil frame))))
 +                   (append (fontset-list) (x-list-fonts "*" nil frame)))))
  
  
  (defun read-all-face-attributes (face &optional frame)

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

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

diff --cc lisp/international/mule-cmds.el
index b84fb38,077a196..cdb76a2
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -864,59 -919,58 +899,52 @@@ It is highly recommended to fix it befo
  
        ;; If the most preferred coding system has the property mime-charset,
        ;; append it to the defaults.
 -      (let ((tail coding-category-list)
 -          preferred base)
 -      (while (and tail (not (setq preferred (symbol-value (car tail)))))
 -        (setq tail (cdr tail)))
 +      (let ((preferred (coding-system-priority-list t))
 +          base)
        (and (coding-system-p preferred)
             (setq base (coding-system-base preferred))
 -           (coding-system-get preferred 'mime-charset)
 +           (coding-system-get preferred :mime-charset)
             (not (rassq base default-coding-system))
             (push (cons preferred base)
-                  default-coding-system)))))
- 
-   (if select-safe-coding-system-accept-default-p
-       (setq accept-default-p select-safe-coding-system-accept-default-p))
- 
-   (let ((codings (find-coding-systems-region from to))
-       (coding-system nil)
-       safe rejected unsafe)
-     ;; Classify the defaults into safe, rejected, and unsafe.
-     (dolist (elt default-coding-system)
-       (if (or (eq (car codings) 'undecided)
-             (memq (cdr elt) codings))
-         (if (and (functionp accept-default-p)
-                  (not (funcall accept-default-p (cdr elt))))
-             (push (car elt) rejected)
-           (push (car elt) safe))
-       (push (car elt) unsafe)))
-     (if safe
-       (setq coding-system (car safe)))
- 
-     ;; If all the defaults failed, ask a user.
-     (unless coding-system
-       (setq coding-system (select-safe-coding-system-interactively
-                          from to codings unsafe rejected (car codings))))
- 
-     (if (and coding-system (vectorp (coding-system-eol-type coding-system)))
-       (let ((eol (coding-system-eol-type buffer-file-coding-system)))
-         (if (numberp eol)
-             (setq coding-system
-                   (coding-system-change-eol-conversion coding-system eol)))))
- 
-     ;; Check we're not inconsistent with what `coding:' spec &c would
-     ;; give when file is re-read.
-     ;; But don't do this if we explicitly ignored the cookie
-     ;; by using `find-file-literally'.
-     (unless (or (stringp from)
-               find-file-literally
-               (and coding-system
-                    (memq (coding-system-type coding-system) '(0 5))))
-       (let ((auto-cs (save-excursion
-                      (save-restriction
-                        (widen)
-                        (narrow-to-region from to)
-                        (goto-char (point-min))
-                        (set-auto-coding (or file buffer-file-name "")
-                                         (buffer-size))))))
+                  default-coding-system))))
+ 
+     (if select-safe-coding-system-accept-default-p
+       (setq accept-default-p select-safe-coding-system-accept-default-p))
+ 
+     (let ((codings (find-coding-systems-region from to))
+         (coding-system nil)
+         safe rejected unsafe)
 -      (if (eq (car codings) 'undecided)
 -        ;; Any coding system is ok.
 -        (setq coding-system t)
 -      ;; Classify the defaults into safe, rejected, and unsafe.
 -      (dolist (elt default-coding-system)
 -        (if (memq (cdr elt) codings)
 -            (if (and (functionp accept-default-p)
 -                     (not (funcall accept-default-p (cdr elt))))
 -                (push (car elt) rejected)
 -              (push (car elt) safe))
 -          (push (car elt) unsafe)))
 -      (if safe
 -          (setq coding-system (car safe))))
++      ;; Classify the defaults into safe, rejected, and unsafe.
++      (dolist (elt default-coding-system)
++      (if (or (eq (car codings) 'undecided)
++              (memq (cdr elt) codings))
++          (if (and (functionp accept-default-p)
++                   (not (funcall accept-default-p (cdr elt))))
++              (push (car elt) rejected)
++            (push (car elt) safe))
++        (push (car elt) unsafe)))
++      (if safe
++        (setq coding-system (car safe)))
+ 
+       ;; If all the defaults failed, ask a user.
 -      (when (not coding-system)
++      (unless coding-system
+       (setq coding-system (select-safe-coding-system-interactively
+                            from to codings unsafe rejected (car codings))))
+ 
 -      (if (vectorp (coding-system-eol-type coding-system))
++      (if (and coding-system (vectorp (coding-system-eol-type coding-system)))
+         (let ((eol (coding-system-eol-type buffer-file-coding-system)))
+           (if (numberp eol)
+               (setq coding-system
+                     (coding-system-change-eol-conversion coding-system eol)))))
+ 
 -      (if (eq coding-system t)
 -        (setq coding-system buffer-file-coding-system))
+       ;; Check we're not inconsistent with what `coding:' spec &c would
+       ;; give when file is re-read.
+       ;; But don't do this if we explicitly ignored the cookie
+       ;; by using `find-file-literally'.
+       (when (and auto-cs
+                (not (and
+                      coding-system
+                      (memq (coding-system-type coding-system) '(0 5)))))
        ;; Merge coding-system and auto-cs as far as possible.
        (if (not coding-system)
            (setq coding-system auto-cs)

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

diff --cc lisp/isearch.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/version.el
Simple merge

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

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

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/ccl.c
Simple merge

diff --cc src/composite.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge