Mercurial > emacs
annotate lisp/diff-mode.el @ 91482:c2ae228b4c24
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 03 Feb 2008 02:38:27 +0000 |
parents | 74f3c7c77fbe |
children | c70e45a7acfd 15d5c70e7c61 |
rev | line source |
---|---|
42472 | 1 ;;; diff-mode.el --- a mode for viewing/editing context diffs |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
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:
64512
diff
changeset
|
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
87638
706ecd592fce
(diff-end-of-hunk): Don't match empty lines in unified format.
Glenn Morris <rgm@gnu.org>
parents:
85503
diff
changeset
|
4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 |
70292
2b77fa42947f
Update my email address.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69608
diff
changeset
|
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
42472 | 7 ;; Keywords: convenience patch diff |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
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:
76982
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 ;; any later version. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
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. | |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;;; Commentary: |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27 |
35526
b40a6cecc4d5
(diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33488
diff
changeset
|
28 ;; Provides support for font-lock, outline, navigation |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 ;; commands, editing and various conversions as well as jumping |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 ;; to the corresponding source file. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 |
53833
32e20bdb34c9
(diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53782
diff
changeset
|
32 ;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>) |
42472 | 33 ;; Some efforts were spent to have it somewhat compatible with XEmacs' |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 ;; diff-mode as well as with compilation-minor-mode |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 ;; Bugs: |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
38 ;; - Reverse doesn't work with normal diffs. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 ;; Todo: |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
41 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
42 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
43 ;; Also allow C-c C-a to delete already-applied hunks. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
44 ;; |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
45 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
46 ;; of a hunk. Show then the changes between <file> and <hunk> and make it |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
47 ;; possible to apply them to <file>, <hunk-src>, or <hunk-dst>. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
48 ;; Or maybe just make it into a ".rej to diff3-markers converter". |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
49 ;; Maybe just use `wiggle' (by Neil Brown) to do it for us. |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
50 ;; |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
51 ;; - in diff-apply-hunk, strip context in replace-match to better |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
52 ;; preserve markers and spacing. |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
53 ;; - Handle `diff -b' output in context->unified. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
54 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
55 ;;; Code: |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
56 (eval-when-compile (require 'cl)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 |
65287
0cf1480347a9
(add-log-buffer-file-name-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
58 (defvar add-log-buffer-file-name-function) |
0cf1480347a9
(add-log-buffer-file-name-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
59 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
60 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61 (defgroup diff-mode () |
64004
ea880752de3b
(diff-mode): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63415
diff
changeset
|
62 "Major mode for viewing/editing diffs." |
31269
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
63 :version "21.1" |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64 :group 'tools |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
65 :group 'diff) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
66 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
67 (defcustom diff-default-read-only nil |
39386
50956864fe56
(diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39323
diff
changeset
|
68 "If non-nil, `diff-mode' buffers default to being read-only." |
50956864fe56
(diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39323
diff
changeset
|
69 :type 'boolean |
50956864fe56
(diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39323
diff
changeset
|
70 :group 'diff-mode) |
50956864fe56
(diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39323
diff
changeset
|
71 |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
72 (defcustom diff-jump-to-old-file nil |
80880
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
73 "Non-nil means `diff-goto-source' jumps to the old file. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
74 Else, it jumps to the new file." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
75 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
76 :group 'diff-mode) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
78 (defcustom diff-update-on-the-fly t |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
79 "*Non-nil means hunk headers are kept up-to-date on-the-fly. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
80 When editing a diff file, the line numbers in the hunk headers |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 need to be kept consistent with the actual diff. This can |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
82 either be done on the fly (but this sometimes interacts poorly with the |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
83 undo mechanism) or whenever the file is written (can be slow |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
84 when editing big diffs)." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
85 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
86 :group 'diff-mode) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87 |
32061
cdfabbe10a24
(diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents:
32012
diff
changeset
|
88 (defcustom diff-advance-after-apply-hunk t |
cdfabbe10a24
(diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents:
32012
diff
changeset
|
89 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
90 :type 'boolean |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
91 :group 'diff-mode) |
32061
cdfabbe10a24
(diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents:
32012
diff
changeset
|
92 |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
93 (defcustom diff-auto-refine t |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
94 "Automatically highlight changes in detail as the user visits hunks." |
85478
786d3a985758
* term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85467
diff
changeset
|
95 :type 'boolean |
786d3a985758
* term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85467
diff
changeset
|
96 :group 'diff-mode) |
32061
cdfabbe10a24
(diff-goto-source): Emit a status message.
Miles Bader <miles@gnu.org>
parents:
32012
diff
changeset
|
97 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
98 (defcustom diff-mode-hook nil |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
99 "Run after setting up the `diff-mode' major mode." |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
100 :type 'hook |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
101 :options '(diff-delete-empty-files diff-make-unified) |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
102 :group 'diff-mode) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
104 (defvar diff-outline-regexp |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
107 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
108 ;;;; keymap, menu, ... |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
109 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
110 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
111 (easy-mmode-defmap diff-mode-shared-map |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
112 '(;; From Pavel Machek's patch-mode. |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
113 ("n" . diff-hunk-next) |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
114 ("N" . diff-file-next) |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
115 ("p" . diff-hunk-prev) |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
116 ("P" . diff-file-prev) |
78882
ccd0441c69e1
* pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78756
diff
changeset
|
117 ("\t" . diff-hunk-next) |
ccd0441c69e1
* pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78756
diff
changeset
|
118 ([backtab] . diff-hunk-prev) |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
119 ("k" . diff-hunk-kill) |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
120 ("K" . diff-file-kill) |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
121 ;; From compilation-minor-mode. |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
122 ("}" . diff-file-next) |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
123 ("{" . diff-file-prev) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
124 ("\C-m" . diff-goto-source) |
54869
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
125 ([mouse-2] . diff-goto-source) |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
126 ;; From XEmacs' diff-mode. |
74269
fa6583f5269e
(diff-mode-map): Add a binding for unified->context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72813
diff
changeset
|
127 ;; Standard M-w is useful, so don't change M-W. |
fa6583f5269e
(diff-mode-map): Add a binding for unified->context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72813
diff
changeset
|
128 ;;("W" . widen) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
129 ;;("." . diff-goto-source) ;display-buffer |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 ;;("f" . diff-goto-source) ;find-file |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 ("o" . diff-goto-source) ;other-window |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
132 ;;("w" . diff-goto-source) ;other-frame |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
133 ;;("N" . diff-narrow) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134 ;;("h" . diff-show-header) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
135 ;;("j" . diff-show-difference) ;jump to Nth diff |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
136 ;;("q" . diff-quit) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
137 ;; Not useful if you have to metafy them. |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
138 ;;(" " . scroll-up) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
139 ;;("\177" . scroll-down) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
140 ;; Standard M-a is useful, so don't change M-A. |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
141 ;;("A" . diff-ediff-patch) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
142 ;; Standard M-r is useful, so don't change M-r or M-R. |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
143 ;;("r" . diff-restrict-view) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
144 ;;("R" . diff-reverse-direction) |
53782
12d228ede0dd
Bind q to `quit-window'.
Benjamin Rutt <brutt@bloomington.in.us>
parents:
53058
diff
changeset
|
145 ("q" . quit-window)) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
146 "Basic keymap for `diff-mode', bound to various prefix keys.") |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
147 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
148 (easy-mmode-defmap diff-mode-map |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
149 `(("\e" . ,diff-mode-shared-map) |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
150 ;; From compilation-minor-mode. |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
151 ("\C-c\C-c" . diff-goto-source) |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
152 ;; Misc operations. |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
153 ("\C-c\C-a" . diff-apply-hunk) |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
154 ("\C-c\C-e" . diff-ediff-patch) |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
155 ("\C-c\C-n" . diff-restrict-view) |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
156 ("\C-c\C-s" . diff-split-hunk) |
56919
34b22fc9d0ed
(diff-mode-map): Bind toggle-next-error-follow-mode.
Eli Zaretskii <eliz@gnu.org>
parents:
56073
diff
changeset
|
157 ("\C-c\C-t" . diff-test-hunk) |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
158 ("\C-c\C-r" . diff-reverse-direction) |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
159 ("\C-c\C-u" . diff-context->unified) |
74269
fa6583f5269e
(diff-mode-map): Add a binding for unified->context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72813
diff
changeset
|
160 ;; `d' because it duplicates the context :-( --Stef |
fa6583f5269e
(diff-mode-map): Add a binding for unified->context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72813
diff
changeset
|
161 ("\C-c\C-d" . diff-unified->context) |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
162 ("\C-c\C-w" . diff-ignore-whitespace-hunk) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
163 ("\C-c\C-b" . diff-refine-hunk) ;No reason for `b' :-( |
57020
f1329d47fa1a
(diff-mode-map): Rename `next-error-follow-mode' to `next-error-follow-minor-mode'.
Juri Linkov <juri@jurta.org>
parents:
56919
diff
changeset
|
164 ("\C-c\C-f" . next-error-follow-minor-mode)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
165 "Keymap for `diff-mode'. See also `diff-mode-shared-map'.") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
166 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 (easy-menu-define diff-mode-menu diff-mode-map |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 "Menu for `diff-mode'." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
169 '("Diff" |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
170 ["Jump to Source" diff-goto-source t] |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
171 ["Apply hunk" diff-apply-hunk t] |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
172 ["Test applying hunk" diff-test-hunk t] |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
173 ["Apply diff with Ediff" diff-ediff-patch t] |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
174 "-----" |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175 ["Reverse direction" diff-reverse-direction t] |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
176 ["Context -> Unified" diff-context->unified t] |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
177 ["Unified -> Context" diff-unified->context t] |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
178 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)] |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
179 "-----" |
82037
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
180 ["Split hunk" diff-split-hunk (diff-splittable-p)] |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
181 ["Ignore whitespace changes" diff-ignore-whitespace-hunk t] |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
182 ["Highlight fine changes" diff-refine-hunk t] |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
183 ["Kill current hunk" diff-hunk-kill t] |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
184 ["Kill current file's hunks" diff-file-kill t] |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
185 "-----" |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
186 ["Previous Hunk" diff-hunk-prev t] |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
187 ["Next Hunk" diff-hunk-next t] |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
188 ["Previous File" diff-file-prev t] |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
189 ["Next File" diff-file-next t] |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
190 )) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
191 |
31973
ad9838a9349c
(diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31819
diff
changeset
|
192 (defcustom diff-minor-mode-prefix "\C-c=" |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
193 "Prefix key for `diff-minor-mode' commands." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
194 :type '(choice (string "\e") (string "C-c=") string) |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61269
diff
changeset
|
195 :group 'diff-mode) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
196 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
197 (easy-mmode-defmap diff-minor-mode-map |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
198 `((,diff-minor-mode-prefix . ,diff-mode-shared-map)) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
199 "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.") |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
200 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
201 |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
202 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 ;;;; font-lock support |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
204 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
205 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
206 (defface diff-header |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
207 '((((class color) (min-colors 88) (background light)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
208 :background "grey85") |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
209 (((class color) (min-colors 88) (background dark)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
210 :background "grey45") |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
211 (((class color) (background light)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
212 :foreground "blue1" :weight bold) |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
213 (((class color) (background dark)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
214 :foreground "green" :weight bold) |
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
215 (t :weight bold)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
216 "`diff-mode' face inherited by hunk and index header faces." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
217 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
218 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
219 (put 'diff-header-face 'face-alias 'diff-header) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
220 (defvar diff-header-face 'diff-header) |
31734
6b057ae8165d
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31705
diff
changeset
|
221 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
222 (defface diff-file-header |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
223 '((((class color) (min-colors 88) (background light)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
224 :background "grey70" :weight bold) |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
225 (((class color) (min-colors 88) (background dark)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
226 :background "grey60" :weight bold) |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
227 (((class color) (background light)) |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
228 :foreground "green" :weight bold) |
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55088
diff
changeset
|
229 (((class color) (background dark)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
230 :foreground "cyan" :weight bold) |
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
231 (t :weight bold)) ; :height 1.3 |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
232 "`diff-mode' face used to highlight file header lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
233 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
234 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
235 (put 'diff-file-header-face 'face-alias 'diff-file-header) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
236 (defvar diff-file-header-face 'diff-file-header) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
238 (defface diff-index |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
239 '((t :inherit diff-file-header)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
240 "`diff-mode' face used to highlight index header lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
241 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
242 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
243 (put 'diff-index-face 'face-alias 'diff-index) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
244 (defvar diff-index-face 'diff-index) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
245 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
246 (defface diff-hunk-header |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
247 '((t :inherit diff-header)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
248 "`diff-mode' face used to highlight hunk header lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
249 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
250 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
251 (put 'diff-hunk-header-face 'face-alias 'diff-hunk-header) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
252 (defvar diff-hunk-header-face 'diff-hunk-header) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
254 (defface diff-removed |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
255 '((t :inherit diff-changed)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
256 "`diff-mode' face used to highlight removed lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
257 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
258 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
259 (put 'diff-removed-face 'face-alias 'diff-removed) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
260 (defvar diff-removed-face 'diff-removed) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
261 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
262 (defface diff-added |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
263 '((t :inherit diff-changed)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
264 "`diff-mode' face used to highlight added lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
265 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
266 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
267 (put 'diff-added-face 'face-alias 'diff-added) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
268 (defvar diff-added-face 'diff-added) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
269 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
270 (defface diff-changed |
32576
c6eb63e9c25c
(diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents:
32482
diff
changeset
|
271 '((((type tty pc) (class color) (background light)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
272 :foreground "magenta" :weight bold :slant italic) |
32576
c6eb63e9c25c
(diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents:
32482
diff
changeset
|
273 (((type tty pc) (class color) (background dark)) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
274 :foreground "yellow" :weight bold :slant italic)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
275 "`diff-mode' face used to highlight changed lines." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
276 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
277 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
278 (put 'diff-changed-face 'face-alias 'diff-changed) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
279 (defvar diff-changed-face 'diff-changed) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
280 |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
281 (defface diff-indicator-removed |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
282 '((t :inherit diff-removed)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
283 "`diff-mode' face used to highlight indicator of removed lines (-, <)." |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
284 :group 'diff-mode |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
285 :version "22.1") |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
286 (defvar diff-indicator-removed-face 'diff-indicator-removed) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
287 |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
288 (defface diff-indicator-added |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
289 '((t :inherit diff-added)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
290 "`diff-mode' face used to highlight indicator of added lines (+, >)." |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
291 :group 'diff-mode |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
292 :version "22.1") |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
293 (defvar diff-indicator-added-face 'diff-indicator-added) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
294 |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
295 (defface diff-indicator-changed |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
296 '((t :inherit diff-changed)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
297 "`diff-mode' face used to highlight indicator of changed lines." |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
298 :group 'diff-mode |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
299 :version "22.1") |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
300 (defvar diff-indicator-changed-face 'diff-indicator-changed) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
301 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
302 (defface diff-function |
69608
0c54773776e4
(diff-function): Make it inherit from diff-header instead of diff-context.
Nick Roberts <nickrob@snap.net.nz>
parents:
68651
diff
changeset
|
303 '((t :inherit diff-header)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
304 "`diff-mode' face used to highlight function names produced by \"diff -p\"." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
305 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
306 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
307 (put 'diff-function-face 'face-alias 'diff-function) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
308 (defvar diff-function-face 'diff-function) |
32603
87af45b9ad99
(diff-header-face, diff-file-header-face)
Eli Zaretskii <eliz@gnu.org>
parents:
32588
diff
changeset
|
309 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
310 (defface diff-context |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
311 '((((class color grayscale) (min-colors 88)) :inherit shadow)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
312 "`diff-mode' face used to highlight context and other side-information." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
313 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
314 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
315 (put 'diff-context-face 'face-alias 'diff-context) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
316 (defvar diff-context-face 'diff-context) |
31734
6b057ae8165d
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31705
diff
changeset
|
317 |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
318 (defface diff-nonexistent |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
319 '((t :inherit diff-file-header)) |
62553
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
320 "`diff-mode' face used to highlight nonexistent files in recursive diffs." |
e7408ff25265
(diff-header-face, diff-file-header-face)
Lute Kamstra <lute@gnu.org>
parents:
62531
diff
changeset
|
321 :group 'diff-mode) |
63197
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
322 ;; backward-compatibility alias |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
323 (put 'diff-nonexistent-face 'face-alias 'diff-nonexistent) |
ce2a9eb0ff8a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Miles Bader <miles@gnu.org>
parents:
63051
diff
changeset
|
324 (defvar diff-nonexistent-face 'diff-nonexistent) |
37531
e71362bfa695
(diff-nonexistant-face): New face.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35526
diff
changeset
|
325 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
326 (defconst diff-yank-handler '(diff-yank-function)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
327 (defun diff-yank-function (text) |
54540
2449619c7ccf
(diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54528
diff
changeset
|
328 ;; FIXME: the yank-handler is now called separately on each piece of text |
2449619c7ccf
(diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54528
diff
changeset
|
329 ;; with a yank-handler property, so the next-single-property-change call |
2449619c7ccf
(diff-font-lock-keywords): Disable yank-handler.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54528
diff
changeset
|
330 ;; below will always return nil :-( --stef |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
331 (let ((mixed (next-single-property-change 0 'yank-handler text)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
332 (start (point))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
333 ;; First insert the text. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
334 (insert text) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
335 ;; If the text does not include any diff markers and if we're not |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
336 ;; yanking back into a diff-mode buffer, get rid of the prefixes. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
337 (unless (or mixed (derived-mode-p 'diff-mode)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
338 (undo-boundary) ; Just in case the user wanted the prefixes. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
339 (let ((re (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
340 (if (re-search-backward "^[><!][ \t]" start t) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
341 (if (eq (char-after) ?!) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
342 "^[!+- ][ \t]" "^[<>][ \t]") |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
343 "^[ <>!+-]")))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
344 (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
345 (while (re-search-backward re start t) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
346 (replace-match "" t t))))))) |
61269
5d2796fc9f80
(diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
57418
diff
changeset
|
347 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
348 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
349 (defvar diff-font-lock-keywords |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
350 `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
351 (1 diff-hunk-header-face) (2 diff-function-face)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
352 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
353 (1 diff-hunk-header-face) (2 diff-function-face)) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
354 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
355 ("^--- .+ ----$" . diff-hunk-header-face) ;context |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
356 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
357 ("^---$" . diff-hunk-header-face) ;normal |
82255
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
358 ;; For file headers, accept files with spaces, but be careful to rule |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
359 ;; out false-positives when matching hunk headers. |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
360 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+?\\)\\(?:\t.*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n" |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
361 (0 diff-header-face) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
362 (2 (if (not (match-end 3)) diff-file-header-face) prepend)) |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
363 ("^\\([-<]\\)\\(.*\n\\)" |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
364 (1 diff-indicator-removed-face) (2 diff-removed-face)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
365 ("^\\([+>]\\)\\(.*\n\\)" |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
366 (1 diff-indicator-added-face) (2 diff-added-face)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
367 ("^\\(!\\)\\(.*\n\\)" |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
368 (1 diff-indicator-changed-face) (2 diff-changed-face)) |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
369 ("^Index: \\(.+\\).*\n" |
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
370 (0 diff-header-face) (1 diff-index-face prepend)) |
37567
50d77d1b2d58
(diff-nonexistent-face, diff-font-lock-keywords):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37531
diff
changeset
|
371 ("^Only in .*\n" . diff-nonexistent-face) |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
372 ("^\\(#\\)\\(.*\\)" |
64512
a4d1eb8d55e6
(diff-font-lock-keywords): Simplify comments fontifying rule.
Juri Linkov <juri@jurta.org>
parents:
64496
diff
changeset
|
373 (1 font-lock-comment-delimiter-face) |
a4d1eb8d55e6
(diff-font-lock-keywords): Simplify comments fontifying rule.
Juri Linkov <juri@jurta.org>
parents:
64496
diff
changeset
|
374 (2 font-lock-comment-face)) |
64496
558b187cced1
(diff-file-header): Change foreground color from
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
375 ("^[^-=+*!<>#].*\n" (0 diff-context-face)))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
376 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
377 (defconst diff-font-lock-defaults |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
378 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
379 |
31269
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
380 (defvar diff-imenu-generic-expression |
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
381 ;; Prefer second name as first is most likely to be a backup or |
33488
352cb95d9f27
(diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents:
33432
diff
changeset
|
382 ;; version-control name. The [\t\n] at the end of the unidiff pattern |
352cb95d9f27
(diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents:
33432
diff
changeset
|
383 ;; catches Debian source diff files (which lack the trailing date). |
352cb95d9f27
(diff-imenu-generic-expression): Modify unidiff
Dave Love <fx@gnu.org>
parents:
33432
diff
changeset
|
384 '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)[\t\n]" 1) ; unidiffs |
31269
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
385 (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs |
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
386 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
387 ;;;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
388 ;;;; Movement |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
389 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
390 |
29423
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
391 (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$") |
57279
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
392 (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
393 (defvar diff-narrowed-to nil) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
395 (defun diff-hunk-style (&optional style) |
54928
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54869
diff
changeset
|
396 (when (looking-at diff-hunk-header-re) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
397 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))) |
54928
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54869
diff
changeset
|
398 (goto-char (match-end 0))) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
399 style) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
400 |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
401 (defun diff-end-of-hunk (&optional style) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
402 ;; Especially important for unified (because headers are ambiguous). |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
403 (setq style (diff-hunk-style style)) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
404 (let ((end (and (re-search-forward (case style |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
405 ;; A `unified' header is ambiguous. |
87761
74f3c7c77fbe
(diff-end-of-hunk): Revert 2008-01-08 change.
Glenn Morris <rgm@gnu.org>
parents:
87638
diff
changeset
|
406 (unified (concat "^[^-+# \\]\\|" |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
407 diff-file-header-re)) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
408 (context "^[^-+#! \\]") |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
409 (normal "^[^<>#\\]") |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
410 (t "^[^-+#!<> \\]")) |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
411 nil t) |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
412 (match-beginning 0)))) |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
413 ;; The return value is used by easy-mmode-define-navigation. |
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
414 (goto-char (or end (point-max))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
415 |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
416 (defun diff-beginning-of-hunk (&optional try-harder) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
417 "Move back to beginning of hunk. |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
418 If TRY-HARDER is non-nil, try to cater to the case where we're not in a hunk |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
419 but in the file header instead, in which case move forward to the first hunk." |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
420 (beginning-of-line) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
421 (unless (looking-at diff-hunk-header-re) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
422 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
423 (condition-case () |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
424 (re-search-backward diff-hunk-header-re) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
425 (error |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
426 (if (not try-harder) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
427 (error "Can't find the beginning of the hunk") |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
428 (diff-beginning-of-file-and-junk) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
429 (diff-hunk-next)))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
430 |
82037
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
431 (defun diff-unified-hunk-p () |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
432 (save-excursion |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
433 (ignore-errors |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
434 (diff-beginning-of-hunk) |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
435 (looking-at "^@@")))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
436 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
437 (defun diff-beginning-of-file () |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
438 (beginning-of-line) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
439 (unless (looking-at diff-file-header-re) |
82255
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
440 (let ((start (point)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
441 res) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
442 ;; diff-file-header-re may need to match up to 4 lines, so in case |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
443 ;; we're inside the header, we need to move up to 3 lines forward. |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
444 (forward-line 3) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
445 (if (and (setq res (re-search-backward diff-file-header-re nil t)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
446 ;; Maybe the 3 lines forward were too much and we matched |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
447 ;; a file header after our starting point :-( |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
448 (or (<= (point) start) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
449 (setq res (re-search-backward diff-file-header-re nil t)))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
450 res |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
451 (goto-char start) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
452 (error "Can't find the beginning of the file"))))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
453 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 (defun diff-end-of-file () |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
456 (re-search-forward "^[-+#!<>0-9@* \\]" nil t) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
457 (re-search-forward (concat "^[^-+#!<>0-9@* \\]\\|" diff-file-header-re) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
458 nil 'move) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
459 (if (match-beginning 1) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
460 (goto-char (match-beginning 1)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
461 (beginning-of-line))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
463 ;; Define diff-{hunk,file}-{prev,next} |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
464 (easy-mmode-define-navigation |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
465 diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
466 (if diff-auto-refine |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
467 (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
468 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
469 (easy-mmode-define-navigation |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
470 diff-file diff-file-header-re "file" diff-end-of-hunk) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 (defun diff-restrict-view (&optional arg) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
473 "Restrict the view to the current hunk. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
474 If the prefix ARG is given, restrict the view to the current file instead." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
475 (interactive "P") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
476 (save-excursion |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
477 (if arg (diff-beginning-of-file) (diff-beginning-of-hunk 'try-harder)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
478 (narrow-to-region (point) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
479 (progn (if arg (diff-end-of-file) (diff-end-of-hunk)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
480 (point))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
481 (set (make-local-variable 'diff-narrowed-to) (if arg 'file 'hunk)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
482 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
483 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
484 (defun diff-hunk-kill () |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
485 "Kill current hunk." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
486 (interactive) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
487 (diff-beginning-of-hunk) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
488 (let* ((start (point)) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
489 (nexthunk (when (re-search-forward diff-hunk-header-re nil t) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
490 (match-beginning 0))) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
491 (firsthunk (ignore-errors |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
492 (goto-char start) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
493 (diff-beginning-of-file) (diff-hunk-next) (point))) |
71249
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
494 (nextfile (ignore-errors (diff-file-next) (point))) |
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
495 (inhibit-read-only t)) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
496 (goto-char start) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
497 (if (and firsthunk (= firsthunk start) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
498 (or (null nexthunk) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
499 (and nextfile (> nexthunk nextfile)))) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
500 ;; It's the only hunk for this file, so kill the file. |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
501 (diff-file-kill) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
502 (diff-end-of-hunk) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
503 (kill-region start (point))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
504 |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
505 (defun diff-beginning-of-file-and-junk () |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
506 "Go to the beginning of file-related diff-info. |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
507 This is like `diff-beginning-of-file' except it tries to skip back over leading |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
508 data such as \"Index: ...\" and such." |
82255
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
509 (let* ((start (point)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
510 (prevfile (condition-case err |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
511 (save-excursion (diff-beginning-of-file) (point)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
512 (error err))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
513 (err (if (consp prevfile) prevfile)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
514 (nextfile (ignore-errors |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
515 (save-excursion |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
516 (goto-char start) (diff-file-next) (point)))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
517 ;; prevhunk is one of the limits. |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
518 (prevhunk (save-excursion |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
519 (ignore-errors |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
520 (if (numberp prevfile) (goto-char prevfile)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
521 (diff-hunk-prev) (point)))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
522 (previndex (save-excursion |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
523 (re-search-backward "^Index: " prevhunk t)))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
524 ;; If we're in the junk, we should use nextfile instead of prevfile. |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
525 (if (and (numberp nextfile) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
526 (or (not (numberp prevfile)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
527 (and previndex (> previndex prevfile)))) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
528 (setq prevfile nextfile)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
529 (if (and previndex (numberp prevfile) (< previndex prevfile)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
530 (setq prevfile previndex)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
531 (if (and (numberp prevfile) (<= prevfile start)) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
532 (goto-char prevfile) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
533 ;; File starts *after* the starting point: we really weren't in |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
534 ;; a file diff but elsewhere. |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
535 (goto-char start) |
eea3be43d1de
(diff-font-lock-keywords): Fix up false positives.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
536 (signal (car err) (cdr err))))) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
537 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
538 (defun diff-file-kill () |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
539 "Kill current file's hunks." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
540 (interactive) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
541 (diff-beginning-of-file-and-junk) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
542 (let* ((start (point)) |
71249
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
543 (inhibit-read-only t)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
544 (diff-end-of-file) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
545 (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
546 (kill-region start (point)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
547 |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
548 (defun diff-kill-junk () |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
549 "Kill spurious empty diffs." |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
550 (interactive) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
551 (save-excursion |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
552 (let ((inhibit-read-only t)) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
553 (goto-char (point-min)) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
554 (while (re-search-forward (concat "^\\(Index: .*\n\\)" |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
555 "\\([^-+!* <>].*\n\\)*?" |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
556 "\\(\\(Index:\\) \\|" |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
557 diff-file-header-re "\\)") |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
558 nil t) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
559 (delete-region (if (match-end 4) (match-beginning 0) (match-end 1)) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
560 (match-beginning 3)) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
561 (beginning-of-line))))) |
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
562 |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
563 (defun diff-count-matches (re start end) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
564 (save-excursion |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
565 (let ((n 0)) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
566 (goto-char start) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
567 (while (re-search-forward re end t) (incf n)) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
568 n))) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
569 |
82037
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
570 (defun diff-splittable-p () |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
571 (save-excursion |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
572 (beginning-of-line) |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
573 (and (looking-at "^[-+ ]") |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
574 (progn (forward-line -1) (looking-at "^[-+ ]")) |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
575 (diff-unified-hunk-p)))) |
1d7514cb50ef
(diff-refine-ignore-spaces-hunk): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82036
diff
changeset
|
576 |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
577 (defun diff-split-hunk () |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
578 "Split the current (unified diff) hunk at point into two hunks." |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
579 (interactive) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
580 (beginning-of-line) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
581 (let ((pos (point)) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
582 (start (progn (diff-beginning-of-hunk) (point)))) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
583 (unless (looking-at "@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@") |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
584 (error "diff-split-hunk only works on unified context diffs")) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
585 (forward-line 1) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
586 (let* ((start1 (string-to-number (match-string 1))) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
587 (start2 (string-to-number (match-string 2))) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
588 (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos))) |
71249
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
589 (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))) |
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
590 (inhibit-read-only t)) |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
591 (goto-char pos) |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
592 ;; Hopefully the after-change-function will not screw us over. |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
593 (insert "@@ -" (number-to-string newstart1) ",1 +" |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
594 (number-to-string newstart2) ",1 @@\n") |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
595 ;; Fix the original hunk-header. |
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
596 (diff-fixup-modifs start pos)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47523
diff
changeset
|
597 |
33432
7f6ffdaecedc
(diff-mode-menu): Add entry for applying hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32666
diff
changeset
|
598 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
599 ;;;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
600 ;;;; jump to other buffers |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
601 ;;;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
602 |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
603 (defvar diff-remembered-files-alist nil) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
604 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
605 (defun diff-filename-drop-dir (file) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
606 (when (string-match "/" file) (substring file (match-end 0)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
607 |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
608 (defun diff-merge-strings (ancestor from to) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
609 "Merge the diff between ANCESTOR and FROM into TO. |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
610 Returns the merged string if successful or nil otherwise. |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
611 The strings are assumed not to contain any \"\\n\" (i.e. end of line). |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
612 If ANCESTOR = FROM, returns TO. |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
613 If ANCESTOR = TO, returns FROM. |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
614 The heuristic is simplistic and only really works for cases |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
615 like \(diff-merge-strings \"b/foo\" \"b/bar\" \"/a/c/foo\")." |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
616 ;; Ideally, we want: |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
617 ;; AMB ANB CMD -> CND |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
618 ;; but that's ambiguous if `foo' or `bar' is empty: |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
619 ;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1 |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
620 (let ((str (concat ancestor "\n" from "\n" to))) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
621 (when (and (string-match (concat |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
622 "\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n" |
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
623 "\\1\\(.*\\)\\3\n" |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
624 "\\(.*\\(\\2\\).*\\)\\'") str) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
625 (equal to (match-string 5 str))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
626 (concat (substring str (match-beginning 5) (match-beginning 6)) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
627 (match-string 4 str) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
628 (substring str (match-end 6) (match-end 5)))))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
629 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
630 (defun diff-tell-file-name (old name) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
631 "Tell Emacs where the find the source file of the current hunk. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
632 If the OLD prefix arg is passed, tell the file NAME of the old file." |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
633 (interactive |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
634 (let* ((old current-prefix-arg) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
635 (fs (diff-hunk-file-names current-prefix-arg))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
636 (unless fs (error "No file name to look for")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
637 (list old (read-file-name (format "File for %s: " (car fs)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
638 nil (diff-find-file-name old) t)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
639 (let ((fs (diff-hunk-file-names old))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
640 (unless fs (error "No file name to look for")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
641 (push (cons fs name) diff-remembered-files-alist))) |
61269
5d2796fc9f80
(diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
57418
diff
changeset
|
642 |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
643 (defun diff-hunk-file-names (&optional old) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
644 "Give the list of file names textually mentioned for the current hunk." |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
645 (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
646 (unless (looking-at diff-file-header-re) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
647 (or (ignore-errors (diff-beginning-of-file)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
648 (re-search-forward diff-file-header-re nil t))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
649 (let ((limit (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
650 (condition-case () |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
651 (progn (diff-hunk-prev) (point)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
652 (error (point-min))))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
653 (header-files |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
654 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)") |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
655 (list (if old (match-string 1) (match-string 3)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
656 (if old (match-string 3) (match-string 1))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
657 (forward-line 1) nil))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
658 (delq nil |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
659 (append |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
660 (when (and (not old) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
661 (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
662 (re-search-backward "^Index: \\(.+\\)" limit t))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
663 (list (match-string 1))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
664 header-files |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
665 (when (re-search-backward |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
666 "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?" |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
667 nil t) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
668 (list (if old (match-string 2) (match-string 4)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
669 (if old (match-string 4) (match-string 2))))))))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
670 |
82034
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
671 (defun diff-find-file-name (&optional old batch prefix) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
672 "Return the file corresponding to the current patch. |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
673 Non-nil OLD means that we want the old file. |
82034
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
674 Non-nil BATCH means to prefer returning an incorrect answer than to prompt |
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
675 the user. |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
676 PREFIX is only used internally: don't use it." |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
677 (save-excursion |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
678 (unless (looking-at diff-file-header-re) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
679 (or (ignore-errors (diff-beginning-of-file)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
680 (re-search-forward diff-file-header-re nil t))) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
681 (let ((fs (diff-hunk-file-names old))) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
682 (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
683 (or |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
684 ;; use any previously used preference |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
685 (cdr (assoc fs diff-remembered-files-alist)) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
686 ;; try to be clever and use previous choices as an inspiration |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
687 (dolist (rf diff-remembered-files-alist) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
688 (let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf)))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
689 (if (and newfile (file-exists-p newfile)) (return newfile)))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
690 ;; look for each file in turn. If none found, try again but |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
691 ;; ignoring the first level of directory, ... |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
692 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
693 (file nil nil)) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
694 ((or (null files) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
695 (setq file (do* ((files files (cdr files)) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
696 (file (car files) (car files))) |
78676
b2023ab19990
(diff-find-file-name): Only accept regular files, to rule out
Glenn Morris <rgm@gnu.org>
parents:
78429
diff
changeset
|
697 ;; Use file-regular-p to avoid |
b2023ab19990
(diff-find-file-name): Only accept regular files, to rule out
Glenn Morris <rgm@gnu.org>
parents:
78429
diff
changeset
|
698 ;; /dev/null, directories, etc. |
b2023ab19990
(diff-find-file-name): Only accept regular files, to rule out
Glenn Morris <rgm@gnu.org>
parents:
78429
diff
changeset
|
699 ((or (null file) (file-regular-p file)) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
700 file)))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
701 file)) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
702 ;; <foo>.rej patches implicitly apply to <foo> |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
703 (and (string-match "\\.rej\\'" (or buffer-file-name "")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
704 (let ((file (substring buffer-file-name 0 (match-beginning 0)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
705 (when (file-exists-p file) file))) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
706 ;; If we haven't found the file, maybe it's because we haven't paid |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
707 ;; attention to the PCL-CVS hint. |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
708 (and (not prefix) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
709 (boundp 'cvs-pcl-cvs-dirchange-re) |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
710 (save-excursion |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
711 (re-search-backward cvs-pcl-cvs-dirchange-re nil t)) |
82034
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
712 (diff-find-file-name old batch (match-string 1))) |
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
713 ;; Invent something, if necessary. |
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
714 (when batch |
11eee91b817d
(diff-find-file-name): Add arg `batch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82033
diff
changeset
|
715 (or (car fs) default-directory)) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
716 ;; if all else fails, ask the user |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
717 (let ((file (read-file-name (format "Use file %s: " (or (first fs) "")) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
718 nil (first fs) t (first fs)))) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
719 (set (make-local-variable 'diff-remembered-files-alist) |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
720 (cons (cons fs file) diff-remembered-files-alist)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
721 file))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
722 |
32012
b1edfcd919a7
(diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31973
diff
changeset
|
723 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
724 (defun diff-ediff-patch () |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
725 "Call `ediff-patch-file' on the current buffer." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
726 (interactive) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
727 (condition-case err |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
728 (ediff-patch-file nil (current-buffer)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
729 (wrong-number-of-arguments (ediff-patch-file)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
730 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47523
diff
changeset
|
731 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
732 ;;;; Conversion functions |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47523
diff
changeset
|
733 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
734 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
735 ;;(defvar diff-inhibit-after-change nil |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
736 ;; "Non-nil means inhibit `diff-mode's after-change functions.") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
737 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
738 (defun diff-unified->context (start end) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
739 "Convert unified diffs to context diffs. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
740 START and END are either taken from the region (if a prefix arg is given) or |
78429
a3a4480349cb
(diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78359
diff
changeset
|
741 else cover the whole buffer." |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
742 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) |
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
743 (list (region-beginning) (region-end)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
744 (list (point-min) (point-max)))) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
745 (unless (markerp end) (setq end (copy-marker end t))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
746 (let (;;(diff-inhibit-after-change t) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
747 (inhibit-read-only t)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
748 (save-excursion |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
749 (goto-char start) |
29423
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
750 (while (and (re-search-forward "^\\(\\(---\\) .+\n\\(\\+\\+\\+\\) .+\\|@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\\)$" nil t) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
751 (< (point) end)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
752 (combine-after-change-calls |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
753 (if (match-beginning 2) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
754 ;; we matched a file header |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
755 (progn |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
756 ;; use reverse order to make sure the indices are kept valid |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
757 (replace-match "---" t t nil 3) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
758 (replace-match "***" t t nil 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
759 ;; we matched a hunk header |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
760 (let ((line1 (match-string 4)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
761 (lines1 (match-string 5)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
762 (line2 (match-string 6)) |
82035
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
763 (lines2 (match-string 7)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
764 ;; Variables to use the special undo function. |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
765 (old-undo buffer-undo-list) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
766 (old-end (marker-position end)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
767 (start (match-beginning 0)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
768 (reversible t)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
769 (replace-match |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
770 (concat "***************\n*** " line1 "," |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
771 (number-to-string (+ (string-to-number line1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
772 (string-to-number lines1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
773 -1)) " ****")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
774 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
775 (save-restriction |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
776 (narrow-to-region (point) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
777 (progn (diff-end-of-hunk 'unified) (point))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
778 (let ((hunk (buffer-string))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
779 (goto-char (point-min)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
780 (if (not (save-excursion (re-search-forward "^-" nil t))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
781 (delete-region (point) (point-max)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
782 (goto-char (point-max)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
783 (let ((modif nil) last-pt) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
784 (while (progn (setq last-pt (point)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
785 (= (forward-line -1) 0)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
786 (case (char-after) |
64045 | 787 (?\s (insert " ") (setq modif nil) (backward-char 1)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
788 (?+ (delete-region (point) last-pt) (setq modif t)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
789 (?- (if (not modif) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
790 (progn (forward-char 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
791 (insert " ")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
792 (delete-char 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
793 (insert "! ")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
794 (backward-char 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
795 (?\\ (when (save-excursion (forward-line -1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
796 (= (char-after) ?+)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
797 (delete-region (point) last-pt) (setq modif t))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
798 (t (setq modif nil)))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
799 (goto-char (point-max)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
800 (save-excursion |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
801 (insert "--- " line2 "," |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
802 (number-to-string (+ (string-to-number line2) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
803 (string-to-number lines2) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
804 -1)) " ----\n" hunk)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
805 ;;(goto-char (point-min)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
806 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
807 (if (not (save-excursion (re-search-forward "^+" nil t))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
808 (delete-region (point) (point-max)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
809 (let ((modif nil) (delete nil)) |
82035
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
810 (if (save-excursion (re-search-forward "^\\+.*\n-" nil t)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
811 ;; Normally, lines in a substitution come with |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
812 ;; first the removals and then the additions, and |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
813 ;; the context->unified function follows this |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
814 ;; convention, of course. Yet, other alternatives |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
815 ;; are valid as well, but they preclude the use of |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
816 ;; context->unified as an undo command. |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
817 (setq reversible nil)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
818 (while (not (eobp)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
819 (case (char-after) |
64045 | 820 (?\s (insert " ") (setq modif nil) (backward-char 1)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
821 (?- (setq delete t) (setq modif t)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
822 (?+ (if (not modif) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
823 (progn (forward-char 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
824 (insert " ")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
825 (delete-char 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
826 (insert "! ")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
827 (backward-char 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
828 (?\\ (when (save-excursion (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
829 (not (eobp))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
830 (setq delete t) (setq modif t))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
831 (t (setq modif nil))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
832 (let ((last-pt (point))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
833 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
834 (when delete |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
835 (delete-region last-pt (point)) |
82035
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
836 (setq delete nil))))))) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
837 (unless (or (not reversible) (eq buffer-undo-list t)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
838 ;; Drop the many undo entries and replace them with |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
839 ;; a single entry that uses diff-context->unified to do |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
840 ;; the work. |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
841 (setq buffer-undo-list |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
842 (cons (list 'apply (- old-end end) start (point-max) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
843 'diff-context->unified start (point-max)) |
da9840648bbd
(diff-unified->context): Use the new `apply' undo entry kind
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82034
diff
changeset
|
844 old-undo))))))))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
845 |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
846 (defun diff-context->unified (start end &optional to-context) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
847 "Convert context diffs to unified diffs. |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
848 START and END are either taken from the region |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
849 \(when it is highlighted) or else cover the whole buffer. |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
850 With a prefix argument, convert unified format to context format." |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
851 (interactive (if (and transient-mark-mode mark-active) |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
852 (list (region-beginning) (region-end) current-prefix-arg) |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
853 (list (point-min) (point-max) current-prefix-arg))) |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
854 (if to-context |
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
855 (diff-unified->context start end) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
856 (unless (markerp end) (setq end (copy-marker end t))) |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
857 (let ( ;;(diff-inhibit-after-change t) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
858 (inhibit-read-only t)) |
70333
64d227e5dd44
(diff-mode-shared-map): Don't bind M-W, M-U, M-C,
Richard M. Stallman <rms@gnu.org>
parents:
70292
diff
changeset
|
859 (save-excursion |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
860 (goto-char start) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
861 (while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
862 (< (point) end)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
863 (combine-after-change-calls |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
864 (if (match-beginning 2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
865 ;; we matched a file header |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
866 (progn |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
867 ;; use reverse order to make sure the indices are kept valid |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
868 (replace-match "+++" t t nil 3) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
869 (replace-match "---" t t nil 2)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
870 ;; we matched a hunk header |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
871 (let ((line1s (match-string 4)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
872 (line1e (match-string 5)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
873 (pt1 (match-beginning 0)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
874 ;; Variables to use the special undo function. |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
875 (old-undo buffer-undo-list) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
876 (old-end (marker-position end)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
877 (reversible t)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
878 (replace-match "") |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
879 (unless (re-search-forward |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
880 "^--- \\([0-9]+\\),\\(-?[0-9]+\\) ----$" nil t) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
881 (error "Can't find matching `--- n1,n2 ----' line")) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
882 (let ((line2s (match-string 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
883 (line2e (match-string 2)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
884 (pt2 (progn |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
885 (delete-region (progn (beginning-of-line) (point)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
886 (progn (forward-line 1) (point))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
887 (point-marker)))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
888 (goto-char pt1) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
889 (forward-line 1) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
890 (while (< (point) pt2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
891 (case (char-after) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
892 (?! (delete-char 2) (insert "-") (forward-line 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
893 (?- (forward-char 1) (delete-char 1) (forward-line 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
894 (?\s ;merge with the other half of the chunk |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
895 (let* ((endline2 |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
896 (save-excursion |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
897 (goto-char pt2) (forward-line 1) (point)))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
898 (case (char-after pt2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
899 ((?! ?+) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
900 (insert "+" |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
901 (prog1 (buffer-substring (+ pt2 2) endline2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
902 (delete-region pt2 endline2)))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
903 (?\s |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
904 (unless (= (- endline2 pt2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
905 (- (line-beginning-position 2) (point))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
906 ;; If the two lines we're merging don't have the |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
907 ;; same length (can happen with "diff -b"), then |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
908 ;; diff-unified->context will not properly undo |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
909 ;; this operation. |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
910 (setq reversible nil)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
911 (delete-region pt2 endline2) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
912 (delete-char 1) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
913 (forward-line 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
914 (?\\ (forward-line 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
915 (t (setq reversible nil) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
916 (delete-char 1) (forward-line 1))))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
917 (t (setq reversible nil) (forward-line 1)))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
918 (while (looking-at "[+! ] ") |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
919 (if (/= (char-after) ?!) (forward-char 1) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
920 (delete-char 1) (insert "+")) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
921 (delete-char 1) (forward-line 1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
922 (save-excursion |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
923 (goto-char pt1) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
924 (insert "@@ -" line1s "," |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
925 (number-to-string (- (string-to-number line1e) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
926 (string-to-number line1s) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
927 -1)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
928 " +" line2s "," |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
929 (number-to-string (- (string-to-number line2e) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
930 (string-to-number line2s) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
931 -1)) " @@")) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
932 (set-marker pt2 nil) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
933 ;; The whole procedure succeeded, let's replace the myriad |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
934 ;; of undo elements with just a single special one. |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
935 (unless (or (not reversible) (eq buffer-undo-list t)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
936 (setq buffer-undo-list |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
937 (cons (list 'apply (- old-end end) pt1 (point) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
938 'diff-unified->context pt1 (point)) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
939 old-undo))) |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
940 ))))))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
941 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
942 (defun diff-reverse-direction (start end) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
943 "Reverse the direction of the diffs. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
944 START and END are either taken from the region (if a prefix arg is given) or |
78429
a3a4480349cb
(diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78359
diff
changeset
|
945 else cover the whole buffer." |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
946 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) |
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
947 (list (region-beginning) (region-end)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
948 (list (point-min) (point-max)))) |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
949 (unless (markerp end) (setq end (copy-marker end t))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
950 (let (;;(diff-inhibit-after-change t) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
951 (inhibit-read-only t)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
952 (save-excursion |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
953 (goto-char start) |
29423
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
954 (while (and (re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil t) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
955 (< (point) end)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
956 (combine-after-change-calls |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
957 (cond |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
958 ;; a file header |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
959 ((match-beginning 2) (replace-match "\\2\\5\n\\4\\3" nil)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
960 ;; a context-diff hunk header |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
961 ((match-beginning 6) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
962 (let ((pt-lines1 (match-beginning 6)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
963 (lines1 (match-string 6))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
964 (replace-match "" nil nil nil 6) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
965 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
966 (let ((half1s (point))) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
967 (while (looking-at "[-! \\][ \t]\\|#") |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
968 (when (= (char-after) ?-) (delete-char 1) (insert "+")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
969 (forward-line 1)) |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
970 (let ((half1 (delete-and-extract-region half1s (point)))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
971 (unless (looking-at "^--- \\([0-9]+,-?[0-9]+\\) ----$") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
972 (insert half1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
973 (error "Can't find matching `--- n1,n2 ----' line")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
974 (let ((str1 (match-string 1))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
975 (replace-match lines1 nil nil nil 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
976 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
977 (let ((half2s (point))) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
978 (while (looking-at "[!+ \\][ \t]\\|#") |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
979 (when (= (char-after) ?+) (delete-char 1) (insert "-")) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
980 (forward-line 1)) |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
981 (let ((half2 (delete-and-extract-region half2s (point)))) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
982 (insert (or half1 "")) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
983 (goto-char half1s) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
984 (insert (or half2 "")))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
985 (goto-char pt-lines1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
986 (insert str1)))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
987 ;; a unified-diff hunk header |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
988 ((match-beginning 7) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
989 (replace-match "@@ -\\8 +\\7 @@" nil) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
990 (forward-line 1) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
991 (let ((c (char-after)) first last) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
992 (while (case (setq c (char-after)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
993 (?- (setq first (or first (point))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
994 (delete-char 1) (insert "+") t) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
995 (?+ (setq last (or last (point))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
996 (delete-char 1) (insert "-") t) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
997 ((?\\ ?#) t) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
998 (t (when (and first last (< first last)) |
46407
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
999 (insert (delete-and-extract-region first last))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1000 (setq first nil last nil) |
64004
ea880752de3b
(diff-mode): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63415
diff
changeset
|
1001 (equal ?\s c))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1002 (forward-line 1)))))))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1003 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1004 (defun diff-fixup-modifs (start end) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1005 "Fixup the hunk headers (in case the buffer was modified). |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1006 START and END are either taken from the region (if a prefix arg is given) or |
78429
a3a4480349cb
(diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78359
diff
changeset
|
1007 else cover the whole buffer." |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
1008 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) |
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
1009 (list (region-beginning) (region-end)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1010 (list (point-min) (point-max)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1011 (let ((inhibit-read-only t)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1012 (save-excursion |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1013 (goto-char end) (diff-end-of-hunk) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1014 (let ((plus 0) (minus 0) (space 0) (bang 0)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1015 (while (and (= (forward-line -1) 0) (<= start (point))) |
57279
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
1016 (if (not (looking-at |
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
1017 (concat "@@ -[0-9,]+ \\+[0-9,]+ @@" |
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
1018 "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$" |
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
1019 "\\|--- .+\n\\+\\+\\+ "))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1020 (case (char-after) |
57279
c8797551b3a0
(diff-file-header-re): Tighten up regexp a tiny bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57020
diff
changeset
|
1021 (?\s (incf space)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1022 (?+ (incf plus)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1023 (?- (incf minus)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1024 (?! (incf bang)) |
28858
85d4cc0b8741
(diff-font-lock-keywords): Recognize comments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28240
diff
changeset
|
1025 ((?\\ ?#) nil) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1026 (t (setq space 0 plus 0 minus 0 bang 0))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1027 (cond |
29423
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1028 ((looking-at "@@ -[0-9]+,\\([0-9]*\\) \\+[0-9]+,\\([0-9]*\\) @@.*$") |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1029 (let* ((old1 (match-string 1)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1030 (old2 (match-string 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1031 (new1 (number-to-string (+ space minus))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1032 (new2 (number-to-string (+ space plus)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1033 (unless (string= new2 old2) (replace-match new2 t t nil 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1034 (unless (string= new1 old1) (replace-match new1 t t nil 1)))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1035 ((looking-at "--- \\([0-9]+\\),\\([0-9]*\\) ----$") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1036 (when (> (+ space bang plus) 0) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1037 (let* ((old1 (match-string 1)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1038 (old2 (match-string 2)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1039 (new (number-to-string |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1040 (+ space bang plus -1 (string-to-number old1))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1041 (unless (string= new old2) (replace-match new t t nil 2))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1042 ((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1043 (when (> (+ space bang minus) 0) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1044 (let* ((old (match-string 1)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1045 (new (format |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1046 (concat "%0" (number-to-string (length old)) "d") |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1047 (+ space bang minus -1 (string-to-number old))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1048 (unless (string= new old) (replace-match new t t nil 2)))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1049 (setq space 0 plus 0 minus 0 bang 0))))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1050 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47523
diff
changeset
|
1051 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1052 ;;;; Hooks |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47523
diff
changeset
|
1053 ;;;; |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1054 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1055 (defun diff-write-contents-hooks () |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1056 "Fixup hunk headers if necessary." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1057 (if (buffer-modified-p) (diff-fixup-modifs (point-min) (point-max))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1058 nil) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1059 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1060 ;; It turns out that making changes in the buffer from within an |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1061 ;; *-change-function is asking for trouble, whereas making them |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1062 ;; from a post-command-hook doesn't pose much problems |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1063 (defvar diff-unhandled-changes nil) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1064 (defun diff-after-change-function (beg end len) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1065 "Remember to fixup the hunk header. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1066 See `after-change-functions' for the meaning of BEG, END and LEN." |
29423
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1067 ;; Ignoring changes when inhibit-read-only is set is strictly speaking |
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1068 ;; incorrect, but it turns out that inhibit-read-only is normally not set |
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1069 ;; inside editing commands, while it tends to be set when the buffer gets |
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1070 ;; updated by an async process or by a conversion function, both of which |
12e89e9b65f6
(diff-font-lock-keywords, diff-hunk-header-re)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28858
diff
changeset
|
1071 ;; would rather not be uselessly slowed down by this hook. |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1072 (when (and (not undo-in-progress) (not inhibit-read-only)) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1073 (if diff-unhandled-changes |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1074 (setq diff-unhandled-changes |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1075 (cons (min beg (car diff-unhandled-changes)) |
46407
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
1076 (max end (cdr diff-unhandled-changes)))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1077 (setq diff-unhandled-changes (cons beg end))))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1078 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1079 (defun diff-post-command-hook () |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1080 "Fixup hunk headers if necessary." |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1081 (when (consp diff-unhandled-changes) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1082 (ignore-errors |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1083 (save-excursion |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
1084 (goto-char (car diff-unhandled-changes)) |
46407
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
1085 ;; Maybe we've cut the end of the hunk before point. |
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
1086 (if (and (bolp) (not (bobp))) (backward-char 1)) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1087 ;; We used to fixup modifs on all the changes, but it turns out |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1088 ;; that it's safer not to do it on big changes, for example |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1089 ;; when yanking a big diff, since we might then screw up perfectly |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1090 ;; correct values. -stef |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1091 ;; (unless (ignore-errors |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1092 ;; (diff-beginning-of-hunk) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1093 ;; (save-excursion |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1094 ;; (diff-end-of-hunk) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1095 ;; (> (point) (car diff-unhandled-changes)))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1096 ;; (goto-char (car diff-unhandled-changes)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1097 ;; (re-search-forward diff-hunk-header-re (cdr diff-unhandled-changes)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1098 ;; (diff-beginning-of-hunk)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1099 ;; (diff-fixup-modifs (point) (cdr diff-unhandled-changes)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1100 (diff-beginning-of-hunk) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1101 (when (save-excursion |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1102 (diff-end-of-hunk) |
46407
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
1103 (>= (point) (cdr diff-unhandled-changes))) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1104 (diff-fixup-modifs (point) (cdr diff-unhandled-changes))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1105 (setq diff-unhandled-changes nil))) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1106 |
55088
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1107 (defun diff-next-error (arg reset) |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1108 ;; Select a window that displays the current buffer so that point |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1109 ;; movements are reflected in that window. Otherwise, the user might |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1110 ;; never see the hunk corresponding to the source she's jumping to. |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1111 (pop-to-buffer (current-buffer)) |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1112 (if reset (goto-char (point-min))) |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1113 (diff-hunk-next arg) |
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1114 (diff-goto-source)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1115 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1116 ;;;###autoload |
28240
a0b15838fd22
(diff-mode-*-map): use `easy-mmode-defmap'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27637
diff
changeset
|
1117 (define-derived-mode diff-mode fundamental-mode "Diff" |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1118 "Major mode for viewing/editing context diffs. |
39386
50956864fe56
(diff-default-read-only): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39323
diff
changeset
|
1119 Supports unified and context diffs as well as (to a lesser extent) |
76982
3a37aeee9537
(diff-mode): Revert 2007-03-04 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
76453
diff
changeset
|
1120 normal diffs. |
76323 | 1121 |
47445
d54b5b9a2b77
(diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46407
diff
changeset
|
1122 When the buffer is read-only, the ESC prefix is not necessary. |
63415
3ed17f92f3c9
(diff-mode): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
63197
diff
changeset
|
1123 If you edit the buffer manually, diff-mode will try to update the hunk |
47445
d54b5b9a2b77
(diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46407
diff
changeset
|
1124 headers for you on-the-fly. |
d54b5b9a2b77
(diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46407
diff
changeset
|
1125 |
d54b5b9a2b77
(diff-mode): Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46407
diff
changeset
|
1126 You can also switch between context diff and unified diff with \\[diff-context->unified], |
66130 | 1127 or vice versa with \\[diff-unified->context] and you can also reverse the direction of |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1128 a diff with \\[diff-reverse-direction]. |
76323 | 1129 |
1130 \\{diff-mode-map}" | |
1131 | |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1132 (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1133 (set (make-local-variable 'outline-regexp) diff-outline-regexp) |
31269
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
1134 (set (make-local-variable 'imenu-generic-expression) |
64bb4634d6d8
(diff-mode) <defgroup>: Add :version.
Dave Love <fx@gnu.org>
parents:
30873
diff
changeset
|
1135 diff-imenu-generic-expression) |
31479
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1136 ;; These are not perfect. They would be better done separately for |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1137 ;; context diffs and unidiffs. |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1138 ;; (set (make-local-variable 'paragraph-start) |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1139 ;; (concat "@@ " ; unidiff hunk |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1140 ;; "\\|\\*\\*\\* " ; context diff hunk or file start |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1141 ;; "\\|--- [^\t]+\t")) ; context or unidiff file |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1142 ;; ; start (first or second line) |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1143 ;; (set (make-local-variable 'paragraph-separate) paragraph-start) |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1144 ;; (set (make-local-variable 'page-delimiter) "--- [^\t]+\t") |
d58461428926
(diff-mouse-goto-source): New function.
Dave Love <fx@gnu.org>
parents:
31269
diff
changeset
|
1145 ;; compile support |
55088
386e33861abd
(diff-next-error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54928
diff
changeset
|
1146 (set (make-local-variable 'next-error-function) 'diff-next-error) |
35526
b40a6cecc4d5
(diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33488
diff
changeset
|
1147 |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
70542
diff
changeset
|
1148 (setq buffer-read-only diff-default-read-only) |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
1149 ;; setup change hooks |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1150 (if (not diff-update-on-the-fly) |
53833
32e20bdb34c9
(diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53782
diff
changeset
|
1151 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1152 (make-local-variable 'diff-unhandled-changes) |
31973
ad9838a9349c
(diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31819
diff
changeset
|
1153 (add-hook 'after-change-functions 'diff-after-change-function nil t) |
ad9838a9349c
(diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31819
diff
changeset
|
1154 (add-hook 'post-command-hook 'diff-post-command-hook nil t)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1155 ;; Neat trick from Dave Love to add more bindings in read-only mode: |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1156 (lexical-let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map))) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1157 (add-to-list 'minor-mode-overriding-map-alist ro-bind) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1158 ;; Turn off this little trick in case the buffer is put in view-mode. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1159 (add-hook 'view-mode-hook |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1160 (lambda () |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1161 (setq minor-mode-overriding-map-alist |
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1162 (delq ro-bind minor-mode-overriding-map-alist))) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1163 nil t)) |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1164 ;; add-log support |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1165 (set (make-local-variable 'add-log-current-defun-function) |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1166 'diff-current-defun) |
32012
b1edfcd919a7
(diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31973
diff
changeset
|
1167 (set (make-local-variable 'add-log-buffer-file-name-function) |
b1edfcd919a7
(diff-add-log-file-name): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31973
diff
changeset
|
1168 'diff-find-file-name)) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1169 |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1170 ;;;###autoload |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1171 (define-minor-mode diff-minor-mode |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1172 "Minor mode for viewing/editing context diffs. |
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1173 \\{diff-minor-mode-map}" |
61269
5d2796fc9f80
(diff-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents:
57418
diff
changeset
|
1174 :group 'diff-mode :lighter " Diff" |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1175 ;; FIXME: setup font-lock |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
1176 ;; setup change hooks |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1177 (if (not diff-update-on-the-fly) |
53833
32e20bdb34c9
(diff-file-regexp-alist, diff-error-regexp-alist)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53782
diff
changeset
|
1178 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t) |
27637
79014abee3cc
(diff-kill-junk): New interactive function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26748
diff
changeset
|
1179 (make-local-variable 'diff-unhandled-changes) |
31973
ad9838a9349c
(diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31819
diff
changeset
|
1180 (add-hook 'after-change-functions 'diff-after-change-function nil t) |
ad9838a9349c
(diff-mode-map, diff-minor-mode-prefix):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31819
diff
changeset
|
1181 (add-hook 'post-command-hook 'diff-post-command-hook nil t))) |
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26009
diff
changeset
|
1182 |
71556
31835ba46d29
(diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71249
diff
changeset
|
1183 ;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1184 |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1185 (defun diff-delete-if-empty () |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1186 ;; An empty diff file means there's no more diffs to integrate, so we |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1187 ;; can just remove the file altogether. Very handy for .rej files if we |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1188 ;; remove hunks as we apply them. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1189 (when (and buffer-file-name |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1190 (eq 0 (nth 7 (file-attributes buffer-file-name)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1191 (delete-file buffer-file-name))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1192 |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1193 (defun diff-delete-empty-files () |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1194 "Arrange for empty diff files to be removed." |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1195 (add-hook 'after-save-hook 'diff-delete-if-empty nil t)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1196 |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1197 (defun diff-make-unified () |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1198 "Turn context diffs into unified diffs if applicable." |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1199 (if (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1200 (goto-char (point-min)) |
55392
480f9d542579
(diff-make-unified): Fix regexp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55322
diff
changeset
|
1201 (and (looking-at diff-hunk-header-re) (eq (char-after) ?*))) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1202 (let ((mod (buffer-modified-p))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1203 (unwind-protect |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1204 (diff-context->unified (point-min) (point-max)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1205 (restore-buffer-modified-p mod))))) |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1206 |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1207 ;;; |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1208 ;;; Misc operations that have proved useful at some point. |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1209 ;;; |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1210 |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1211 (defun diff-next-complex-hunk () |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1212 "Jump to the next \"complex\" hunk. |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1213 \"Complex\" is approximated by \"the hunk changes the number of lines\". |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1214 Only works for unified diffs." |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1215 (interactive) |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1216 (while |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1217 (and (re-search-forward "^@@ [-0-9]+,\\([0-9]+\\) [+0-9]+,\\([0-9]+\\) @@" |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1218 nil t) |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1219 (equal (match-string 1) (match-string 2))))) |
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1220 |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1221 (defun diff-sanity-check-context-hunk-half (lines) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1222 (let ((count lines)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1223 (while |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1224 (cond |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1225 ((and (memq (char-after) '(?\s ?! ?+ ?-)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1226 (memq (char-after (1+ (point))) '(?\s ?\t))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1227 (decf count) t) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1228 ((or (zerop count) (= count lines)) nil) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1229 ((memq (char-after) '(?! ?+ ?-)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1230 (if (not (and (eq (char-after (1+ (point))) ?\n) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1231 (y-or-n-p "Try to auto-fix whitespace loss damage? "))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1232 (error "End of hunk ambiguously marked") |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1233 (forward-char 1) (insert " ") (forward-line -1) t)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1234 ((< lines 0) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1235 (error "End of hunk ambiguously marked")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1236 ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? ")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1237 (error "Abort!")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1238 ((eolp) (insert " ") (forward-line -1) t) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1239 (t (insert " ") (delete-region (- (point) 2) (- (point) 1)) t)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1240 (forward-line)))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1241 |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1242 (defun diff-sanity-check-hunk () |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1243 (let (;; Every modification is protected by a y-or-n-p, so it's probably |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1244 ;; OK to override a read-only setting. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1245 (inhibit-read-only t)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1246 (save-excursion |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1247 (cond |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1248 ((not (looking-at diff-hunk-header-re)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1249 (error "Not recognizable hunk header")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1250 |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1251 ;; A context diff. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1252 ((eq (char-after) ?*) |
84468
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1253 (if (not (looking-at "\\*\\{15\\}\\(?: .*\\)?\n\\*\\*\\* \\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\*\\*\\*\\*")) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1254 (error "Unrecognized context diff first hunk header format") |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1255 (forward-line 2) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1256 (diff-sanity-check-context-hunk-half |
84468
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1257 (if (match-string 2) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1258 (1+ (- (string-to-number (match-string 2)) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1259 (string-to-number (match-string 1)))) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1260 1)) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1261 (if (not (looking-at "--- \\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? ----$")) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1262 (error "Unrecognized context diff second hunk header format") |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1263 (forward-line) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1264 (diff-sanity-check-context-hunk-half |
84468
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1265 (if (match-string 2) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1266 (1+ (- (string-to-number (match-string 2)) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1267 (string-to-number (match-string 1)))) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1268 1))))) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1269 |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1270 ;; A unified diff. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1271 ((eq (char-after) ?@) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1272 (if (not (looking-at |
84468
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1273 "@@ -[0-9]+\\(?:,\\([0-9]+\\)\\)? \\+[0-9]+\\(?:,\\([0-9]+\\)\\)? @@")) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1274 (error "Unrecognized unified diff hunk header format") |
84468
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1275 (let ((before (if (match-string 1) (string-to-number (match-string 1)) 1)) |
f3735c349e01
(diff-sanity-check-hunk): Also accept single-line hunks.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82910
diff
changeset
|
1276 (after (if (match-string 2) (string-to-number (match-string 2)) 1))) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1277 (forward-line) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1278 (while |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1279 (case (char-after) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1280 (?\s (decf before) (decf after) t) |
78756
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1281 (?- |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1282 (if (and (looking-at diff-file-header-re) |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1283 (zerop before) (zerop after)) |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1284 ;; No need to query: this is a case where two patches |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1285 ;; are concatenated and only counting the lines will |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1286 ;; give the right result. Let's just add an empty |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1287 ;; line so that our code which doesn't count lines |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1288 ;; will not get confused. |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1289 (progn (save-excursion (insert "\n")) nil) |
c41c1aee3d31
(diff-sanity-check-hunk): Fix up the case when unified
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78676
diff
changeset
|
1290 (decf before) t)) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1291 (?+ (decf after) t) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1292 (t |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1293 (cond |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1294 ((and (zerop before) (zerop after)) nil) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1295 ((or (< before 0) (< after 0)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1296 (error (if (or (zerop before) (zerop after)) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1297 "End of hunk ambiguously marked" |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1298 "Hunk seriously messed up"))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1299 ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? ")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1300 (error "Abort!")) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1301 ((eolp) (insert " ") (forward-line -1) t) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1302 (t (insert " ") |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1303 (delete-region (- (point) 2) (- (point) 1)) t)))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1304 (forward-line))))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1305 |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1306 ;; A plain diff. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1307 (t |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1308 ;; TODO. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1309 ))))) |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1310 |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1311 (defun diff-hunk-text (hunk destp char-offset) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1312 "Return the literal source text from HUNK as (TEXT . OFFSET). |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
1313 If DESTP is nil, TEXT is the source, otherwise the destination text. |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1314 CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1315 char-offset in TEXT." |
31556
74d7a9c42c2a
(diff-hunk-text): Use `with-temp-buffer'.
Miles Bader <miles@gnu.org>
parents:
31538
diff
changeset
|
1316 (with-temp-buffer |
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1317 (insert hunk) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1318 (goto-char (point-min)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1319 (let ((src-pos nil) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1320 (dst-pos nil) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1321 (divider-pos nil) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1322 (num-pfx-chars 2)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1323 ;; Set the following variables: |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1324 ;; SRC-POS buffer pos of the source part of the hunk or nil if none |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1325 ;; DST-POS buffer pos of the destination part of the hunk or nil |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1326 ;; DIVIDER-POS buffer pos of any divider line separating the src & dst |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1327 ;; NUM-PFX-CHARS number of line-prefix characters used by this format" |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1328 (cond ((looking-at "^@@") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1329 ;; unified diff |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1330 (setq num-pfx-chars 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1331 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1332 (setq src-pos (point) dst-pos (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1333 ((looking-at "^\\*\\*") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1334 ;; context diff |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1335 (forward-line 2) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1336 (setq src-pos (point)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1337 (re-search-forward "^--- " nil t) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1338 (forward-line 0) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1339 (setq divider-pos (point)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1340 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1341 (setq dst-pos (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1342 ((looking-at "^[0-9]+a[0-9,]+$") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1343 ;; normal diff, insert |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1344 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1345 (setq dst-pos (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1346 ((looking-at "^[0-9,]+d[0-9]+$") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1347 ;; normal diff, delete |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1348 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1349 (setq src-pos (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1350 ((looking-at "^[0-9,]+c[0-9,]+$") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1351 ;; normal diff, change |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1352 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1353 (setq src-pos (point)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1354 (re-search-forward "^---$" nil t) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1355 (forward-line 0) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1356 (setq divider-pos (point)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1357 (forward-line 1) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1358 (setq dst-pos (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1359 (t |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1360 (error "Unknown diff hunk type"))) |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1361 |
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1362 (if (if destp (null dst-pos) (null src-pos)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1363 ;; Implied empty text |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1364 (if char-offset '("" . 0) "") |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1365 |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1366 ;; For context diffs, either side can be empty, (if there's only |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1367 ;; added or only removed text). We should then use the other side. |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1368 (cond ((equal src-pos divider-pos) (setq src-pos dst-pos)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1369 ((equal dst-pos (point-max)) (setq dst-pos src-pos))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1370 |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1371 (when char-offset (goto-char (+ (point-min) char-offset))) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1372 |
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1373 ;; Get rid of anything except the desired text. |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1374 (save-excursion |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1375 ;; Delete unused text region |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1376 (let ((keep (if destp dst-pos src-pos))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1377 (when (and divider-pos (> divider-pos keep)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1378 (delete-region divider-pos (point-max))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1379 (delete-region (point-min) keep)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1380 ;; Remove line-prefix characters, and unneeded lines (unified diffs). |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1381 (let ((kill-char (if destp ?- ?+))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1382 (goto-char (point-min)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1383 (while (not (eobp)) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1384 (if (eq (char-after) kill-char) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1385 (delete-region (point) (progn (forward-line 1) (point))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1386 (delete-char num-pfx-chars) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1387 (forward-line 1))))) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1388 |
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1389 (let ((text (buffer-substring-no-properties (point-min) (point-max)))) |
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1390 (if char-offset (cons text (- (point) (point-min))) text)))))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1391 |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1392 |
31734
6b057ae8165d
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31705
diff
changeset
|
1393 (defun diff-find-text (text) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1394 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT. |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1395 If TEXT isn't found, nil is returned." |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1396 (let* ((orig (point)) |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1397 (forw (and (search-forward text nil t) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1398 (cons (match-beginning 0) (match-end 0)))) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1399 (back (and (goto-char (+ orig (length text))) |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1400 (search-backward text nil t) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1401 (cons (match-beginning 0) (match-end 0))))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1402 ;; Choose the closest match. |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1403 (if (and forw back) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1404 (if (> (- (car forw) orig) (- orig (car back))) back forw) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1405 (or back forw)))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1406 |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1407 (defun diff-find-approx-text (text) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1408 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1409 Whitespace differences are ignored." |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1410 (let* ((orig (point)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1411 (re (concat "^[ \t\n]*" |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1412 (mapconcat 'regexp-quote (split-string text) "[ \t\n]+") |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1413 "[ \t\n]*\n")) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1414 (forw (and (re-search-forward re nil t) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1415 (cons (match-beginning 0) (match-end 0)))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1416 (back (and (goto-char (+ orig (length text))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1417 (re-search-backward re nil t) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1418 (cons (match-beginning 0) (match-end 0))))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1419 ;; Choose the closest match. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1420 (if (and forw back) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1421 (if (> (- (car forw) orig) (- orig (car back))) back forw) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1422 (or back forw)))) |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1423 |
80880
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1424 (defsubst diff-xor (a b) (if a (if (not b) a) b)) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1425 |
31786
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1426 (defun diff-find-source-location (&optional other-file reverse) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1427 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED). |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1428 BUF is the buffer corresponding to the source file. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1429 LINE-OFFSET is the offset between the expected and actual positions |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1430 of the text of the hunk or nil if the text was not found. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1431 POS is a pair (BEG . END) indicating the position of the text in the buffer. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1432 SRC and DST are the two variants of text as returned by `diff-hunk-text'. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1433 SRC is the variant that was found in the buffer. |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1434 SWITCHED is non-nil if the patch is already applied." |
31735
9d50fe5df6ce
Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31734
diff
changeset
|
1435 (save-excursion |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1436 (let* ((other (diff-xor other-file diff-jump-to-old-file)) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1437 (char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1438 (point)))) |
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1439 ;; Check that the hunk is well-formed. Otherwise diff-mode and |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1440 ;; the user may disagree on what constitutes the hunk |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1441 ;; (e.g. because an empty line truncates the hunk mid-course), |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1442 ;; leading to potentially nasty surprises for the user. |
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74269
diff
changeset
|
1443 (_ (diff-sanity-check-hunk)) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1444 (hunk (buffer-substring (point) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1445 (save-excursion (diff-end-of-hunk) (point)))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1446 (old (diff-hunk-text hunk reverse char-offset)) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1447 (new (diff-hunk-text hunk (not reverse) char-offset)) |
31735
9d50fe5df6ce
Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31734
diff
changeset
|
1448 ;; Find the location specification. |
31786
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1449 (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?")) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1450 (error "Can't find the hunk header") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1451 (if other (match-string 1) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1452 (if (match-end 3) (match-string 3) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1453 (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1454 (error "Can't find the hunk separator")) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1455 (match-string 1))))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1456 (file (or (diff-find-file-name other) (error "Can't find the file"))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1457 (buf (find-file-noselect file))) |
31735
9d50fe5df6ce
Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31734
diff
changeset
|
1458 ;; Update the user preference if he so wished. |
9d50fe5df6ce
Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31734
diff
changeset
|
1459 (when (> (prefix-numeric-value other-file) 8) |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1460 (setq diff-jump-to-old-file other)) |
31786
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1461 (with-current-buffer buf |
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1462 (goto-line (string-to-number line)) |
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1463 (let* ((orig-pos (point)) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1464 (switched nil) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1465 ;; FIXME: Check for case where both OLD and NEW are found. |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1466 (pos (or (diff-find-text (car old)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1467 (progn (setq switched t) (diff-find-text (car new))) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1468 (progn (setq switched nil) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1469 (condition-case nil |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1470 (diff-find-approx-text (car old)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1471 (invalid-regexp nil))) ;Regex too big. |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1472 (progn (setq switched t) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1473 (condition-case nil |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1474 (diff-find-approx-text (car new)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1475 (invalid-regexp nil))) ;Regex too big. |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1476 (progn (setq switched nil) nil)))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1477 (nconc |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1478 (list buf) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1479 (if pos |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1480 (list (count-lines orig-pos (car pos)) pos) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1481 (list nil (cons orig-pos (+ orig-pos (length (car old)))))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1482 (if switched (list new old t) (list old new)))))))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1483 |
31735
9d50fe5df6ce
Moved closer to its users.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31734
diff
changeset
|
1484 |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1485 (defun diff-hunk-status-msg (line-offset reversed dry-run) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1486 (let ((msg (if dry-run |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1487 (if reversed "already applied" "not yet applied") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1488 (if reversed "undone" "applied")))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1489 (message (cond ((null line-offset) "Hunk text not found") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1490 ((= line-offset 0) "Hunk %s") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1491 ((= line-offset 1) "Hunk %s at offset %d line") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1492 (t "Hunk %s at offset %d lines")) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1493 msg line-offset))) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1494 |
72813
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1495 (defvar diff-apply-hunk-to-backup-file nil) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1496 |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1497 (defun diff-apply-hunk (&optional reverse) |
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31817
diff
changeset
|
1498 "Apply the current hunk to the source file and go to the next. |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1499 By default, the new source file is patched, but if the variable |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1500 `diff-jump-to-old-file' is non-nil, then the old source file is |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1501 patched instead (some commands, such as `diff-goto-source' can change |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1502 the value of this variable when given an appropriate prefix argument). |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1503 |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1504 With a prefix argument, REVERSE the hunk." |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1505 (interactive "P") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1506 (destructuring-bind (buf line-offset pos old new &optional switched) |
80880
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1507 ;; Sometimes we'd like to have the following behavior: if REVERSE go |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1508 ;; to the new file, otherwise go to the old. But that means that by |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1509 ;; default we use the old file, which is the opposite of the default |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1510 ;; for diff-goto-source, and is thus confusing. Also when you don't |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1511 ;; know about it it's pretty surprising. |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1512 ;; TODO: make it possible to ask explicitly for this behavior. |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1513 ;; |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1514 ;; This is duplicated in diff-test-hunk. |
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1515 (diff-find-source-location nil reverse) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1516 (cond |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1517 ((null line-offset) |
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1518 (error "Can't find the text to patch")) |
72813
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1519 ((with-current-buffer buf |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1520 (and buffer-file-name |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1521 (backup-file-name-p buffer-file-name) |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1522 (not diff-apply-hunk-to-backup-file) |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1523 (not (set (make-local-variable 'diff-apply-hunk-to-backup-file) |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1524 (yes-or-no-p (format "Really apply this hunk to %s? " |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1525 (file-name-nondirectory |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1526 buffer-file-name))))))) |
76453
5e29de959ce6
(diff-apply-hunk): Use proper format string for
Andreas Schwab <schwab@suse.de>
parents:
76323
diff
changeset
|
1527 (error "%s" |
5e29de959ce6
(diff-apply-hunk): Use proper format string for
Andreas Schwab <schwab@suse.de>
parents:
76323
diff
changeset
|
1528 (substitute-command-keys |
72813
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1529 (format "Use %s\\[diff-apply-hunk] to apply it to the other file" |
200db4ae9b54
(diff-apply-hunk-to-backup-file): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71556
diff
changeset
|
1530 (if (not reverse) "\\[universal-argument] "))))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1531 ((and switched |
35526
b40a6cecc4d5
(diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33488
diff
changeset
|
1532 ;; A reversed patch was detected, perhaps apply it in reverse. |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1533 (not (save-window-excursion |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1534 (pop-to-buffer buf) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1535 (goto-char (+ (car pos) (cdr old))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1536 (y-or-n-p |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1537 (if reverse |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1538 "Hunk hasn't been applied yet; apply it now? " |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1539 "Hunk has already been applied; undo it? "))))) |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1540 (message "(Nothing done)")) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1541 (t |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1542 ;; Apply the hunk |
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1543 (with-current-buffer buf |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1544 (goto-char (car pos)) |
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1545 (delete-region (car pos) (cdr pos)) |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1546 (insert (car new))) |
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1547 ;; Display BUF in a window |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1548 (set-window-point (display-buffer buf) (+ (car pos) (cdr new))) |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1549 (diff-hunk-status-msg line-offset (diff-xor switched reverse) nil) |
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1550 (when diff-advance-after-apply-hunk |
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1551 (diff-hunk-next)))))) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1552 |
31684 | 1553 |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1554 (defun diff-test-hunk (&optional reverse) |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1555 "See whether it's possible to apply the current hunk. |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1556 With a prefix argument, try to REVERSE the hunk." |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1557 (interactive "P") |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1558 (destructuring-bind (buf line-offset pos src dst &optional switched) |
80880
dba96e4a8a94
(diff-apply-hunk, diff-test-hunk): Don't do by default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76982
diff
changeset
|
1559 (diff-find-source-location nil reverse) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1560 (set-window-point (display-buffer buf) (+ (car pos) (cdr src))) |
32063
3fb2a3b13c5e
(diff-test-hunk): Backout previous change. Fix doc string.
Miles Bader <miles@gnu.org>
parents:
32061
diff
changeset
|
1561 (diff-hunk-status-msg line-offset (diff-xor reverse switched) t))) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1562 |
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1563 |
54869
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
1564 (defalias 'diff-mouse-goto-source 'diff-goto-source) |
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
1565 |
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
1566 (defun diff-goto-source (&optional other-file event) |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1567 "Jump to the corresponding source line. |
37866
4e2d06e10072
(diff-jump-to-old-file, diff-update-on-the-fly):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37567
diff
changeset
|
1568 `diff-jump-to-old-file' (or its opposite if the OTHER-FILE prefix arg |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1569 is given) determines whether to jump to the old or the new file. |
31538
46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
Miles Bader <miles@gnu.org>
parents:
31479
diff
changeset
|
1570 If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument]) |
70542
ef7506f44a3a
(diff-context->unified): Use `region-beginning' and `region-end'
Juri Linkov <juri@jurta.org>
parents:
70333
diff
changeset
|
1571 then `diff-jump-to-old-file' is also set, for the next invocations." |
54869
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
1572 (interactive (list current-prefix-arg last-input-event)) |
32111
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1573 ;; When pointing at a removal line, we probably want to jump to |
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1574 ;; the old location, and else to the new (i.e. as if reverting). |
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1575 ;; This is a convenient detail when using smerge-diff. |
54869
c491468e3c18
(diff-goto-source): Make it work for mouse bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54693
diff
changeset
|
1576 (if event (posn-set-point (event-end event))) |
32111
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1577 (let ((rev (not (save-excursion (beginning-of-line) (looking-at "[-<]"))))) |
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1578 (destructuring-bind (buf line-offset pos src dst &optional switched) |
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1579 (diff-find-source-location other-file rev) |
161c2ec9f5b2
(diff-font-lock-keywords): Minor regex fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32063
diff
changeset
|
1580 (pop-to-buffer buf) |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1581 (goto-char (+ (car pos) (cdr src))) |
32143 | 1582 (diff-hunk-status-msg line-offset (diff-xor rev switched) t)))) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1583 |
31786
181947e98152
(diff-find-source-location):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31749
diff
changeset
|
1584 |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1585 (defun diff-current-defun () |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1586 "Find the name of function at point. |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1587 For use in `add-log-current-defun-function'." |
85208
8d5ae38b1b47
(diff-current-defun): Force recomputation of change-log-default-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85114
diff
changeset
|
1588 ;; Kill change-log-default-name so it gets recomputed each time, since |
8d5ae38b1b47
(diff-current-defun): Force recomputation of change-log-default-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85114
diff
changeset
|
1589 ;; each hunk may belong to another file which may belong to another |
8d5ae38b1b47
(diff-current-defun): Force recomputation of change-log-default-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85114
diff
changeset
|
1590 ;; directory and hence have a different ChangeLog file. |
8d5ae38b1b47
(diff-current-defun): Force recomputation of change-log-default-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85114
diff
changeset
|
1591 (kill-local-variable 'change-log-default-name) |
56073
dc1d86d80c20
Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56072
diff
changeset
|
1592 (save-excursion |
dc1d86d80c20
Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56072
diff
changeset
|
1593 (when (looking-at diff-hunk-header-re) |
dc1d86d80c20
Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56072
diff
changeset
|
1594 (forward-line 1) |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
1595 (re-search-forward "^[^ ]" nil t)) |
56073
dc1d86d80c20
Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56072
diff
changeset
|
1596 (destructuring-bind (buf line-offset pos src dst &optional switched) |
dc1d86d80c20
Reindent `diff-current-defun'.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
56072
diff
changeset
|
1597 (diff-find-source-location) |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1598 (beginning-of-line) |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1599 (or (when (memq (char-after) '(?< ?-)) |
31817
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1600 ;; Cursor is pointing at removed text. This could be a removed |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1601 ;; function, in which case, going to the source buffer will |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1602 ;; not help since the function is now removed. Instead, |
e23774b771e1
(diff-file-header-face): Reset to its previous value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31795
diff
changeset
|
1603 ;; try to figure out the function name just from the code-fragment. |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1604 (let ((old (if switched dst src))) |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1605 (with-temp-buffer |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1606 (insert (car old)) |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1607 (funcall (with-current-buffer buf major-mode)) |
46407
4c4398249108
(diff-reverse-direction): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42472
diff
changeset
|
1608 (goto-char (+ (point-min) (cdr old))) |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1609 (add-log-current-defun)))) |
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1610 (with-current-buffer buf |
41526
f0fb05d40941
(diff-end-of-hunk): Watch out for ambiguities.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39386
diff
changeset
|
1611 (goto-char (+ (car pos) (cdr src))) |
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31786
diff
changeset
|
1612 (add-log-current-defun)))))) |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1613 |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1614 (defun diff-ignore-whitespace-hunk () |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1615 "Re-diff the current hunk, ignoring whitespace differences." |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1616 (interactive) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1617 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk 'try-harder) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1618 (point)))) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1619 (opts (case (char-after) (?@ "-bu") (?* "-bc") (t "-b"))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1620 (line-nb (and (or (looking-at "[^0-9]+\\([0-9]+\\)") |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1621 (error "Can't find line number")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1622 (string-to-number (match-string 1)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1623 (hunk (delete-and-extract-region |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1624 (point) (save-excursion (diff-end-of-hunk) (point)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1625 (lead (make-string (1- line-nb) ?\n)) ;Line nums start at 1. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1626 (file1 (make-temp-file "diff1")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1627 (file2 (make-temp-file "diff2")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1628 (coding-system-for-read buffer-file-coding-system) |
71249
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
parents:
71248
diff
changeset
|
1629 (inhibit-read-only t) |
54528
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1630 old new) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1631 (unwind-protect |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1632 (save-excursion |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1633 (setq old (diff-hunk-text hunk nil char-offset)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1634 (setq new (diff-hunk-text hunk t char-offset)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1635 (write-region (concat lead (car old)) nil file1 nil 'nomessage) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1636 (write-region (concat lead (car new)) nil file2 nil 'nomessage) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1637 (with-temp-buffer |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1638 (let ((status |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1639 (call-process diff-command nil t nil |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1640 opts file1 file2))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1641 (case status |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1642 (0 nil) ;Nothing to reformat. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1643 (1 (goto-char (point-min)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1644 ;; Remove the file-header. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1645 (when (re-search-forward diff-hunk-header-re nil t) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1646 (delete-region (point-min) (match-beginning 0)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1647 (t (goto-char (point-max)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1648 (unless (bolp) (insert "\n")) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1649 (insert hunk))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1650 (setq hunk (buffer-string)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1651 (unless (memq status '(0 1)) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1652 (error "Diff returned: %s" status))))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1653 ;; Whatever happens, put back some equivalent text: either the new |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1654 ;; one or the original one in case some error happened. |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1655 (insert hunk) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1656 (delete-file file1) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1657 (delete-file file2)))) |
67419634950d
(diff-default-read-only): Change default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53833
diff
changeset
|
1658 |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1659 ;;; Fine change highlighting. |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1660 |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1661 (defface diff-refine-change |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1662 '((((class color) (min-colors 88) (background light)) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1663 :background "grey90") |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1664 (((class color) (min-colors 88) (background dark)) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1665 :background "grey40") |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1666 (((class color) (background light)) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1667 :background "yellow") |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1668 (((class color) (background dark)) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1669 :background "green") |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1670 (t :weight bold)) |
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1671 "Face used for char-based changes shown by `diff-refine-hunk'." |
85210
782f0bc49c07
* diff-mode.el (diff-fine-change): Add :group.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85208
diff
changeset
|
1672 :group 'diff-mode) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1673 |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1674 (defun diff-refine-preproc () |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1675 (while (re-search-forward "^[+>]" nil t) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1676 ;; Remove spurious changes due to the fact that one side of the hunk is |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1677 ;; marked with leading + or > and the other with leading - or <. |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1678 ;; We used to replace all the prefix chars with " " but this only worked |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1679 ;; when we did char-based refinement (or when using |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1680 ;; smerge-refine-weight-hack) since otherwise, the `forward' motion done |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1681 ;; in chopup do not necessarily do the same as the ones in highlight |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1682 ;; since the "_" is not treated the same as " ". |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1683 (replace-match (cdr (assq (char-before) '((?+ . "-") (?> . "<")))))) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1684 ) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1685 |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1686 (defun diff-refine-hunk () |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1687 "Highlight changes of hunk at point at a finer granularity." |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1688 (interactive) |
85503
59ee4068f60b
* progmodes/gud.el (gud-target-name): Move definition before use.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85478
diff
changeset
|
1689 (eval-and-compile (require 'smerge-mode)) |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1690 (save-excursion |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1691 (diff-beginning-of-hunk 'try-harder) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1692 (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1693 (beg (point)) |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1694 (props '((diff-mode . fine) (face diff-refine-change))) |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1695 (end (progn (diff-end-of-hunk) (point)))) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1696 |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1697 (remove-overlays beg end 'diff-mode 'fine) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1698 |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1699 (goto-char beg) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1700 (case style |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1701 (unified |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1702 (while (re-search-forward "^\\(?:-.*\n\\)+\\(\\)\\(?:\\+.*\n\\)+" |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1703 end t) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1704 (smerge-refine-subst (match-beginning 0) (match-end 1) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1705 (match-end 1) (match-end 0) |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1706 props 'diff-refine-preproc))) |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1707 (context |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1708 (let* ((middle (save-excursion (re-search-forward "^---"))) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1709 (other middle)) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1710 (while (re-search-forward "^\\(?:!.*\n\\)+" middle t) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1711 (smerge-refine-subst (match-beginning 0) (match-end 0) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1712 (save-excursion |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1713 (goto-char other) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1714 (re-search-forward "^\\(?:!.*\n\\)+" end) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1715 (setq other (match-end 0)) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1716 (match-beginning 0)) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1717 other |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1718 props 'diff-refine-preproc)))) |
85445
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1719 (t ;; Normal diffs. |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1720 (let ((beg1 (1+ (point)))) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1721 (when (re-search-forward "^---.*\n" end t) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1722 ;; It's a combined add&remove, so there's something to do. |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1723 (smerge-refine-subst beg1 (match-beginning 0) |
3bc55977b5f8
(diff-fine-highlight-preproc): Stick to minimal changes
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85210
diff
changeset
|
1724 (match-end 0) end |
85467
6ae4584fb3f6
(diff-auto-refine): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85445
diff
changeset
|
1725 props 'diff-refine-preproc)))))))) |
85100
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1726 |
c04703192cb6
(diff-hunk-style): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84468
diff
changeset
|
1727 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1728 ;; provide the package |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1729 (provide 'diff-mode) |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1730 |
30873
7f824fa01e10
(diff-mode-map): Bind diff-apply-hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29423
diff
changeset
|
1731 ;;; Old Change Log from when diff-mode wasn't part of Emacs: |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1732 ;; Revision 1.11 1999/10/09 23:38:29 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1733 ;; (diff-mode-load-hook): dropped. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1734 ;; (auto-mode-alist): also catch *.diffs. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1735 ;; (diff-find-file-name, diff-mode): add smarts to find the right file |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1736 ;; for *.rej files (that lack any file name indication). |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1737 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1738 ;; Revision 1.10 1999/09/30 15:32:11 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1739 ;; added support for "\ No newline at end of file". |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1740 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1741 ;; Revision 1.9 1999/09/15 00:01:13 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1742 ;; - added basic `compile' support. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1743 ;; - have diff-kill-hunk call diff-kill-file if it's the only hunk. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1744 ;; - diff-kill-file now tries to kill the leading garbage as well. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1745 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1746 ;; Revision 1.8 1999/09/13 21:10:09 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1747 ;; - don't use CL in the autoloaded code |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1748 ;; - accept diffs using -T |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1749 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1750 ;; Revision 1.7 1999/09/05 20:53:03 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1751 ;; interface to ediff-patch |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1752 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1753 ;; Revision 1.6 1999/09/01 20:55:13 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1754 ;; (ediff=patch-file): add bindings to call ediff-patch. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1755 ;; (diff-find-file-name): taken out of diff-goto-source. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1756 ;; (diff-unified->context, diff-context->unified, diff-reverse-direction, |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1757 ;; diff-fixup-modifs): only use the region if a prefix arg is given. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1758 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1759 ;; Revision 1.5 1999/08/31 19:18:52 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1760 ;; (diff-beginning-of-file, diff-prev-file): fixed wrong parenthesis. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1761 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1762 ;; Revision 1.4 1999/08/31 13:01:44 monnier |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1763 ;; use `combine-after-change-calls' to minimize the slowdown of font-lock. |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1764 ;; |
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1765 |
57418
3a8c458de33d
(diff-current-defun): Fix 2004-06-13's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57279
diff
changeset
|
1766 ;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66 |
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1767 ;;; diff-mode.el ends here |