aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/diff-mode.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bea8584d03c..6d51598a777 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-06-24 Leo Liu <sdl.web@gmail.com>
2
3 * vc/diff-mode.el (diff-file-prev/next): Fix typo.
4
12012-06-23 Leo Liu <sdl.web@gmail.com> 52012-06-23 Leo Liu <sdl.web@gmail.com>
2 6
3 * textmodes/enriched.el (enriched-next-annotation): 7 * textmodes/enriched.el (enriched-next-annotation):
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 16e33889c31..8b6b85dd22e 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -545,7 +545,7 @@ but in the file header instead, in which case move forward to the first hunk."
545 (condition-case-unless-debug nil (diff-refine-hunk) (error nil)))) 545 (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
546 546
547(easy-mmode-define-navigation 547(easy-mmode-define-navigation
548 diff-file diff-file-header-re "file" diff-end-of-hunk) 548 diff-file diff-file-header-re "file" diff-end-of-file)
549 549
550(defun diff-restrict-view (&optional arg) 550(defun diff-restrict-view (&optional arg)
551 "Restrict the view to the current hunk. 551 "Restrict the view to the current hunk.