Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-40

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 135-143)

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

 * gnus--rel--5.10  (patch 49-55)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: Makefile.in (release-*): New targets.

diff --cc configure
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc leim/Makefile.in
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/arc-mode.el
index e664368df4fabdbde2ed0bf60497a2f30822f311,abf38994235a62ec9bc018791d8be75351c3d222..d699a78f8e80aa43e8d5485421ae9adc0a35ca33
--- 1/lisp/arc-mode.el
--- 2/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@@ -929,12 -907,14 +929,15 @@@ using `make-temp-file', and the generat
           (read-only-p (or archive-read-only
                          view-p
                          (string-match file-name-invalid-regexp ename)))
+        (arcfilename (expand-file-name (concat arcname ":" iname)))
           (buffer (get-buffer bufname))
 -         (just-created nil))
 +         (just-created nil)
 +       (file-name-coding archive-file-name-coding-system))
-       (if buffer
+       (if (and buffer
+              (string= (buffer-file-name buffer) arcfilename))
            nil
        (setq archive (archive-maybe-copy archive))
+       (setq bufname (generate-new-buffer-name bufname))
          (setq buffer (get-buffer-create bufname))
          (setq just-created t)
          (with-current-buffer buffer

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

diff --cc lisp/gnus/mm-util.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge