Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(mh-yank-cur-msg): Replace usage of set-buffer with

Browse source 
with-current-buffer in mh-yang-cur-msg, semantics changed in emacs
23 and we do not want to use set-buffer unless we actually want to
change the buffer the user is looking at (cloases SF #2830504).
This commit is contained in:
Jeffrey C Honig 2011-12-27 14:43:23 -05:00
parent c6134398c6
commit 40f1ca7c6c
2 changed files with 70 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/mh-e/ChangeLog
View file

@ -10,6 +10,11 @@
2011-12-27 Jeffrey C Honig <jch@honig.net>
* mh-letter.el (mh-yank-cur-msg): Replace usage of set-buffer with
with-current-buffer in mh-yang-cur-msg, semantics changed in emacs
23 and we do not want to use set-buffer unless we actually want to
change the buffer the user is looking at (cloases SF #2830504).
* mh-show.el (mh-show-folder-map): Add missing key binding for
mh-show-pack-folder (closes SF #3466086).

128
lisp/mh-e/mh-letter.el
View file

@ -723,69 +723,71 @@ not inserted. If the option `mh-yank-behavior' is set to one of
the supercite flavors, the hook `mail-citation-hook' is ignored
and `mh-ins-buf-prefix' is not inserted."
(interactive)
(if (and mh-sent-from-folder
(with-current-buffer mh-sent-from-folder mh-show-buffer)
(with-current-buffer mh-sent-from-folder
(get-buffer mh-show-buffer))
mh-sent-from-msg)
(let ((to-point (point))
(to-buffer (current-buffer)))
(set-buffer mh-sent-from-folder)
(if mh-delete-yanked-msg-window-flag
(delete-windows-on mh-show-buffer))
(set-buffer mh-show-buffer) ; Find displayed message
(let* ((from-attr (mh-extract-from-attribution))
(yank-region (mh-mark-active-p nil))
(mh-ins-str
(cond ((and yank-region
(or (eq 'supercite mh-yank-behavior)
(eq 'autosupercite mh-yank-behavior)
(eq t mh-yank-behavior)))
;; supercite needs the full header
(concat
(buffer-substring (point-min) (mh-mail-header-end))
"\n"
(buffer-substring (region-beginning) (region-end))))
(yank-region
(buffer-substring (region-beginning) (region-end)))
((or (eq 'body mh-yank-behavior)
(eq 'attribution mh-yank-behavior)
(eq 'autoattrib mh-yank-behavior))
(buffer-substring
(save-excursion
(goto-char (point-min))
(mh-goto-header-end 1)
(point))
(point-max)))
((or (eq 'supercite mh-yank-behavior)
(eq 'autosupercite mh-yank-behavior)
(eq t mh-yank-behavior))
(buffer-substring (point-min) (point-max)))
(t
(buffer-substring (point) (point-max))))))
(set-buffer to-buffer)
(save-restriction
(narrow-to-region to-point to-point)
(insert (mh-filter-out-non-text mh-ins-str))
(goto-char (point-max)) ;Needed for sc-cite-original
(push-mark) ;Needed for sc-cite-original
(goto-char (point-min)) ;Needed for sc-cite-original
(mh-insert-prefix-string mh-ins-buf-prefix)
(when (or (eq 'attribution mh-yank-behavior)
(eq 'autoattrib mh-yank-behavior))
(insert from-attr)
(mh-identity-insert-attribution-verb nil)
(insert "\n\n"))
;; If the user has selected a region, he has already "edited" the
;; text, so leave the cursor at the end of the yanked text. In
;; either case, leave a mark at the opposite end of the included
;; text to make it easy to jump or delete to the other end of the
;; text.
(push-mark)
(goto-char (point-max))
(if (null yank-region)
(mh-exchange-point-and-mark-preserving-active-mark)))))
(error "There is no current message")))
(let ((show-buffer))
(if (and mh-sent-from-folder
(with-current-buffer mh-sent-from-folder mh-show-buffer)
(setq show-buffer (with-current-buffer mh-sent-from-folder
(get-buffer mh-show-buffer)))
mh-sent-from-msg)
(let ((to-point (point))
(to-buffer (current-buffer)))
(if mh-delete-yanked-msg-window-flag
(with-current-buffer mh-sent-from-folder
(delete-windows-on show-buffer)))
;; Find displayed message
(with-current-buffer show-buffer
(let* ((from-attr (mh-extract-from-attribution))
(yank-region (mh-mark-active-p nil))
(mh-ins-str
(cond ((and yank-region
(or (eq 'supercite mh-yank-behavior)
(eq 'autosupercite mh-yank-behavior)
(eq t mh-yank-behavior)))
;; supercite needs the full header
(concat
(buffer-substring (point-min) (mh-mail-header-end))
"\n"
(buffer-substring (region-beginning) (region-end))))
(yank-region
(buffer-substring (region-beginning) (region-end)))
((or (eq 'body mh-yank-behavior)
(eq 'attribution mh-yank-behavior)
(eq 'autoattrib mh-yank-behavior))
(buffer-substring
(save-excursion
(goto-char (point-min))
(mh-goto-header-end 1)
(point))
(point-max)))
((or (eq 'supercite mh-yank-behavior)
(eq 'autosupercite mh-yank-behavior)
(eq t mh-yank-behavior))
(buffer-substring (point-min) (point-max)))
(t
(buffer-substring (point) (point-max))))))
(with-current-buffer to-buffer
(save-restriction
(narrow-to-region to-point to-point)
(insert (mh-filter-out-non-text mh-ins-str))
(goto-char (point-max)) ;Needed for sc-cite-original
(push-mark) ;Needed for sc-cite-original
(goto-char (point-min)) ;Needed for sc-cite-original
(mh-insert-prefix-string mh-ins-buf-prefix)
(when (or (eq 'attribution mh-yank-behavior)
(eq 'autoattrib mh-yank-behavior))
(insert from-attr)
(mh-identity-insert-attribution-verb nil)
(insert "\n\n"))
;; If the user has selected a region, he has already "edited" the
;; text, so leave the cursor at the end of the yanked text. In
;; either case, leave a mark at the opposite end of the included
;; text to make it easy to jump or delete to the other end of the
;; text.
(push-mark)
(goto-char (point-max))
(if (null yank-region)
(mh-exchange-point-and-mark-preserving-active-mark)))))))
(error "There is no current message"))))