mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-26 19:18:50 +00:00
Code Issues Releases Activity

(rmail-generate-viewer-buffer): Be more careful about reusing existing

Browse Source 
buffers, in case we happen to visit two files with the same basename.
(Bug#4593)
This commit is contained in:
Glenn Morris 2009-10-03 02:07:28 +00:00
parent de87fb719d
commit ac3c593c97
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2009-10-03 Glenn Morris <rgm@gnu.org>
* mail/rmail.el (rmail-generate-viewer-buffer): Be more careful about
reusing existing buffers, in case we happen to visit two files with the
same basename. (Bug#4593)
2009-10-02 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (update-subdirs-CMD): Add cedet to

17
lisp/mail/rmail.el
View File

@ -1294,11 +1294,15 @@ Instead, these commands are available:
(defun rmail-generate-viewer-buffer ()
"Return a reusable buffer suitable for viewing messages.
Create the buffer if necessary."
(let* ((suffix (file-name-nondirectory (or buffer-file-name (buffer-name))))
(name (format " *message-viewer %s*" suffix))
(buf (get-buffer name)))
(or buf
(generate-new-buffer name))))
;; We want to reuse any existing view buffer, so as not to create an
;; endless number of them. But we must avoid clashes if we visit
;; two different rmail files with the same basename (Bug#4593).
(if (and (local-variable-p 'rmail-view-buffer)
(buffer-live-p rmail-view-buffer))
rmail-view-buffer
(generate-new-buffer
(format " *message-viewer %s*"
(file-name-nondirectory (or buffer-file-name (buffer-name)))))))
(defun rmail-swap-buffers ()
"Swap text between current buffer and `rmail-view-buffer'.
@ -1367,6 +1371,9 @@ If so restore the actual mbox message collection."
(set-buffer-multibyte nil)
(with-current-buffer (setq rmail-view-buffer (rmail-generate-viewer-buffer))
(setq buffer-undo-list t)
;; Note that this does not erase the buffer. Should it?
;; It depends on how this is called. If somehow called with the
;; rmail buffers swapped, it would erase the message collection.
(set (make-local-variable 'rmail-overlay-list) nil)
(set-buffer-multibyte t)
;; Force C-x C-s write Unix EOLs.