diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 7 | ||||
| -rw-r--r-- | lisp/vc/log-edit.el | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index cec4fb24616..c16c2460e75 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1829,10 +1829,13 @@ For use in `add-log-current-defun-function'." (eval-and-compile (require 'smerge-mode)) (save-excursion (diff-beginning-of-hunk 'try-harder) - (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. + (let* ((start (point)) + (style (diff-hunk-style)) ;Skips the hunk header as well. (beg (point)) (props '((diff-mode . fine) (face diff-refine-change))) - (end (progn (diff-end-of-hunk) (point)))) + ;; Be careful to go back to `start' so diff-end-of-hunk gets + ;; to read the hunk header's line info. + (end (progn (goto-char start) (diff-end-of-hunk) (point)))) (remove-overlays beg end 'diff-mode 'fine) diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 2bce58f50f2..c7f37c50011 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -774,7 +774,7 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each (setq pattern (file-name-nondirectory file))) (setq pattern (concat "\\(^\\|[^[:alnum:]]\\)" - pattern + (regexp-quote pattern) "\\($\\|[^[:alnum:]]\\)")) (let (texts |