(diff): Don't pop to *diff* buffer. Change bogus

unwind-protect to save-excursion.

diff --git a/lisp/diff.el b/lisp/diff.el
index 4e8f829fdaf5f21af424cecce87e55303fa6a233..2ec0a8b14bde15a99f2a68fa46639f57b588ffce 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -197,7 +197,7 @@ With prefix arg, prompt for diff switches."
   (let ((old-alt (file-local-copy old))
        (new-alt (file-local-copy new))
        buf)
-    (unwind-protect
+    (save-excursion
        (let ((command
               (mapconcat 'identity
                          (append (list diff-command)
@@ -220,7 +220,7 @@ With prefix arg, prompt for diff switches."
                (compile-internal command
                                  "No more differences" "Diff"
                                  'diff-parse-differences))
-         (pop-to-buffer buf)
+         (set-buffer buf)
          ;; Avoid frightening people with "abnormally terminated"
          ;; if diff finds differences.
          (set (make-local-variable 'compilation-exit-message-function)