Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
02e3336d
Commit
02e3336d
authored
Feb 08, 2008
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(diff-add-change-log-entries-other-window): Avoid the
splitter in context hunks.
parent
1abe3a1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/diff-mode.el
lisp/diff-mode.el
+8
-1
No files found.
lisp/ChangeLog
View file @
02e3336d
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
...
...
lisp/diff-mode.el
View file @
02e3336d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment