Mercurial > emacs
changeset 31556:74d7a9c42c2a
(diff-hunk-text): Use `with-temp-buffer'.
(diff-mode-map): Bind `diff-test-hunk'.
(diff-apply-hunk): Use `select-window' instead of `pop-to-buffer'.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 12 Sep 2000 11:24:28 +0000 |
| parents | a1b90be8f105 |
| children | b5f901f88296 |
| files | lisp/diff-mode.el |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/diff-mode.el Tue Sep 12 10:59:03 2000 +0000 +++ b/lisp/diff-mode.el Tue Sep 12 11:24:28 2000 +0000 @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: patch diff -;; Revision: $Id: diff-mode.el,v 1.11 2000/09/07 20:14:27 fx Exp $ +;; Revision: $Id: diff-mode.el,v 1.12 2000/09/11 13:49:38 miles Exp $ ;; This file is part of GNU Emacs. @@ -133,7 +133,8 @@ ;; From compilation-minor-mode. ("\C-c\C-c" . diff-goto-source) ;; Misc operations. - ("\C-cda" . diff-apply-hunk)) + ("\C-cda" . diff-apply-hunk) + ("\C-cdt" . diff-test-hunk)) "Keymap for `diff-mode'. See also `diff-mode-shared-map'.") (easy-menu-define diff-mode-menu diff-mode-map @@ -883,7 +884,7 @@ (defun diff-hunk-text (hunk dest) "Returns the literal source text from HUNK, if DEST is nil, otherwise the destination text." - (with-current-buffer "foo" + (with-temp-buffer (erase-buffer) (insert hunk) (goto-char (point-min)) @@ -1068,11 +1069,10 @@ (- real-line patch-line))))) ;; Display BUF in a window, and maybe select it - (cond ((eq popup 'select) - (pop-to-buffer buf) - (goto-char pos)) - (t - (set-window-point (display-buffer buf) pos)))) + (let ((win (display-buffer buf))) + (set-window-point win pos) + (when (eq popup 'select) + (select-window win)))) ;; Return an appropriate indicator of success (if reversed 'reversed t)))))