diff options
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." | |||
| 1578 | (defun diff-current-defun () | 1578 | (defun diff-current-defun () |
| 1579 | "Find the name of function at point. | 1579 | "Find the name of function at point. |
| 1580 | For use in `add-log-current-defun-function'." | 1580 | For use in `add-log-current-defun-function'." |
| 1581 | ;; Kill change-log-default-name so it gets recomputed each time, since | ||
| 1582 | ;; each hunk may belong to another file which may belong to another | ||
| 1583 | ;; directory and hence have a different ChangeLog file. | ||
| 1584 | (kill-local-variable 'change-log-default-name) | ||
| 1581 | (save-excursion | 1585 | (save-excursion |
| 1582 | (when (looking-at diff-hunk-header-re) | 1586 | (when (looking-at diff-hunk-header-re) |
| 1583 | (forward-line 1) | 1587 | (forward-line 1) |
| @@ -1649,7 +1653,8 @@ For use in `add-log-current-defun-function'." | |||
| 1649 | 1653 | ||
| 1650 | (defface diff-fine-change | 1654 | (defface diff-fine-change |
| 1651 | '((t :background "yellow")) | 1655 | '((t :background "yellow")) |
| 1652 | "Face used for char-based changes shown by `diff-fine-highlight'.") | 1656 | "Face used for char-based changes shown by `diff-fine-highlight'." |
| 1657 | :group 'diff-mode) | ||
| 1653 | 1658 | ||
| 1654 | (defun diff-fine-highlight-preproc () | 1659 | (defun diff-fine-highlight-preproc () |
| 1655 | (while (re-search-forward "^." nil t) | 1660 | (while (re-search-forward "^." nil t) |