aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-04-27 22:16:02 +0800
committerChong Yidong2012-04-27 22:16:02 +0800
commitd1d2e2e86be31c26bfa158b8c15c1aa5e2e776a2 (patch)
tree031240ec28b773e5fe5f298d83e6fd6ad79c7216
parent0cd38783c0395c0c070a578cd73cd85211791923 (diff)
downloademacs-d1d2e2e86be31c26bfa158b8c15c1aa5e2e776a2.tar.gz
emacs-d1d2e2e86be31c26bfa158b8c15c1aa5e2e776a2.zip
* lisp/vc/diff.el (diff-sentinel): Go to bob.
Fixes: debbugs:10259
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc/diff.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8af3b5aaba..eaf07c087a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-04-27 Chong Yidong <cyd@gnu.org> 12012-04-27 Chong Yidong <cyd@gnu.org>
2 2
3 * vc/diff.el (diff-sentinel): Go to bob (Bug#10259).
4
3 * startup.el (x-apply-session-resources): New function. 5 * startup.el (x-apply-session-resources): New function.
4 6
5 * term/ns-win.el (ns-initialize-window-system): 7 * term/ns-win.el (ns-initialize-window-system):
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 2eefdee1836..6cfee52cbb5 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -67,6 +67,7 @@ delete the temporary files so named."
67 (if old-temp-file (delete-file old-temp-file)) 67 (if old-temp-file (delete-file old-temp-file))
68 (if new-temp-file (delete-file new-temp-file)) 68 (if new-temp-file (delete-file new-temp-file))
69 (diff-setup-whitespace) 69 (diff-setup-whitespace)
70 (goto-char (point-min))
70 (save-excursion 71 (save-excursion
71 (goto-char (point-max)) 72 (goto-char (point-max))
72 (let ((inhibit-read-only t)) 73 (let ((inhibit-read-only t))