summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emerge.el')
-rw-r--r--lisp/emerge.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el
index ee19351a2e3..997077aa08f 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -2060,8 +2060,7 @@ With a negative argument, turn off Skip-Prefers mode."
(A-end (1- (aref diff-vector 1)))
;; so further kills don't append
this-command)
- (save-excursion
- (set-buffer emerge-A-buffer)
+ (with-current-buffer emerge-A-buffer
(copy-region-as-kill A-begin A-end))))
(defun emerge-copy-as-kill-B ()
@@ -2074,8 +2073,7 @@ With a negative argument, turn off Skip-Prefers mode."
(B-end (1- (aref diff-vector 3)))
;; so further kills don't append
this-command)
- (save-excursion
- (set-buffer emerge-B-buffer)
+ (with-current-buffer emerge-B-buffer
(copy-region-as-kill B-begin B-end))))
(defun emerge-insert-A (arg)
@@ -2170,8 +2168,7 @@ Use C-u l to reset the windows afterward."
(princ (buffer-name))))
(princ "\n")))
(princ emerge-output-description)
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))))
(defun emerge-join-differences (arg)
@@ -3020,8 +3017,7 @@ If some prefix of KEY has a non-prefix definition, it is redefined."
;; minor-mode indicator))
;; (princ (documentation minor-mode)))))
;; (setq minor-modes (cdr minor-modes))))
-;; (save-excursion
-;; (set-buffer standard-output)
+;; (with-current-buffer standard-output
;; (help-mode))
;; (help-print-return-message)))