Mercurial > emacs
annotate lisp/smerge-mode.el @ 83942:c9b595f90ad7
Move here from ../../lispintro/
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 06 Sep 2007 04:01:33 +0000 |
parents | 5b92bb6e6570 |
children | 73661ddc7ac7 ccdbfad065e3 aaccdab0ee26 |
rev | line source |
---|---|
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64637
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, |
75347 | 4 ;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 |
70292
2b77fa42947f
Update my email address.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
66458
f2be1560adf2
Add 'tools' to file keywords.
Romain Francoise <romain@orebokech.com>
parents:
65658
diff
changeset
|
7 ;; Keywords: tools revision-control merge diff3 cvs conflict |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76397
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 ;; any later version. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;;; Commentary: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 ;; Provides a lightweight alternative to emerge/ediff. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 ;; To use it, simply add to your .emacs the following lines: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 ;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 ;; (autoload 'smerge-mode "smerge-mode" nil t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 ;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
33 ;; you can even have it turned on automatically with the following |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 ;; piece of code in your .emacs: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 ;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 ;; (defun sm-try-smerge () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 ;; (save-excursion |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
38 ;; (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 ;; (when (re-search-forward "^<<<<<<< " nil t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 ;; (smerge-mode 1)))) |
46899
f00337f04e78
Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41064
diff
changeset
|
41 ;; (add-hook 'find-file-hook 'sm-try-smerge t) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
42 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
43 ;;; Todo: |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
44 |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
45 ;; - if requested, ask the user whether he wants to call ediff right away |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
46 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
47 ;;; Code: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
48 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 (eval-when-compile (require 'cl)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
50 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
51 |
63936
1eb58fde25d4
(smerge-mode): Add duplicate defvar near top.
Richard M. Stallman <rms@gnu.org>
parents:
63488
diff
changeset
|
52 ;;; The real definition comes later. |
1eb58fde25d4
(smerge-mode): Add duplicate defvar near top.
Richard M. Stallman <rms@gnu.org>
parents:
63488
diff
changeset
|
53 (defvar smerge-mode) |
1eb58fde25d4
(smerge-mode): Add duplicate defvar near top.
Richard M. Stallman <rms@gnu.org>
parents:
63488
diff
changeset
|
54 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
55 (defgroup smerge () |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
56 "Minor mode to highlight and resolve diff3 conflicts." |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 :group 'tools |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
58 :prefix "smerge-") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
59 |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
60 (defcustom smerge-diff-buffer-name "*vc-diff*" |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61 "Buffer name to use for displaying diffs." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
62 :group 'smerge |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
63 :type '(choice |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64 (const "*vc-diff*") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
65 (const "*cvs-diff*") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
66 (const "*smerge-diff*") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
67 string)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
68 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
69 (defcustom smerge-diff-switches |
29207
6c4e371d4efd
(smerge-diff-switches): Don't use list* in defcustom.
Dave Love <fx@gnu.org>
parents:
28248
diff
changeset
|
70 (append '("-d" "-b") |
6c4e371d4efd
(smerge-diff-switches): Don't use list* in defcustom.
Dave Love <fx@gnu.org>
parents:
28248
diff
changeset
|
71 (if (listp diff-switches) diff-switches (list diff-switches))) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
72 "A list of strings specifying switches to be passed to diff. |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
73 Used in `smerge-diff-base-mine' and related functions." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
74 :group 'smerge |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75 :type '(repeat string)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
77 (defcustom smerge-auto-leave t |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
78 "Non-nil means to leave `smerge-mode' when the last conflict is resolved." |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
79 :group 'smerge |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
80 :type 'boolean) |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
81 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
82 (defface smerge-mine |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
83 '((((min-colors 88) (background light)) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
84 (:foreground "blue1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
85 (((background light)) |
32164
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
86 (:foreground "blue")) |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
87 (((min-colors 88) (background dark)) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
88 (:foreground "cyan1")) |
32164
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
89 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
90 (:foreground "cyan"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
91 "Face for your code." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
92 :group 'smerge) |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
93 ;; backward-compatibility alias |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
94 (put 'smerge-mine-face 'face-alias 'smerge-mine) |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
95 (defvar smerge-mine-face 'smerge-mine) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
96 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
97 (defface smerge-other |
32164
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
98 '((((background light)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
99 (:foreground "darkgreen")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
100 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
101 (:foreground "lightgreen"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
102 "Face for the other code." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 :group 'smerge) |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
104 ;; backward-compatibility alias |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
105 (put 'smerge-other-face 'face-alias 'smerge-other) |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
106 (defvar smerge-other-face 'smerge-other) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
107 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
108 (defface smerge-base |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
109 '((((min-colors 88) (background light)) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
110 (:foreground "red1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
111 (((background light)) |
32164
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
112 (:foreground "red")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
113 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
114 (:foreground "orange"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
115 "Face for the base code." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
116 :group 'smerge) |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
117 ;; backward-compatibility alias |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
118 (put 'smerge-base-face 'face-alias 'smerge-base) |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
119 (defvar smerge-base-face 'smerge-base) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
120 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
121 (defface smerge-markers |
32164
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
122 '((((background light)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
123 (:background "grey85")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
124 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
125 (:background "grey30"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 "Face for the conflict markers." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 :group 'smerge) |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
128 ;; backward-compatibility alias |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
129 (put 'smerge-markers-face 'face-alias 'smerge-markers) |
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
130 (defvar smerge-markers-face 'smerge-markers) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
132 (defface smerge-refined-change |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
133 '((t :background "yellow")) |
65131
ebbbce58e84c
(smerge-refined-change): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents:
65129
diff
changeset
|
134 "Face used for char-based changes shown by `smerge-refine'." |
ebbbce58e84c
(smerge-refined-change): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents:
65129
diff
changeset
|
135 :group 'smerge) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
136 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
137 (easy-mmode-defmap smerge-basic-map |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
138 `(("n" . smerge-next) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
139 ("p" . smerge-prev) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
140 ("r" . smerge-resolve) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 ("a" . smerge-keep-all) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
142 ("b" . smerge-keep-base) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 ("o" . smerge-keep-other) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 ("m" . smerge-keep-mine) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 ("E" . smerge-ediff) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
146 ("C" . smerge-combine-with-next) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
147 ("R" . smerge-refine) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 ("\C-m" . smerge-keep-current) |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
149 ("=" . ,(make-sparse-keymap "Diff")) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
150 ("=<" "base-mine" . smerge-diff-base-mine) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
151 ("=>" "base-other" . smerge-diff-base-other) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
152 ("==" "mine-other" . smerge-diff-mine-other)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 "The base keymap for `smerge-mode'.") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
154 |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
155 (defcustom smerge-command-prefix "\C-c^" |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156 "Prefix for `smerge-mode' commands." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
157 :group 'smerge |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
158 :type '(choice (string "\e") (string "\C-c^") (string "") string)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
159 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
160 (easy-mmode-defmap smerge-mode-map |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
161 `((,smerge-command-prefix . ,smerge-basic-map)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
162 "Keymap for `smerge-mode'.") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
163 |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
164 (defvar smerge-check-cache nil) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
165 (make-variable-buffer-local 'smerge-check-cache) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
166 (defun smerge-check (n) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
167 (condition-case nil |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
168 (let ((state (cons (point) (buffer-modified-tick)))) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
169 (unless (equal (cdr smerge-check-cache) state) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
170 (smerge-match-conflict) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
171 (setq smerge-check-cache (cons (match-data) state))) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
172 (nth (* 2 n) (car smerge-check-cache))) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
173 (error nil))) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
174 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175 (easy-menu-define smerge-mode-menu smerge-mode-map |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
176 "Menu for `smerge-mode'." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
177 '("SMerge" |
30358 | 178 ["Next" smerge-next :help "Go to next conflict"] |
30868
f7b06560383b
(smerge-mode-menu): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30358
diff
changeset
|
179 ["Previous" smerge-prev :help "Go to previous conflict"] |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
180 "--" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
181 ["Keep All" smerge-keep-all :help "Keep all three versions" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
182 :active (smerge-check 1)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
183 ["Keep Current" smerge-keep-current :help "Use current (at point) version" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
184 :active (and (smerge-check 1) (> (smerge-get-current) 0))] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
185 "--" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
186 ["Revert to Base" smerge-keep-base :help "Revert to base version" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
187 :active (smerge-check 2)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
188 ["Keep Other" smerge-keep-other :help "Keep `other' version" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
189 :active (smerge-check 3)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
190 ["Keep Yours" smerge-keep-mine :help "Keep your version" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
191 :active (smerge-check 1)] |
30358 | 192 "--" |
193 ["Diff Base/Mine" smerge-diff-base-mine | |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
194 :help "Diff `base' and `mine' for current conflict" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
195 :active (smerge-check 2)] |
30358 | 196 ["Diff Base/Other" smerge-diff-base-other |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
197 :help "Diff `base' and `other' for current conflict" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
198 :active (smerge-check 2)] |
30358 | 199 ["Diff Mine/Other" smerge-diff-mine-other |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
200 :help "Diff `mine' and `other' for current conflict" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
201 :active (smerge-check 1)] |
30358 | 202 "--" |
203 ["Invoke Ediff" smerge-ediff | |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
204 :help "Use Ediff to resolve the conflicts" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
205 :active (smerge-check 1)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
206 ["Auto Resolve" smerge-resolve |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
207 :help "Try auto-resolution heuristics" |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
208 :active (smerge-check 1)] |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
209 ["Combine" smerge-combine-with-next |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
210 :help "Combine current conflict with next" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
211 :active (smerge-check 1)] |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
212 )) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
213 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
214 (easy-menu-define smerge-context-menu nil |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
215 "Context menu for mine area in `smerge-mode'." |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
216 '(nil |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
217 ["Keep Current" smerge-keep-current :help "Use current (at point) version"] |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
218 ["Kill Current" smerge-kill-current :help "Remove current (at point) version"] |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
219 ["Keep All" smerge-keep-all :help "Keep all three versions"] |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
220 "---" |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
221 ["More..." (popup-menu smerge-mode-menu) :help "Show full SMerge mode menu"] |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
222 )) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
223 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
224 (defconst smerge-font-lock-keywords |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
225 '((smerge-find-conflict |
35564
b546ef3b2284
(smerge-font-lock-keywords): Relax submatch 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34855
diff
changeset
|
226 (1 smerge-mine-face prepend t) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 (2 smerge-base-face prepend t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (3 smerge-other-face prepend t) |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
229 ;; FIXME: `keep' doesn't work right with syntactic fontification. |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
230 (0 smerge-markers-face keep) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 (4 nil t t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 (5 nil t t))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 "Font lock patterns for `smerge-mode'.") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 (defconst smerge-begin-re "^<<<<<<< \\(.*\\)\n") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 (defconst smerge-end-re "^>>>>>>> .*\n") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 (defconst smerge-base-re "^||||||| .*\n") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 (defconst smerge-other-re "^=======\n") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
240 (defvar smerge-conflict-style nil |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
241 "Keep track of which style of conflict is in use. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
242 Can be nil if the style is undecided, or else: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
243 - `diff3-E' |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
244 - `diff3-A'") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
245 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
246 ;; Compiler pacifiers |
52779
3bc7b9f71e34
Previous change was bogus. Something odd in pcl-cvs...
Dave Love <fx@gnu.org>
parents:
52778
diff
changeset
|
247 (defvar font-lock-mode) |
3bc7b9f71e34
Previous change was bogus. Something odd in pcl-cvs...
Dave Love <fx@gnu.org>
parents:
52778
diff
changeset
|
248 (defvar font-lock-keywords) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
249 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
250 ;;;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
251 ;;;; Actual code |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
252 ;;;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
254 ;; Define smerge-next and smerge-prev |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
255 (easy-mmode-define-navigation smerge smerge-begin-re "conflict") |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
257 (defconst smerge-match-names ["conflict" "mine" "base" "other"]) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
258 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
259 (defun smerge-ensure-match (n) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
260 (unless (match-end n) |
63488
31f53cf94303
(smerge-ensure-match): Don't use `format' on `error' arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
63205
diff
changeset
|
261 (error "No `%s'" (aref smerge-match-names n)))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
263 (defun smerge-auto-leave () |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
264 (when (and smerge-auto-leave |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
265 (save-excursion (goto-char (point-min)) |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
266 (not (re-search-forward smerge-begin-re nil t)))) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
267 (when (and (listp buffer-undo-list) smerge-mode) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
268 (push (list 'apply 'smerge-mode 1) buffer-undo-list)) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
269 (smerge-mode -1))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
270 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
271 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
272 (defun smerge-keep-all () |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
273 "Concatenate all versions." |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
274 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
275 (smerge-match-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
276 (let ((mb2 (or (match-beginning 2) (point-max))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
277 (me2 (or (match-end 2) (point-min)))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
278 (delete-region (match-end 3) (match-end 0)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
279 (delete-region (max me2 (match-end 1)) (match-beginning 3)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
280 (if (and (match-end 2) (/= (match-end 1) (match-end 3))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
281 (delete-region (match-end 1) (match-beginning 2))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
282 (delete-region (match-beginning 0) (min (match-beginning 1) mb2)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
283 (smerge-auto-leave))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
284 |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
285 (defun smerge-keep-n (n) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
286 (smerge-remove-props (match-beginning 0) (match-end 0)) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
287 ;; We used to use replace-match, but that did not preserve markers so well. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
288 (delete-region (match-end n) (match-end 0)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
289 (delete-region (match-beginning 0) (match-beginning n))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
291 (defun smerge-combine-with-next () |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
292 "Combine the current conflict with the next one." |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
293 (interactive) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
294 (smerge-match-conflict) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
295 (let ((ends nil)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
296 (dolist (i '(3 2 1 0)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
297 (push (if (match-end i) (copy-marker (match-end i) t)) ends)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
298 (setq ends (apply 'vector ends)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
299 (goto-char (aref ends 0)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
300 (if (not (re-search-forward smerge-begin-re nil t)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
301 (error "No next conflict") |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
302 (smerge-match-conflict) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
303 (let ((match-data (mapcar (lambda (m) (if m (copy-marker m))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
304 (match-data)))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
305 ;; First copy the in-between text in each alternative. |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
306 (dolist (i '(1 2 3)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
307 (when (aref ends i) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
308 (goto-char (aref ends i)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
309 (insert-buffer-substring (current-buffer) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
310 (aref ends 0) (car match-data)))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
311 (delete-region (aref ends 0) (car match-data)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
312 ;; Then move the second conflict's alternatives into the first. |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
313 (dolist (i '(1 2 3)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
314 (set-match-data match-data) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
315 (when (and (aref ends i) (match-end i)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
316 (goto-char (aref ends i)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
317 (insert-buffer-substring (current-buffer) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
318 (match-beginning i) (match-end i)))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
319 (delete-region (car match-data) (cadr match-data)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
320 ;; Free the markers. |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
321 (dolist (m match-data) (if m (move-marker m nil))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
322 (mapc (lambda (m) (if m (move-marker m nil))) ends))))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
323 |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
324 (defvar smerge-resolve-function |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
325 (lambda () (error "Don't know how to resolve")) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
326 "Mode-specific merge function. |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
327 The function is called with zero or one argument (non-nil if the resolution |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
328 function should only apply safe heuristics) and with the match data set |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
329 according to `smerge-match-conflict'.") |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
330 (add-to-list 'debug-ignored-errors "Don't know how to resolve") |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
331 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
332 (defvar smerge-text-properties |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
333 `(help-echo "merge conflict: mouse-3 shows a menu" |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
334 ;; mouse-face highlight |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
335 keymap (keymap (down-mouse-3 . smerge-popup-context-menu)))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
336 |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
337 (defun smerge-remove-props (beg end) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
338 (remove-overlays beg end 'smerge 'refine) |
65658
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
339 (remove-overlays beg end 'smerge 'conflict) |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
340 ;; Now that we use overlays rather than text-properties, this function |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
341 ;; does not cause refontification any more. It can be seen very clearly |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
342 ;; in buffers where jit-lock-contextually is not t, in which case deleting |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
343 ;; the "<<<<<<< foobar" leading line leaves the rest of the conflict |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
344 ;; highlighted as if it were still a valid conflict. Note that in many |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
345 ;; important cases (such as the previous example) we're actually called |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
346 ;; during font-locking so inhibit-modification-hooks is non-nil, so we |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
347 ;; can't just modify the buffer and expect font-lock to be triggered as in: |
5bde6d4759d6
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65379
diff
changeset
|
348 ;; (put-text-property beg end 'smerge-force-highlighting nil) |
76397
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
349 (let ((modified (buffer-modified-p))) |
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
350 (remove-text-properties beg end '(fontified nil)) |
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
351 (restore-buffer-modified-p modified))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
352 |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
353 (defun smerge-popup-context-menu (event) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
354 "Pop up the Smerge mode context menu under mouse." |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
355 (interactive "e") |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
356 (if (and smerge-mode |
54872
367886fbcfd9
(smerge-popup-context-menu): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54527
diff
changeset
|
357 (save-excursion (posn-set-point (event-end event)) (smerge-check 1))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
358 (progn |
54872
367886fbcfd9
(smerge-popup-context-menu): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54527
diff
changeset
|
359 (posn-set-point (event-end event)) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
360 (smerge-match-conflict) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
361 (let ((i (smerge-get-current)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
362 o) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
363 (if (<= i 0) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
364 ;; Out of range |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
365 (popup-menu smerge-mode-menu) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
366 ;; Install overlay. |
55258
04a44f089cc1
(smerge-diff-switches): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54904
diff
changeset
|
367 (setq o (make-overlay (match-beginning i) (match-end i))) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
368 (unwind-protect |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
369 (progn |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
370 (overlay-put o 'face 'highlight) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
371 (sit-for 0) ;Display the new highlighting. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
372 (popup-menu smerge-context-menu)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
373 ;; Delete overlay. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
374 (delete-overlay o))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
375 ;; There's no conflict at point, the text-props are just obsolete. |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
376 (save-excursion |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
377 (let ((beg (re-search-backward smerge-end-re nil t)) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
378 (end (re-search-forward smerge-begin-re nil t))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
379 (smerge-remove-props (or beg (point-min)) (or end (point-max))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
380 (push event unread-command-events))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
381 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
382 (defun smerge-resolve (&optional safe) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
383 "Resolve the conflict at point intelligently. |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
384 This relies on mode-specific knowledge and thus only works in |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
385 some major modes. Uses `smerge-resolve-function' to do the actual work." |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
386 (interactive) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
387 (smerge-match-conflict) |
65379
66ed969ca7cc
(smerge-resolve): Pass args to smerge-remove-props.
Richard M. Stallman <rms@gnu.org>
parents:
65131
diff
changeset
|
388 (smerge-remove-props (match-beginning 0) (match-end 0)) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
389 (cond |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
390 ;; Trivial diff3 -A non-conflicts. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
391 ((and (eq (match-end 1) (match-end 3)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
392 (eq (match-beginning 1) (match-beginning 3))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
393 (smerge-keep-n 3)) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
394 ;; Mode-specific conflict resolution. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
395 ((condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
396 (atomic-change-group |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
397 (if safe |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
398 (funcall smerge-resolve-function safe) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
399 (funcall smerge-resolve-function)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
400 t) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
401 (error nil)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
402 ;; Nothing to do: the resolution function has done it already. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
403 nil) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
404 ;; FIXME: Add "if [ diff -b MINE OTHER ]; then select OTHER; fi" |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
405 ((and (match-end 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
406 ;; FIXME: Add "diff -b BASE MINE | patch OTHER". |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
407 ;; FIXME: Add "diff -b BASE OTHER | patch MINE". |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
408 nil) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
409 ) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
410 ((and (not (match-end 2)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
411 ;; FIXME: Add "diff -b"-based refinement. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
412 nil) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
413 ) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
414 (t |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
415 (error "Don't know how to resolve"))) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
416 (smerge-auto-leave)) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
417 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
418 (defun smerge-resolve-all () |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
419 "Perform automatic resolution on all conflicts." |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
420 (interactive) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
421 (save-excursion |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
422 (goto-char (point-min)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
423 (while (re-search-forward smerge-begin-re nil t) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
424 (condition-case nil |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
425 (progn |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
426 (smerge-match-conflict) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
427 (smerge-resolve 'safe)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
428 (error nil))))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
429 |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
430 (defun smerge-batch-resolve () |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
431 ;; command-line-args-left is what is left of the command line. |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
432 (if (not noninteractive) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
433 (error "`smerge-batch-resolve' is to be used only with -batch")) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
434 (while command-line-args-left |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
435 (let ((file (pop command-line-args-left))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
436 (message "Resolving conflicts in %s..." file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
437 (when (file-readable-p file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
438 (with-current-buffer (find-file-noselect file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
439 (smerge-resolve-all) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
440 (save-buffer) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
441 (kill-buffer (current-buffer))))))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
442 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
443 (defun smerge-keep-base () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
444 "Revert to the base version." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
445 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
446 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
447 (smerge-ensure-match 2) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
448 (smerge-keep-n 2) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
449 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
450 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
451 (defun smerge-keep-other () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
452 "Use \"other\" version." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
453 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 ;;(smerge-ensure-match 3) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
456 (smerge-keep-n 3) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
457 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
458 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
459 (defun smerge-keep-mine () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
460 "Keep your version." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
461 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
463 ;;(smerge-ensure-match 1) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
464 (smerge-keep-n 1) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
465 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
466 |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
467 (defun smerge-get-current () |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
468 (let ((i 3)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
469 (while (or (not (match-end i)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
470 (< (point) (match-beginning i)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 (>= (point) (match-end i))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 (decf i)) |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
473 i)) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
474 |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
475 (defun smerge-keep-current () |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
476 "Use the current (under the cursor) version." |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
477 (interactive) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
478 (smerge-match-conflict) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
479 (let ((i (smerge-get-current))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
480 (if (<= i 0) (error "Not inside a version") |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
481 (smerge-keep-n i) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
482 (smerge-auto-leave)))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
483 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
484 (defun smerge-kill-current () |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
485 "Remove the current (under the cursor) version." |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
486 (interactive) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
487 (smerge-match-conflict) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
488 (let ((i (smerge-get-current))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
489 (if (<= i 0) (error "Not inside a version") |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
490 (let ((left nil)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
491 (dolist (n '(3 2 1)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
492 (if (and (match-end n) (/= (match-end n) (match-end i))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
493 (push n left))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
494 (if (and (cdr left) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
495 (/= (match-end (car left)) (match-end (cadr left)))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
496 (ding) ;We don't know how to do that. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
497 (smerge-keep-n (car left)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
498 (smerge-auto-leave)))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
499 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
500 (defun smerge-diff-base-mine () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
501 "Diff 'base' and 'mine' version in current conflict region." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
502 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
503 (smerge-diff 2 1)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
504 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
505 (defun smerge-diff-base-other () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
506 "Diff 'base' and 'other' version in current conflict region." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
507 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
508 (smerge-diff 2 3)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
509 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
510 (defun smerge-diff-mine-other () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
511 "Diff 'mine' and 'other' version in current conflict region." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
512 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
513 (smerge-diff 1 3)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
514 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
515 (defun smerge-match-conflict () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
516 "Get info about the conflict. Puts the info in the `match-data'. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
517 The submatches contain: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
518 0: the whole conflict. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
519 1: your code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
520 2: the base code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
521 3: other code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 An error is raised if not inside a conflict." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
523 (save-excursion |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
524 (condition-case nil |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
525 (let* ((orig-point (point)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
526 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
527 (_ (forward-line 1)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
528 (_ (re-search-backward smerge-begin-re)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
529 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 (start (match-beginning 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
531 (mine-start (match-end 0)) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
532 (filename (or (match-string 1) "")) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
534 (_ (re-search-forward smerge-end-re)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
535 (_ (assert (< orig-point (match-end 0)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
536 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
537 (other-end (match-beginning 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538 (end (match-end 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
539 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
540 (_ (re-search-backward smerge-other-re start)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
541 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
542 (mine-end (match-beginning 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
543 (other-start (match-end 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
544 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
545 base-start base-end) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
546 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
547 ;; handle the various conflict styles |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
548 (cond |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
549 ((save-excursion |
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
550 (goto-char mine-start) |
54904
a23bbf466906
(smerge-match-conflict): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54903
diff
changeset
|
551 (re-search-forward smerge-begin-re end t)) |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
552 ;; There's a nested conflict and we're after the the beginning |
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
553 ;; of the outer one but before the beginning of the inner one. |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
554 ;; Of course, maybe this is not a nested conflict but in that |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
555 ;; case it can only be something nastier that we don't know how |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
556 ;; to handle, so may as well arbitrarily decide to treat it as |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
557 ;; a nested conflict. --Stef |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
558 (error "There is a nested conflict")) |
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
559 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
560 ((re-search-backward smerge-base-re start t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
561 ;; a 3-parts conflict |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
562 (set (make-local-variable 'smerge-conflict-style) 'diff3-A) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
563 (setq base-end mine-end) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
564 (setq mine-end (match-beginning 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
565 (setq base-start (match-end 0))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
566 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
567 ((string= filename (file-name-nondirectory |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
568 (or buffer-file-name ""))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
569 ;; a 2-parts conflict |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
570 (set (make-local-variable 'smerge-conflict-style) 'diff3-E)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
571 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
572 ((and (not base-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
573 (or (eq smerge-conflict-style 'diff3-A) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
574 (equal filename "ANCESTOR") |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
575 (string-match "\\`[.0-9]+\\'" filename))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
576 ;; a same-diff conflict |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
577 (setq base-start mine-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
578 (setq base-end mine-end) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
579 (setq mine-start other-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
580 (setq mine-end other-end))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
581 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
582 (store-match-data (list start end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
583 mine-start mine-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
584 base-start base-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
585 other-start other-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
586 (when base-start (1- base-start)) base-start |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
587 (1- other-start) other-start)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
588 t) |
41064
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
589 (search-failed (error "Point not in conflict region"))))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
590 |
76397
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
591 (add-to-list 'debug-ignored-errors "Point not in conflict region") |
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
592 |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
593 (defun smerge-conflict-overlay (pos) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
594 "Return the conflict overlay at POS if any." |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
595 (let ((ols (overlays-at pos)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
596 conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
597 (dolist (ol ols) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
598 (if (and (eq (overlay-get ol 'smerge) 'conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
599 (> (overlay-end ol) pos)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
600 (setq conflict ol))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
601 conflict)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
602 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
603 (defun smerge-find-conflict (&optional limit) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
604 "Find and match a conflict region. Intended as a font-lock MATCHER. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
605 The submatches are the same as in `smerge-match-conflict'. |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
606 Returns non-nil if a match is found between point and LIMIT. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
607 Point is moved to the end of the conflict." |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
608 (let ((found nil) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
609 (pos (point)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
610 conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
611 ;; First check to see if point is already inside a conflict, using |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
612 ;; the conflict overlays. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
613 (while (and (not found) (setq conflict (smerge-conflict-overlay pos))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
614 ;; Check the overlay's validity and kill it if it's out of date. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
615 (condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
616 (progn |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
617 (goto-char (overlay-start conflict)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
618 (smerge-match-conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
619 (goto-char (match-end 0)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
620 (if (<= (point) pos) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
621 (error "Matching backward!") |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
622 (setq found t))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
623 (error (smerge-remove-props |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
624 (overlay-start conflict) (overlay-end conflict)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
625 (goto-char pos)))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
626 ;; If we're not already inside a conflict, look for the next conflict |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
627 ;; and add/update its overlay. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
628 (while (and (not found) (re-search-forward smerge-begin-re limit t)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
629 (condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
630 (progn |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
631 (smerge-match-conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
632 (goto-char (match-end 0)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
633 (let ((conflict (smerge-conflict-overlay (1- (point))))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
634 (if conflict |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
635 ;; Update its location, just in case it got messed up. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
636 (move-overlay conflict (match-beginning 0) (match-end 0)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
637 (setq conflict (make-overlay (match-beginning 0) (match-end 0) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
638 nil 'front-advance nil)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
639 (overlay-put conflict 'evaporate t) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
640 (overlay-put conflict 'smerge 'conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
641 (let ((props smerge-text-properties)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
642 (while props |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
643 (overlay-put conflict (pop props) (pop props)))))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
644 (setq found t)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
645 (error nil))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
646 found)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
647 |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
648 (defun smerge-refine-chopup-region (beg end file) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
649 "Chopup the region into small elements, one per line." |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
650 ;; ediff chops up into words, where the definition of a word is |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
651 ;; customizable. Instead we here keep only one char per line. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
652 ;; The advantages are that there's nothing to configure, that we get very |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
653 ;; fine results, and that it's trivial to map the line numbers in the |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
654 ;; output of diff back into buffer positions. The disadvantage is that it |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
655 ;; can take more time to compute the diff and that the result is sometimes |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
656 ;; too fine. I'm not too concerned about the slowdown because conflicts |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
657 ;; are usually significantly smaller than the whole file. As for the |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
658 ;; problem of too-fine-refinement, I have found it to be unimportant |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
659 ;; especially when you consider the cases where the fine-grain is just |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
660 ;; what you want. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
661 (let ((buf (current-buffer))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
662 (with-temp-buffer |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
663 (insert-buffer-substring buf beg end) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
664 (goto-char (point-min)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
665 (while (not (eobp)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
666 (forward-char 1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
667 (unless (eq (char-before) ?\n) (insert ?\n))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
668 (let ((coding-system-for-write 'emacs-mule)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
669 (write-region (point-min) (point-max) file nil 'nomessage))))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
670 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
671 (defun smerge-refine-highlight-change (buf beg match-num1 match-num2) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
672 (let* ((startline (string-to-number (match-string match-num1))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
673 (ol (make-overlay |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
674 (+ beg startline -1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
675 (+ beg (if (match-end match-num2) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
676 (string-to-number (match-string match-num2)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
677 startline)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
678 buf |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
679 'front-advance nil))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
680 (overlay-put ol 'smerge 'refine) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
681 (overlay-put ol 'evaporate t) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
682 (overlay-put ol 'face 'smerge-refined-change))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
683 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
684 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
685 (defun smerge-refine () |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
686 "Highlight the parts of the conflict that are different." |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
687 (interactive) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
688 ;; FIXME: make it work with 3-way conflicts. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
689 (smerge-match-conflict) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
690 (remove-overlays (match-beginning 0) (match-end 0) 'smerge 'refine) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
691 (smerge-ensure-match 1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
692 (smerge-ensure-match 3) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
693 (let ((buf (current-buffer)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
694 ;; Read them before the match-data gets clobbered. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
695 (beg1 (match-beginning 1)) (end1 (match-end 1)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
696 (beg2 (match-beginning 3)) (end2 (match-end 3)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
697 (file1 (make-temp-file "smerge1")) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
698 (file2 (make-temp-file "smerge2"))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
699 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
700 ;; Chop up regions into smaller elements and save into files. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
701 (smerge-refine-chopup-region beg1 end1 file1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
702 (smerge-refine-chopup-region beg2 end2 file2) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
703 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
704 ;; Call diff on those files. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
705 (unwind-protect |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
706 (with-temp-buffer |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
707 (let ((coding-system-for-read 'emacs-mule)) |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
708 ;; Don't forget -a to make sure diff treats it as a text file |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
709 ;; even if it contains \0 and such. |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
710 (call-process diff-command nil t nil "-a" file1 file2)) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
711 ;; Process diff's output. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
712 (goto-char (point-min)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
713 (while (not (eobp)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
714 (if (not (looking-at "\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?\\([acd]\\)\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?$")) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
715 (error "Unexpected patch hunk header: %s" |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
716 (buffer-substring (point) (line-end-position))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
717 (let ((op (char-after (match-beginning 3)))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
718 (when (memq op '(?d ?c)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
719 (smerge-refine-highlight-change buf beg1 1 2)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
720 (when (memq op '(?a ?c)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
721 (smerge-refine-highlight-change buf beg2 4 5))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
722 (forward-line 1) ;Skip hunk header. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
723 (and (re-search-forward "^[0-9]" nil 'move) ;Skip hunk body. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
724 (goto-char (match-beginning 0)))))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
725 (delete-file file1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
726 (delete-file file2)))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
727 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
728 (defun smerge-diff (n1 n2) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
729 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
730 (smerge-ensure-match n1) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
731 (smerge-ensure-match n2) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
732 (let ((name1 (aref smerge-match-names n1)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
733 (name2 (aref smerge-match-names n2)) |
41064
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
734 ;; Read them before the match-data gets clobbered. |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
735 (beg1 (match-beginning n1)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
736 (end1 (match-end n1)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
737 (beg2 (match-beginning n2)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
738 (end2 (match-end n2)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
739 (file1 (make-temp-file "smerge1")) |
32217
44f7f2635fec
(smerge-diff): Setup the buffer's default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32164
diff
changeset
|
740 (file2 (make-temp-file "smerge2")) |
44f7f2635fec
(smerge-diff): Setup the buffer's default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32164
diff
changeset
|
741 (dir default-directory) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
742 (file (if buffer-file-name (file-relative-name buffer-file-name))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
743 ;; We would want to use `emacs-mule-unix' for read&write, but we |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
744 ;; bump into problems with the coding-system used by diff to write |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
745 ;; the file names and the time stamps in the header. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
746 ;; `buffer-file-coding-system' is not always correct either, but if |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
747 ;; the OS/user uses only one coding-system, then it works. |
41064
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
748 (coding-system-for-read buffer-file-coding-system)) |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
749 (write-region beg1 end1 file1 nil 'nomessage) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
750 (write-region beg2 end2 file2 nil 'nomessage) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
751 (unwind-protect |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
752 (with-current-buffer (get-buffer-create smerge-diff-buffer-name) |
32217
44f7f2635fec
(smerge-diff): Setup the buffer's default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32164
diff
changeset
|
753 (setq default-directory dir) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
754 (let ((inhibit-read-only t)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
755 (erase-buffer) |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
756 (let ((status |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
757 (apply 'call-process diff-command nil t nil |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
758 (append smerge-diff-switches |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
759 (list "-L" (concat name1 "/" file) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
760 "-L" (concat name2 "/" file) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
761 file1 file2))))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
762 (if (eq status 0) (insert "No differences found.\n")))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
763 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
764 (diff-mode) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
765 (display-buffer (current-buffer) t)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
766 (delete-file file1) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
767 (delete-file file2)))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
768 |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
769 ;; compiler pacifiers |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
770 (defvar smerge-ediff-windows) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
771 (defvar smerge-ediff-buf) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
772 (defvar ediff-buffer-A) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
773 (defvar ediff-buffer-B) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
774 (defvar ediff-buffer-C) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
775 (defvar ediff-ancestor-buffer) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
776 (defvar ediff-quit-hook) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
777 |
47821
45dcf3407814
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47756
diff
changeset
|
778 ;;;###autoload |
47756
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
779 (defun smerge-ediff (&optional name-mine name-other name-base) |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
780 "Invoke ediff to resolve the conflicts. |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
781 NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
782 buffer names." |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
783 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
784 (let* ((buf (current-buffer)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
785 (mode major-mode) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
786 ;;(ediff-default-variant 'default-B) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
787 (config (current-window-configuration)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
788 (filename (file-name-nondirectory buffer-file-name)) |
47756
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
789 (mine (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
790 (or name-mine (concat "*" filename " MINE*")))) |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
791 (other (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
792 (or name-other (concat "*" filename " OTHER*")))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
793 base) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
794 (with-current-buffer mine |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
795 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
796 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
797 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
798 (while (smerge-find-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
799 (when (match-beginning 2) (setq base t)) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
800 (smerge-keep-n 1)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
801 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
802 (set-buffer-modified-p nil) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
803 (funcall mode)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
804 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
805 (with-current-buffer other |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
806 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
807 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
808 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
809 (while (smerge-find-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
810 (smerge-keep-n 3)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
811 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
812 (set-buffer-modified-p nil) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
813 (funcall mode)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
814 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
815 (when base |
47756
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
816 (setq base (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
817 (or name-base (concat "*" filename " BASE*")))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
818 (with-current-buffer base |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
819 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
820 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
821 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
822 (while (smerge-find-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
823 (if (match-end 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
824 (smerge-keep-n 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
825 (delete-region (match-beginning 0) (match-end 0)))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
826 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
827 (set-buffer-modified-p nil) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
828 (funcall mode))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
829 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
830 ;; the rest of the code is inspired from vc.el |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
831 ;; Fire up ediff. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
832 (set-buffer |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
833 (if base |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
834 (ediff-merge-buffers-with-ancestor mine other base) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
835 ;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
836 (ediff-merge-buffers mine other))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
837 ;; nil 'ediff-merge-revisions buffer-file-name))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
838 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
839 ;; Ediff is now set up, and we are in the control buffer. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
840 ;; Do a few further adjustments and take precautions for exit. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
841 (set (make-local-variable 'smerge-ediff-windows) config) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
842 (set (make-local-variable 'smerge-ediff-buf) buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
843 (set (make-local-variable 'ediff-quit-hook) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
844 (lambda () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
845 (let ((buffer-A ediff-buffer-A) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
846 (buffer-B ediff-buffer-B) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
847 (buffer-C ediff-buffer-C) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
848 (buffer-Ancestor ediff-ancestor-buffer) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
849 (buf smerge-ediff-buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
850 (windows smerge-ediff-windows)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
851 (ediff-cleanup-mess) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
852 (with-current-buffer buf |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
853 (erase-buffer) |
64637
a975a8beec7f
(smerge-ediff): Use insert-buffer-substring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64091
diff
changeset
|
854 (insert-buffer-substring buffer-C) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
855 (kill-buffer buffer-A) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
856 (kill-buffer buffer-B) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
857 (kill-buffer buffer-C) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
858 (when (bufferp buffer-Ancestor) (kill-buffer buffer-Ancestor)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
859 (set-window-configuration windows) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
860 (message "Conflict resolution finished; you may save the buffer"))))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
861 (message "Please resolve conflicts now; exit ediff when done"))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
862 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
863 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
864 (defconst smerge-parsep-re |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
865 (concat smerge-begin-re "\\|" smerge-end-re "\\|" |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
866 smerge-base-re "\\|" smerge-other-re "\\|")) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
867 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
868 ;;;###autoload |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
869 (define-minor-mode smerge-mode |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
870 "Minor mode to simplify editing output from the diff3 program. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
871 \\{smerge-mode-map}" |
61277
7fa982932904
(smerge-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
55258
diff
changeset
|
872 :group 'smerge :lighter " SMerge" |
38611
7f82c0bbe525
(smerge-mode): Check if `font-lock-mode' is bound
Gerd Moellmann <gerd@gnu.org>
parents:
37674
diff
changeset
|
873 (when (and (boundp 'font-lock-mode) font-lock-mode) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
874 (save-excursion |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
875 (if smerge-mode |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
876 (font-lock-add-keywords nil smerge-font-lock-keywords 'append) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
877 (font-lock-remove-keywords nil smerge-font-lock-keywords)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
878 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
879 (while (smerge-find-conflict) |
34842
f05ec8dfc452
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34840
diff
changeset
|
880 (save-excursion |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
881 (font-lock-fontify-region (match-beginning 0) (match-end 0) nil))))) |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
882 (if (string-match (regexp-quote smerge-parsep-re) paragraph-separate) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
883 (unless smerge-mode |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
884 (set (make-local-variable 'paragraph-separate) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
885 (replace-match "" t t paragraph-separate))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
886 (when smerge-mode |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
887 (set (make-local-variable 'paragraph-separate) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
888 (concat smerge-parsep-re paragraph-separate)))) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
889 (unless smerge-mode |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
890 (smerge-remove-props (point-min) (point-max)))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
891 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
892 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
893 (provide 'smerge-mode) |
52401 | 894 |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
895 ;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
896 ;;; smerge-mode.el ends here |