diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-13 05:53:03 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-13 05:53:03 +0000 |
| commit | 2b42d458a45eaf9767da327f76a40a1cf9c77c23 (patch) | |
| tree | f896828e65199d043ea7ab366fffea8bd315a986 /lisp/diff-mode.el | |
| parent | 3e88ae627ef8d827b3f79e4e6f14aaad7adfe322 (diff) | |
| parent | e2cfa9afa691fb8b7a554cb685c16ff3d4e1ff2b (diff) | |
| download | emacs-2b42d458a45eaf9767da327f76a40a1cf9c77c23.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 880-885)
- Remove RCS keywords from doc/misc/cc-mode.texi
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 609c5ef6490..894a12b1193 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1578,6 +1578,10 @@ then `diff-jump-to-old-file' is also set, for the next invocations." (defun diff-current-defun () "Find the name of function at point. For use in `add-log-current-defun-function'." + ;; Kill change-log-default-name so it gets recomputed each time, since + ;; each hunk may belong to another file which may belong to another + ;; directory and hence have a different ChangeLog file. + (kill-local-variable 'change-log-default-name) (save-excursion (when (looking-at diff-hunk-header-re) (forward-line 1) @@ -1649,7 +1653,8 @@ For use in `add-log-current-defun-function'." (defface diff-fine-change '((t :background "yellow")) - "Face used for char-based changes shown by `diff-fine-highlight'.") + "Face used for char-based changes shown by `diff-fine-highlight'." + :group 'diff-mode) (defun diff-fine-highlight-preproc () (while (re-search-forward "^." nil t) |