2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d3bd095278..05b7cfc176e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/diff-mode.el (diff-hunk): `save-excursion' while refining
+        (bug#12671).
+
 2012-10-23  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/gud.el (gud-menu-map):
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 0e79c962b47..cdcc7ca4745 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -581,8 +581,9 @@ next hunk if TRY-HARDER is non-nil; otherwise signal an error."
                       (with-local-quit
                         (when (buffer-live-p buffer)
                           (with-current-buffer buffer
-                            (goto-char point)
-                            (diff-refine-hunk))))))))))
+                            (save-excursion
+                              (goto-char point)
+                              (diff-refine-hunk)))))))))))
 
 (easy-mmode-define-navigation
  diff-file diff-file-header-re "file" diff-end-of-file)