Mercurial > emacs
annotate lisp/smerge-mode.el @ 91059:12589730c028
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 901)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-273
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 20 Oct 2007 02:30:26 +0000 |
parents | 4b09bb044f38 |
children | 4bc33ffdda1a |
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 |
91059 | 82 (defcustom smerge-auto-refine t |
83 "Automatically highlight changes in detail as the user visits conflicts." | |
84 :type 'boolean) | |
85 | |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
86 (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
|
87 '((((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
|
88 (:foreground "blue1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
89 (((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
|
90 (:foreground "blue")) |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
91 (((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
|
92 (: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
|
93 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
94 (:foreground "cyan"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
95 "Face for your code." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
96 :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
|
97 ;; 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
|
98 (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
|
99 (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
|
100 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
101 (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
|
102 '((((background light)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
103 (:foreground "darkgreen")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
104 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
105 (:foreground "lightgreen"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 "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
|
107 :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
|
108 ;; 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
|
109 (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
|
110 (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
|
111 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
112 (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
|
113 '((((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
|
114 (:foreground "red1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61277
diff
changeset
|
115 (((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
|
116 (:foreground "red")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
117 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
118 (:foreground "orange"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
119 "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
|
120 :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
|
121 ;; 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
|
122 (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
|
123 (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
|
124 |
63205
6dde8ad3e1a7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
125 (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
|
126 '((((background light)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
127 (:background "grey85")) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
128 (((background dark)) |
a3d5adc99010
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Miles Bader <miles@gnu.org>
parents:
30868
diff
changeset
|
129 (:background "grey30"))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 "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
|
131 :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
|
132 ;; 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
|
133 (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
|
134 (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
|
135 |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
136 (defface smerge-refined-change |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
137 '((t :background "yellow")) |
65131
ebbbce58e84c
(smerge-refined-change): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents:
65129
diff
changeset
|
138 "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
|
139 :group 'smerge) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
140 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
141 (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
|
142 `(("n" . smerge-next) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 ("p" . smerge-prev) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
144 ("r" . smerge-resolve) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 ("a" . smerge-keep-all) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
146 ("b" . smerge-keep-base) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
147 ("o" . smerge-keep-other) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 ("m" . smerge-keep-mine) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
149 ("E" . smerge-ediff) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
150 ("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
|
151 ("R" . smerge-refine) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 ("\C-m" . smerge-keep-current) |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
153 ("=" . ,(make-sparse-keymap "Diff")) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
154 ("=<" "base-mine" . smerge-diff-base-mine) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
155 ("=>" "base-other" . smerge-diff-base-other) |
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
156 ("==" "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
|
157 "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
|
158 |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
159 (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
|
160 "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
|
161 :group 'smerge |
34840
509ed3724af0
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32217
diff
changeset
|
162 :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
|
163 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
164 (easy-mmode-defmap smerge-mode-map |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
165 `((,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
|
166 "Keymap for `smerge-mode'.") |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
168 (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
|
169 (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
|
170 (defun smerge-check (n) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
171 (condition-case nil |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
172 (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
|
173 (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
|
174 (smerge-match-conflict) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
175 (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
|
176 (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
|
177 (error nil))) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
178 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
179 (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
|
180 "Menu for `smerge-mode'." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
181 '("SMerge" |
30358 | 182 ["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
|
183 ["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
|
184 "--" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
185 ["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
|
186 :active (smerge-check 1)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
187 ["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
|
188 :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
|
189 "--" |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
190 ["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
|
191 :active (smerge-check 2)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
192 ["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
|
193 :active (smerge-check 3)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
194 ["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
|
195 :active (smerge-check 1)] |
30358 | 196 "--" |
197 ["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
|
198 :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
|
199 :active (smerge-check 2)] |
30358 | 200 ["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
|
201 :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
|
202 :active (smerge-check 2)] |
30358 | 203 ["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
|
204 :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
|
205 :active (smerge-check 1)] |
30358 | 206 "--" |
207 ["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
|
208 :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
|
209 :active (smerge-check 1)] |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
210 ["Auto Resolve" smerge-resolve |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
211 :help "Try auto-resolution heuristics" |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
212 :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
|
213 ["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
|
214 :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
|
215 :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
|
216 )) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
217 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
218 (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
|
219 "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
|
220 '(nil |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
221 ["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
|
222 ["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
|
223 ["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
|
224 "---" |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
225 ["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
|
226 )) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
227 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (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
|
229 '((smerge-find-conflict |
35564
b546ef3b2284
(smerge-font-lock-keywords): Relax submatch 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34855
diff
changeset
|
230 (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
|
231 (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
|
232 (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
|
233 ;; 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
|
234 (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
|
235 (4 nil t t) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 (5 nil t t))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 "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
|
238 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 (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
|
240 (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
|
241 (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
|
242 (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
|
243 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
244 (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
|
245 "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
|
246 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
|
247 - `diff3-E' |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
248 - `diff3-A'") |
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 ;; Compiler pacifiers |
52779
3bc7b9f71e34
Previous change was bogus. Something odd in pcl-cvs...
Dave Love <fx@gnu.org>
parents:
52778
diff
changeset
|
251 (defvar font-lock-mode) |
3bc7b9f71e34
Previous change was bogus. Something odd in pcl-cvs...
Dave Love <fx@gnu.org>
parents:
52778
diff
changeset
|
252 (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
|
253 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 ;;;; |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 ;;;; Actual code |
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 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
258 ;; Define smerge-next and smerge-prev |
91059 | 259 (easy-mmode-define-navigation smerge smerge-begin-re "conflict" nil nil |
260 (if smerge-auto-refine | |
261 (condition-case nil (smerge-refine) (error nil)))) | |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
263 (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
|
264 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
265 (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
|
266 (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
|
267 (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
|
268 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
269 (defun smerge-auto-leave () |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
270 (when (and smerge-auto-leave |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
271 (save-excursion (goto-char (point-min)) |
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
272 (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
|
273 (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
|
274 (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
|
275 (smerge-mode -1))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
276 |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
277 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
278 (defun smerge-keep-all () |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
279 "Concatenate all versions." |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
280 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
281 (smerge-match-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
282 (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
|
283 (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
|
284 (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
|
285 (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
|
286 (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
|
287 (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
|
288 (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
|
289 (smerge-auto-leave))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
290 |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
291 (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
|
292 (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
|
293 ;; 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
|
294 (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
|
295 (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
|
296 |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
297 (defun smerge-combine-with-next () |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
298 "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
|
299 (interactive) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
300 (smerge-match-conflict) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
301 (let ((ends nil)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
302 (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
|
303 (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
|
304 (setq ends (apply 'vector ends)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
305 (goto-char (aref ends 0)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
306 (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
|
307 (error "No next conflict") |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
308 (smerge-match-conflict) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
309 (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
|
310 (match-data)))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
311 ;; 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
|
312 (dolist (i '(1 2 3)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
313 (when (aref ends i) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
314 (goto-char (aref ends i)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
315 (insert-buffer-substring (current-buffer) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
316 (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
|
317 (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
|
318 ;; 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
|
319 (dolist (i '(1 2 3)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
320 (set-match-data match-data) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
321 (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
|
322 (goto-char (aref ends i)) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
323 (insert-buffer-substring (current-buffer) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
324 (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
|
325 (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
|
326 ;; Free the markers. |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
327 (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
|
328 (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
|
329 |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
330 (defvar smerge-resolve-function |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
331 (lambda () (error "Don't know how to resolve")) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
332 "Mode-specific merge function. |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
333 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
|
334 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
|
335 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
|
336 (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
|
337 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
338 (defvar smerge-text-properties |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
339 `(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
|
340 ;; mouse-face highlight |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
341 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
|
342 |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
343 (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
|
344 (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
|
345 (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
|
346 ;; 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
|
347 ;; 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
|
348 ;; 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
|
349 ;; 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
|
350 ;; 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
|
351 ;; 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
|
352 ;; 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
|
353 ;; 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
|
354 ;; (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
|
355 (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
|
356 (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
|
357 (restore-buffer-modified-p modified))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
358 |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
359 (defun smerge-popup-context-menu (event) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
360 "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
|
361 (interactive "e") |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
362 (if (and smerge-mode |
54872
367886fbcfd9
(smerge-popup-context-menu): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54527
diff
changeset
|
363 (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
|
364 (progn |
54872
367886fbcfd9
(smerge-popup-context-menu): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54527
diff
changeset
|
365 (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
|
366 (smerge-match-conflict) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
367 (let ((i (smerge-get-current)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
368 o) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
369 (if (<= i 0) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
370 ;; Out of range |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
371 (popup-menu smerge-mode-menu) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
372 ;; Install overlay. |
55258
04a44f089cc1
(smerge-diff-switches): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54904
diff
changeset
|
373 (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
|
374 (unwind-protect |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
375 (progn |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
376 (overlay-put o 'face 'highlight) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
377 (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
|
378 (popup-menu smerge-context-menu)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
379 ;; Delete overlay. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
380 (delete-overlay o))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
381 ;; 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
|
382 (save-excursion |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
383 (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
|
384 (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
|
385 (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
|
386 (push event unread-command-events))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
387 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
388 (defun smerge-resolve (&optional safe) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
389 "Resolve the conflict at point intelligently. |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
390 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
|
391 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
|
392 (interactive) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
393 (smerge-match-conflict) |
65379
66ed969ca7cc
(smerge-resolve): Pass args to smerge-remove-props.
Richard M. Stallman <rms@gnu.org>
parents:
65131
diff
changeset
|
394 (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
|
395 (cond |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
396 ;; Trivial diff3 -A non-conflicts. |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
397 ((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
|
398 (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
|
399 (smerge-keep-n 3)) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
400 ;; Mode-specific conflict resolution. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
401 ((condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
402 (atomic-change-group |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
403 (if safe |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
404 (funcall smerge-resolve-function safe) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
405 (funcall smerge-resolve-function)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
406 t) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
407 (error nil)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
408 ;; 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
|
409 nil) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
410 ;; 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
|
411 ((and (match-end 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
412 ;; 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
|
413 ;; 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
|
414 nil) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
415 ) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
416 ((and (not (match-end 2)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
417 ;; 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
|
418 nil) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
419 ) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
420 (t |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
421 (error "Don't know how to resolve"))) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
422 (smerge-auto-leave)) |
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
423 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
424 (defun smerge-resolve-all () |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
425 "Perform automatic resolution on all conflicts." |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
426 (interactive) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
427 (save-excursion |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
428 (goto-char (point-min)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
429 (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
|
430 (condition-case nil |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
431 (progn |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
432 (smerge-match-conflict) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
433 (smerge-resolve 'safe)) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
434 (error nil))))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
435 |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
436 (defun smerge-batch-resolve () |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
437 ;; 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
|
438 (if (not noninteractive) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
439 (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
|
440 (while command-line-args-left |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
441 (let ((file (pop command-line-args-left))) |
91059 | 442 (if (string-match "\\.rej\\'" file) |
443 ;; .rej files should never contain diff3 markers, on the other hand, | |
444 ;; in Arch, .rej files are sometimes used to indicate that the | |
445 ;; main file has diff3 markers. So you can pass **/*.rej and | |
446 ;; it will DTRT. | |
447 (setq file (substring file 0 (match-beginning 0)))) | |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
448 (message "Resolving conflicts in %s..." file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
449 (when (file-readable-p file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
450 (with-current-buffer (find-file-noselect file) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
451 (smerge-resolve-all) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
452 (save-buffer) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
453 (kill-buffer (current-buffer))))))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
454 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 (defun smerge-keep-base () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
456 "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
|
457 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
458 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
459 (smerge-ensure-match 2) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
460 (smerge-keep-n 2) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
461 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
463 (defun smerge-keep-other () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
464 "Use \"other\" version." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
465 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
466 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
467 ;;(smerge-ensure-match 3) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
468 (smerge-keep-n 3) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
469 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
470 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 (defun smerge-keep-mine () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 "Keep your version." |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
473 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
474 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
475 ;;(smerge-ensure-match 1) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
476 (smerge-keep-n 1) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
477 (smerge-auto-leave)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
478 |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
479 (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
|
480 (let ((i 3)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
481 (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
|
482 (< (point) (match-beginning i)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
483 (>= (point) (match-end i))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
484 (decf i)) |
54332
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
485 i)) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
486 |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
487 (defun smerge-keep-current () |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
488 "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
|
489 (interactive) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
490 (smerge-match-conflict) |
118715eba3b3
(smerge-check-cache, smerge-check): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52779
diff
changeset
|
491 (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
|
492 (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
|
493 (smerge-keep-n i) |
28248
108ba8d61036
(smerge-auto-leave): New function and variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26776
diff
changeset
|
494 (smerge-auto-leave)))) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
495 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
496 (defun smerge-kill-current () |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
497 "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
|
498 (interactive) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
499 (smerge-match-conflict) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
500 (let ((i (smerge-get-current))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
501 (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
|
502 (let ((left nil)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
503 (dolist (n '(3 2 1)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
504 (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
|
505 (push n left))) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
506 (if (and (cdr left) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
507 (/= (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
|
508 (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
|
509 (smerge-keep-n (car left)) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
510 (smerge-auto-leave)))))) |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
511 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
512 (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
|
513 "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
|
514 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
515 (smerge-diff 2 1)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
516 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
517 (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
|
518 "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
|
519 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
520 (smerge-diff 2 3)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
521 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 (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
|
523 "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
|
524 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
525 (smerge-diff 1 3)) |
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 (defun smerge-match-conflict () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
528 "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
|
529 The submatches contain: |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 0: the whole conflict. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
531 1: your code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
532 2: the base code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 3: other code. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
534 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
|
535 (save-excursion |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
536 (condition-case nil |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
537 (let* ((orig-point (point)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
539 (_ (forward-line 1)) |
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-begin-re)) |
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 (start (match-beginning 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
543 (mine-start (match-end 0)) |
47827
9d7b63dcf005
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47821
diff
changeset
|
544 (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
|
545 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
546 (_ (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
|
547 (_ (assert (< orig-point (match-end 0)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
548 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
549 (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
|
550 (end (match-end 0)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
551 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
552 (_ (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
|
553 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
554 (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
|
555 (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
|
556 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
557 base-start base-end) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
558 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
559 ;; 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
|
560 (cond |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
561 ((save-excursion |
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
562 (goto-char mine-start) |
54904
a23bbf466906
(smerge-match-conflict): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54903
diff
changeset
|
563 (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
|
564 ;; 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
|
565 ;; 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
|
566 ;; 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
|
567 ;; 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
|
568 ;; 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
|
569 ;; a nested conflict. --Stef |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
570 (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
|
571 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
572 ((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
|
573 ;; a 3-parts conflict |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
574 (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
|
575 (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
|
576 (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
|
577 (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
|
578 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
579 ((string= filename (file-name-nondirectory |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
580 (or buffer-file-name ""))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
581 ;; a 2-parts conflict |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
582 (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
|
583 |
54402
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
584 ((and (not base-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
585 (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
|
586 (equal filename "ANCESTOR") |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
587 (string-match "\\`[.0-9]+\\'" filename))) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
588 ;; a same-diff conflict |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
589 (setq base-start mine-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
590 (setq base-end mine-end) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
591 (setq mine-start other-start) |
8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
54332
diff
changeset
|
592 (setq mine-end other-end))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
593 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
594 (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
|
595 mine-start mine-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
596 base-start base-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
597 other-start other-end |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
598 (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
|
599 (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
|
600 t) |
41064
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
601 (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
|
602 |
76397
e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
603 (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
|
604 |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
605 (defun smerge-conflict-overlay (pos) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
606 "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
|
607 (let ((ols (overlays-at pos)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
608 conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
609 (dolist (ol ols) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
610 (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
|
611 (> (overlay-end ol) pos)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
612 (setq conflict ol))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
613 conflict)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
614 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
615 (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
|
616 "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
|
617 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
|
618 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
|
619 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
|
620 (let ((found nil) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
621 (pos (point)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
622 conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
623 ;; 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
|
624 ;; the conflict overlays. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
625 (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
|
626 ;; 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
|
627 (condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
628 (progn |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
629 (goto-char (overlay-start conflict)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
630 (smerge-match-conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
631 (goto-char (match-end 0)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
632 (if (<= (point) pos) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
633 (error "Matching backward!") |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
634 (setq found t))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
635 (error (smerge-remove-props |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
636 (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
|
637 (goto-char pos)))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
638 ;; 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
|
639 ;; and add/update its overlay. |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
640 (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
|
641 (condition-case nil |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
642 (progn |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
643 (smerge-match-conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
644 (goto-char (match-end 0)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
645 (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
|
646 (if conflict |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
647 ;; 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
|
648 (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
|
649 (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
|
650 nil 'front-advance nil)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
651 (overlay-put conflict 'evaporate t) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
652 (overlay-put conflict 'smerge 'conflict) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
653 (let ((props smerge-text-properties)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
654 (while props |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
655 (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
|
656 (setq found t)) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
657 (error nil))) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
658 found)) |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
659 |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
660 ;;; Refined change highlighting |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
661 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
662 (defvar smerge-refine-forward-function 'smerge-refine-forward |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
663 "Function used to determine an \"atomic\" element. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
664 You can set it to `forward-char' to get char-level granularity. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
665 Its behavior has mainly two restrictions: |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
666 - if this function encounters a newline, it's important that it stops right |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
667 after the newline. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
668 This only matters if `smerge-refine-ignore-whitespace' is nil. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
669 - it needs to be unaffected by changes performed by the `preproc' argument |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
670 to `smerge-refine-subst'. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
671 This only matters if `smerge-refine-weight-hack' is nil.") |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
672 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
673 (defvar smerge-refine-ignore-whitespace t |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
674 "If non-nil,Indicate that smerge-refine should try to ignore change in whitespace.") |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
675 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
676 (defvar smerge-refine-weight-hack t |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
677 "If non-nil, pass to diff as many lines as there are chars in the region. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
678 I.e. each atomic element (e.g. word) will be copied as many times (on different |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
679 lines) as it has chars. This has 2 advantages: |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
680 - if `diff' tries to minimize the number *lines* (rather than chars) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
681 added/removed, this adjust the weights so that adding/removing long |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
682 symbols is considered correspondingly more costly. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
683 - `smerge-refine-forward-function' only needs to be called when chopping up |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
684 the regions, and `forward-char' can be used afterwards. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
685 It has the following disadvantages: |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
686 - cannot use `diff -w' because the weighting causes added spaces in a line |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
687 to be represented as added copies of some line, so `diff -w' can't do the |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
688 right thing any more. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
689 - may in degenerate cases take a 1KB input region and turn it into a 1MB |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
690 file to pass to diff.") |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
691 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
692 (defun smerge-refine-forward (n) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
693 (let ((case-fold-search nil) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
694 (re "[[:upper:]]?[[:lower:]]+\\|[[:upper:]]+\\|[[:digit:]]+\\|.\\|\n")) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
695 (when (and smerge-refine-ignore-whitespace |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
696 ;; smerge-refine-weight-hack causes additional spaces to |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
697 ;; appear as additional lines as well, so even if diff ignore |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
698 ;; whitespace changes, it'll report added/removed lines :-( |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
699 (not smerge-refine-weight-hack)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
700 (setq re (concat "[ \t]*\\(?:" re "\\)"))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
701 (dotimes (i n) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
702 (unless (looking-at re) (error "Smerge refine internal error")) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
703 (goto-char (match-end 0))))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
704 |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
705 (defun smerge-refine-chopup-region (beg end file &optional preproc) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
706 "Chopup the region into small elements, one per line. |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
707 Save the result into FILE. |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
708 If non-nil, PREPROC is called with no argument in a buffer that contains |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
709 a copy of the text, just before chopping it up. It can be used to replace |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
710 chars to try and eliminate some spurious differences." |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
711 ;; We used to chop up char-by-char rather than word-by-word like ediff |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
712 ;; does. It had the benefit of simplicity and very fine results, but it |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
713 ;; often suffered from problem that diff would find correlations where |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
714 ;; there aren't any, so the resulting "change" didn't make much sense. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
715 ;; You can still get this behavior by setting |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
716 ;; `smerge-refine-forward-function' to `forward-char'. |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
717 (let ((buf (current-buffer))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
718 (with-temp-buffer |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
719 (insert-buffer-substring buf beg end) |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
720 (when preproc (goto-char (point-min)) (funcall preproc)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
721 (when smerge-refine-ignore-whitespace |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
722 ;; It doesn't make much of a difference for diff-fine-highlight |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
723 ;; because we still have the _/+/</>/! prefix anyway. Can still be |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
724 ;; useful in other circumstances. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
725 (subst-char-in-region (point-min) (point-max) ?\n ?\s)) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
726 (goto-char (point-min)) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
727 (while (not (eobp)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
728 (funcall smerge-refine-forward-function 1) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
729 (let ((s (if (prog2 (forward-char -1) (bolp) (forward-char 1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
730 nil |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
731 (buffer-substring (line-beginning-position) (point))))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
732 ;; We add \n after each char except after \n, so we get |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
733 ;; one line per text char, where each line contains |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
734 ;; just one char, except for \n chars which are |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
735 ;; represented by the empty line. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
736 (unless (eq (char-before) ?\n) (insert ?\n)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
737 ;; HACK ALERT!! |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
738 (if smerge-refine-weight-hack |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
739 (dotimes (i (1- (length s))) (insert s "\n"))))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
740 (unless (bolp) (error "Smerge refine internal error")) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
741 (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
|
742 (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
|
743 |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
744 (defun smerge-refine-highlight-change (buf beg match-num1 match-num2 props) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
745 (with-current-buffer buf |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
746 (goto-char beg) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
747 (let* ((startline (- (string-to-number match-num1) 1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
748 (beg (progn (funcall (if smerge-refine-weight-hack |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
749 'forward-char |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
750 smerge-refine-forward-function) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
751 startline) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
752 (point))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
753 (end (progn (funcall (if smerge-refine-weight-hack |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
754 'forward-char |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
755 smerge-refine-forward-function) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
756 (if match-num2 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
757 (- (string-to-number match-num2) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
758 startline) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
759 1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
760 (point)))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
761 (when smerge-refine-ignore-whitespace |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
762 (skip-chars-backward " \t\n" beg) (setq end (point)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
763 (goto-char beg) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
764 (skip-chars-forward " \t\n" end) (setq beg (point))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
765 (when (> end beg) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
766 (let ((ol (make-overlay |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
767 beg end nil |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
768 ;; Make them tend to shrink rather than spread when editing. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
769 'front-advance nil))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
770 (overlay-put ol 'evaporate t) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
771 (dolist (x props) (overlay-put ol (car x) (cdr x))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
772 ol))))) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
773 |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
774 (defun smerge-refine-subst (beg1 end1 beg2 end2 props &optional preproc) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
775 "Show fine differences in the two regions BEG1..END1 and BEG2..END2. |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
776 PROPS is an alist of properties to put (via overlays) on the changes. |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
777 If non-nil, PREPROC is called with no argument in a buffer that contains |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
778 a copy of a region, just before preparing it to for `diff'. It can be used to |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
779 replace chars to try and eliminate some spurious differences." |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
780 (let* ((buf (current-buffer)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
781 (pos (point)) |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
782 (file1 (make-temp-file "diff1")) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
783 (file2 (make-temp-file "diff2"))) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
784 ;; Chop up regions into smaller elements and save into files. |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
785 (smerge-refine-chopup-region beg1 end1 file1 preproc) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
786 (smerge-refine-chopup-region beg2 end2 file2 preproc) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
787 |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
788 ;; Call diff on those files. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
789 (unwind-protect |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
790 (with-temp-buffer |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
791 (let ((coding-system-for-read 'emacs-mule)) |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
792 ;; 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
|
793 ;; even if it contains \0 and such. |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
794 (call-process diff-command nil t nil |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
795 (if (and smerge-refine-ignore-whitespace |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
796 (not smerge-refine-weight-hack)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
797 "-aw" "-a") |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
798 file1 file2)) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
799 ;; Process diff's output. |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
800 (goto-char (point-min)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
801 (let ((last1 nil) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
802 (last2 nil)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
803 (while (not (eobp)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
804 (if (not (looking-at "\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?\\([acd]\\)\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?$")) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
805 (error "Unexpected patch hunk header: %s" |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
806 (buffer-substring (point) (line-end-position)))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
807 (let ((op (char-after (match-beginning 3))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
808 (m1 (match-string 1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
809 (m2 (match-string 2)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
810 (m4 (match-string 4)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
811 (m5 (match-string 5))) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
812 (when (memq op '(?d ?c)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
813 (setq last1 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
814 (smerge-refine-highlight-change buf beg1 m1 m2 props))) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
815 (when (memq op '(?a ?c)) |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
816 (setq last2 |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
817 (smerge-refine-highlight-change buf beg2 m4 m5 props)))) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
818 (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
|
819 (and (re-search-forward "^[0-9]" nil 'move) ;Skip hunk body. |
85443
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
820 (goto-char (match-beginning 0)))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
821 ;; (assert (or (null last1) (< (overlay-start last1) end1))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
822 ;; (assert (or (null last2) (< (overlay-start last2) end2))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
823 (if smerge-refine-weight-hack |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
824 (progn |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
825 ;; (assert (or (null last1) (<= (overlay-end last1) end1))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
826 ;; (assert (or (null last2) (<= (overlay-end last2) end2))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
827 ) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
828 ;; smerge-refine-forward-function when calling in chopup may |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
829 ;; have stopped because it bumped into EOB whereas in |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
830 ;; smerge-refine-weight-hack it may go a bit further. |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
831 (if (and last1 (> (overlay-end last1) end1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
832 (move-overlay last1 (overlay-start last1) end1)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
833 (if (and last2 (> (overlay-end last2) end2)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
834 (move-overlay last2 (overlay-start last2) end2)) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
835 ))) |
13cb05eb9f29
Add word-granularity refinement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85099
diff
changeset
|
836 (goto-char pos) |
65129
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
837 (delete-file file1) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
838 (delete-file file2)))) |
8303172e4c68
(smerge-remove-props): Make the args non-optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65067
diff
changeset
|
839 |
85099
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
840 (defun smerge-refine () |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
841 "Highlight the parts of the conflict that are different." |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
842 (interactive) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
843 ;; FIXME: make it work with 3-way conflicts. |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
844 (smerge-match-conflict) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
845 (remove-overlays (match-beginning 0) (match-end 0) 'smerge 'refine) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
846 (smerge-ensure-match 1) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
847 (smerge-ensure-match 3) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
848 (smerge-refine-subst (match-beginning 1) (match-end 1) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
849 (match-beginning 3) (match-end 3) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
850 '((smerge . refine) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
851 (face . smerge-refined-change)))) |
ccdbfad065e3
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78572
diff
changeset
|
852 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
853 (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
|
854 (smerge-match-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
855 (smerge-ensure-match n1) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
856 (smerge-ensure-match n2) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
857 (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
|
858 (name2 (aref smerge-match-names n2)) |
41064
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
859 ;; Read them before the match-data gets clobbered. |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
860 (beg1 (match-beginning n1)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
861 (end1 (match-end n1)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
862 (beg2 (match-beginning n2)) |
cdd9ef6f603d
(smerge-match-conflict): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38611
diff
changeset
|
863 (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
|
864 (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
|
865 (file2 (make-temp-file "smerge2")) |
44f7f2635fec
(smerge-diff): Setup the buffer's default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32164
diff
changeset
|
866 (dir default-directory) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
867 (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
|
868 ;; 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
|
869 ;; 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
|
870 ;; 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
|
871 ;; `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
|
872 ;; 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
|
873 (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
|
874 (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
|
875 (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
|
876 (unwind-protect |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
877 (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
|
878 (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
|
879 (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
|
880 (erase-buffer) |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
881 (let ((status |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
882 (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
|
883 (append smerge-diff-switches |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
884 (list "-L" (concat name1 "/" file) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
885 "-L" (concat name2 "/" file) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
886 file1 file2))))) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
887 (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
|
888 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
889 (diff-mode) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
890 (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
|
891 (delete-file file1) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
892 (delete-file file2)))) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
893 |
47209
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
894 ;; compiler pacifiers |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
895 (defvar smerge-ediff-windows) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
896 (defvar smerge-ediff-buf) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
897 (defvar ediff-buffer-A) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
898 (defvar ediff-buffer-B) |
f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46899
diff
changeset
|
899 (defvar ediff-buffer-C) |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
900 (defvar ediff-ancestor-buffer) |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
901 (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
|
902 |
47821
45dcf3407814
(smerge-ediff): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47756
diff
changeset
|
903 ;;;###autoload |
47756
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
904 (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
|
905 "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
|
906 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
|
907 buffer names." |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
908 (interactive) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
909 (let* ((buf (current-buffer)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
910 (mode major-mode) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
911 ;;(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
|
912 (config (current-window-configuration)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
913 (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
|
914 (mine (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
915 (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
|
916 (other (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
917 (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
|
918 base) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
919 (with-current-buffer mine |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
920 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
921 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
922 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
923 (while (smerge-find-conflict) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
924 (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
|
925 (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
|
926 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
927 (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
|
928 (funcall mode)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
929 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
930 (with-current-buffer other |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
931 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
932 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
933 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
934 (while (smerge-find-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
935 (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
|
936 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
937 (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
|
938 (funcall mode)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
939 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
940 (when base |
47756
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
941 (setq base (generate-new-buffer |
b2c9ea334a34
(smerge-ediff): Add name-{mine,other,base} args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47209
diff
changeset
|
942 (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
|
943 (with-current-buffer base |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
944 (buffer-disable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
945 (insert-buffer-substring buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
946 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
947 (while (smerge-find-conflict) |
54527
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
948 (if (match-end 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
949 (smerge-keep-n 2) |
192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54410
diff
changeset
|
950 (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
|
951 (buffer-enable-undo) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
952 (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
|
953 (funcall mode))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
954 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
955 ;; 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
|
956 ;; Fire up ediff. |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
957 (set-buffer |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
958 (if base |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
959 (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
|
960 ;; 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
|
961 (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
|
962 ;; nil 'ediff-merge-revisions buffer-file-name))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47827
diff
changeset
|
963 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
964 ;; 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
|
965 ;; 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
|
966 (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
|
967 (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
|
968 (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
|
969 (lambda () |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
970 (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
|
971 (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
|
972 (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
|
973 (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
|
974 (buf smerge-ediff-buf) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
975 (windows smerge-ediff-windows)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
976 (ediff-cleanup-mess) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
977 (with-current-buffer buf |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
978 (erase-buffer) |
64637
a975a8beec7f
(smerge-ediff): Use insert-buffer-substring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64091
diff
changeset
|
979 (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
|
980 (kill-buffer buffer-A) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
981 (kill-buffer buffer-B) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
982 (kill-buffer buffer-C) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
983 (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
|
984 (set-window-configuration windows) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
985 (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
|
986 (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
|
987 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
988 |
78572
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
989 (defconst smerge-parsep-re |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
990 (concat smerge-begin-re "\\|" smerge-end-re "\\|" |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
991 smerge-base-re "\\|" smerge-other-re "\\|")) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
992 |
26776
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
993 ;;;###autoload |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
994 (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
|
995 "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
|
996 \\{smerge-mode-map}" |
61277
7fa982932904
(smerge-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
55258
diff
changeset
|
997 :group 'smerge :lighter " SMerge" |
38611
7f82c0bbe525
(smerge-mode): Check if `font-lock-mode' is bound
Gerd Moellmann <gerd@gnu.org>
parents:
37674
diff
changeset
|
998 (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
|
999 (save-excursion |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1000 (if smerge-mode |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1001 (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
|
1002 (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
|
1003 (goto-char (point-min)) |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1004 (while (smerge-find-conflict) |
34842
f05ec8dfc452
(smerge-basic-map): Use `=' rather than `d'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34840
diff
changeset
|
1005 (save-excursion |
65067
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
1006 (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
|
1007 (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
|
1008 (unless smerge-mode |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
1009 (set (make-local-variable 'paragraph-separate) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
1010 (replace-match "" t t paragraph-separate))) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
1011 (when smerge-mode |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
1012 (set (make-local-variable 'paragraph-separate) |
5b92bb6e6570
(smerge-resolve): New arg `safe'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
1013 (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
|
1014 (unless smerge-mode |
52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
1015 (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
|
1016 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1017 |
142d6aa7c470
New file. Provides a simple minor-mode for files containing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1018 (provide 'smerge-mode) |
52401 | 1019 |
54903
922f49230ff5
(smerge-match-conflict): Try to do something sensible
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54872
diff
changeset
|
1020 ;; 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
|
1021 ;;; smerge-mode.el ends here |