Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8653eee8
Commit
8653eee8
authored
May 05, 2008
by
Stefan Monnier
Browse files
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
parent
6494957a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/smerge-mode.el
lisp/smerge-mode.el
+2
-1
No files found.
lisp/ChangeLog
View file @
8653eee8
2008-05-05 Tom Tromey <tromey@redhat.com>
* smerge-mode.el (smerge-start-session): Don't call smerge-next if
looking at conflict marker.
2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
...
...
lisp/smerge-mode.el
View file @
8653eee8
...
...
@@ -1227,7 +1227,8 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
If no conflict maker is found, turn off `smerge-mode'."
(
smerge-mode
1
)
(
condition-case
nil
(
smerge-next
)
(
unless
(
looking-at
smerge-begin-re
)
(
smerge-next
))
(
error
(
smerge-auto-leave
))))
(
provide
'smerge-mode
)
...
...
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