* bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re'
@ 2009-06-13 17:25 Nelson Elhage
2009-06-27 0:26 ` Stefan Monnier
0 siblings, 1 reply; 2+ messages in thread
From: Nelson Elhage @ 2009-06-13 17:25 UTC (permalink / raw)
To: emacs-pretest-bug
With merge.conflictstyle=diff3, 'git' generates diff3-style conflict
markers, with mine/base/other sections, but for the 'base' marker, it
only outputs "|||||||\n", with no comment after it. This causes smerge
to miss the base marker, since smerge assumes a comment, and defines:
(defconst smerge-base-re "^||||||| .*\n")
Simply replacing that with
(defconst smerge-base-re "^|||||||.*\n")
Should allow smerge-mode to handle git conflicts, and I can't imagine
it should cause any false-positives otherwise.
- Nelson Elhage
In GNU Emacs 23.0.60.1 (i686-pc-linux-gnu, GTK+ Version 2.14.4)
of 2009-01-21 on phanatique
Windowing system distributor `The X.Org Foundation', version 11.0.10600000
Important settings:
value of $LC_ALL: nil
value of $LC_COLLATE: nil
value of $LC_CTYPE: nil
value of $LC_MESSAGES: nil
value of $LC_MONETARY: nil
value of $LC_NUMERIC: nil
value of $LC_TIME: nil
value of $LANG: en_US.UTF-8
value of $XMODIFIERS: nil
locale-coding-system: utf-8-unix
default-enable-multibyte-characters: t
Major mode: Emacs-Lisp
Minor modes in effect:
diff-auto-refine-mode: t
iswitchb-mode: t
shell-dirtrack-mode: t
display-battery-mode: t
display-time-mode: t
window-number-mode: t
tooltip-mode: t
mouse-wheel-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
global-auto-composition-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
column-number-mode: t
line-number-mode: t
Recent input:
C-x C-s C-c 1 C-n M-n C-n C-n C-n M-x d i f f SPC t
e <tab> <return> l <tab> <return> M-p <M-backspace>
<M-backspace> H <tab> s <tab> <return> C-c C-a C-c
2 C-x C-s C-x V s y d y g m m m a y g C-x b * b <return>
M-r c o n <return> <return> C-x C-c C-x V s <return>
y e s <return> M-x s m e m o <tab> <backspace> <backspace>
e <tab> <backspace> <tab> m o <tab> <return> M-< C-c
M-x M-p M-x M-p <return> C-c ^ n <tab> C-/ C-n C-n
C-n C-n M-f C-p C-f C-f C-b C-x 4 b s m e <return>
C-x 4 b s c <return> ( s e t q SPC s m e r g e - b
a s e - r e <tab> SPC C-x b <return> C-x b <return>
" " C-b C-c 1 C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b
C-b C-b C-b C-b C-b C-b C-SPC C-M-f M-w C-x o <backspace>
C-d C-y C-b C-b C-b C-b C-b C-b C-d C-e C-j C-x b <return>
M-x C-g M-< M-x s m e <tab> m o <tab> <return> M-x
M-p <return> C-c ^ b C-c ^ n M-x r e p o r t <tab>
<return> e <backspace> s e <backspace> m e r g e SPC
m o d e SPC - - SPC r e m o v e SPC t t r <backspace>
<backspace> r a i l i n g SPC ' SPC ' SPC i n SPC s
m e r g C-g C-c 1 M-< C-x C-x C-c 2 M-x M-p <return>
M-p <return> C-x k <return> C-c 1 C-x b <return> M-x
r e p o r <tab> <return>
Recent messages:
Smerge mode enabled
Undo!
Mark set [2 times]
Quit
Mark set
Smerge mode disabled
Smerge mode enabled
smerge-match-conflict: Point not in conflict region
Quit
Mark set
^ permalink raw reply [flat|nested] 2+ messages in thread
* bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re'
2009-06-13 17:25 bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' Nelson Elhage
@ 2009-06-27 0:26 ` Stefan Monnier
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Monnier @ 2009-06-27 0:26 UTC (permalink / raw)
To: Nelson Elhage; +Cc: 3553
> With merge.conflictstyle=diff3, 'git' generates diff3-style conflict
> markers, with mine/base/other sections, but for the 'base' marker, it
> only outputs "|||||||\n", with no comment after it. This causes smerge
> to miss the base marker, since smerge assumes a comment, and defines:
> (defconst smerge-base-re "^||||||| .*\n")
> Simply replacing that with
> (defconst smerge-base-re "^|||||||.*\n")
> Should allow smerge-mode to handle git conflicts, and I can't imagine
> it should cause any false-positives otherwise.
I'd rather fix Git so it uses the standard format.
Stefan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-27 0:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-13 17:25 bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' Nelson Elhage
2009-06-27 0:26 ` Stefan Monnier
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.