* arc-mode.el (archive-extract): Check if an existing buffer name

	comes from a different archive.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18fa97f0d2016890b2d2e456efab1cdfe3cc7254..7d5dbce1d35e9c36c1e798b4747c603e8d9e3fbb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
+       * arc-mode.el (archive-extract): Check if an existing buffer name
+       comes from a different archive.
+
        * help.el (describe-key-briefly): If KEY is a down event, read and
        discard the up event.
 

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 9799e3e0834eed44f5ad3598eb545182ab1767fc..abf38994235a62ec9bc018791d8be75351c3d222 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -907,16 +907,18 @@ using `make-temp-file', and the generated name is returned."
          (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))
-      (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
-          (setq buffer-file-name
-                (expand-file-name (concat arcname ":" iname)))
+          (setq buffer-file-name arcfilename)
           (setq buffer-file-truename
                 (abbreviate-file-name buffer-file-name))
           ;; Set the default-directory to the dir of the superior buffer.