magit.el | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/magit.el b/magit.el
index 11208b4..1a0b094 100644
--- a/magit.el
+++ b/magit.el
@@ -1185,8 +1185,7 @@ FUNC should leave point at the end of the modified region"
(magit-set-mode-line-process
(magit-process-indicator-from-command cmd-and-args))
(setq magit-process-client-buffer (current-buffer))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(view-mode 1)
(set (make-local-variable 'view-no-disable-on-exit) t)
(setq view-exit-action
@@ -1563,9 +1562,8 @@ Please see the manual for a complete description of Magit.
(defun magit-find-buffer (submode &optional dir)
(let ((topdir (magit-get-top-dir (or dir default-directory))))
(dolist (buf (buffer-list))
- (if (save-excursion
- (set-buffer buf)
- (and default-directory
+ (if (with-current-buffer buf
+ (and default-directory
(equal (expand-file-name default-directory) topdir)
(eq major-mode 'magit-mode)
(eq magit-submode submode)))
@@ -1576,8 +1574,7 @@ Please see the manual for a complete description of Magit.
(defun magit-for-all-buffers (func &optional dir)
(dolist (buf (buffer-list))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(if (and (eq major-mode 'magit-mode)
(or (null dir)
(equal default-directory dir)))
@@ -2778,8 +2775,7 @@ Prefix arg means justify as well."
(replace-match "\n" nil nil))))
(defun magit-log-edit-append (str)
- (save-excursion
- (set-buffer (get-buffer-create "*magit-log-edit*"))
+ (with-current-buffer (get-buffer-create "*magit-log-edit*")
(goto-char (point-max))
(insert str "\n")))
@@ -2789,9 +2785,8 @@ Prefix arg means justify as well."
(let ((buf (get-buffer "*magit-log-edit*"))
(result nil))
(if buf
- (save-excursion
- (set-buffer buf)
- (goto-char (point-min))
+ (with-current-buffer buf
+ (goto-char (point-min))
(while (looking-at "^\\([A-Za-z0-9-_]+\\): *\\(.*\\)$")
(setq result (acons (intern (downcase (match-string 1)))
(match-string 2)
@@ -2803,8 +2798,7 @@ Prefix arg means justify as well."
(defun magit-log-edit-set-fields (fields)
(let ((buf (get-buffer-create "*magit-log-edit*")))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(goto-char (point-min))
(if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)+%s"
(regexp-quote magit-log-header-end))
@@ -3298,9 +3292,8 @@ Prefix arg means justify as well."
(args (magit-rev-range-to-git range))
(buf (get-buffer-create "*magit-diff*")))
(display-buffer buf)
- (save-excursion
- (set-buffer buf)
- (magit-mode-init dir 'diff #'magit-refresh-diff-buffer range args)))))
+ (with-current-buffer buf
+ (magit-mode-init dir 'diff #'magit-refresh-diff-buffer range
args)))))
(defun magit-diff-working-tree (rev)
(interactive (list (magit-read-rev "Diff with (default HEAD)")))
--
1.6.5.8
--
To unsubscribe, reply using "remove me" as the subject.
