mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(diff-add-change-log-entries-other-window): Avoid the

Browse source 
splitter in context hunks.
This commit is contained in:
Stefan Monnier 2008-02-08 16:00:55 +00:00
parent 1abe3a1e4e
commit 02e3336d0c
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-add-change-log-entries-other-window): Avoid the
splitter in context hunks.
2008-02-08 Kenichi Handa <handa@ni.aist.go.jp>
* international/fontset.el (setup-default-fontset): Fix arabic otf

9
lisp/diff-mode.el
View file

@ -1750,7 +1750,14 @@ I.e. like `add-change-log-entry-other-window' but applied to all hunks."
;; Move to where the changes are,
;; `add-change-log-entry-other-window' works better in
;; that case.
(re-search-forward "\n[!+-<>]" nil t))
(re-search-forward
(concat "\n[!+-<>]"
;; If the hunk is a context hunk with an empty first
;; half, recognize the "--- NNN,MMM ----" line
"\\(-- [0-9]+\\(,[0-9]+\\)? ----\n"
;; and skip to the next non-context line.
"\\( .*\n\\)*[+]\\)?")
nil t))
(save-excursion
(add-change-log-entry-other-window)
;; Insert a "." so that the entries created don't get