|
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
|
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
4 ;; 2005, 2006, 2007 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
|
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
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option)
|
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>
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
|
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
|
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
|
42 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
|
|
|
43 ;; Also allow C-c C-a to delete already-applied hunks.
|
|
|
44 ;;
|
|
|
45 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location
|
|
|
46 ;; of a hunk. Show then the changes between <file> and <hunk> and make it
|
|
|
47 ;; possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
|
|
|
48 ;; Or maybe just make it into a ".rej to diff3-markers converter".
|
|
71556
|
49 ;; Maybe just use `wiggle' (by Neil Brown) to do it for us.
|
|
54528
|
50 ;;
|
|
|
51 ;; - Refine hunk on a word-by-word basis.
|
|
71556
|
52 ;;
|
|
|
53 ;; - in diff-apply-hunk, strip context in replace-match to better
|
|
|
54 ;; preserve markers and spacing.
|
|
30873
|
55 ;; - 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
|
56
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 ;;; Code:
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
58 (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
|
59
|
|
65287
|
60 (defvar add-log-buffer-file-name-function)
|
|
|
61
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
62
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
63 (defgroup diff-mode ()
|
|
64004
|
64 "Major mode for viewing/editing diffs."
|
|
31269
|
65 :version "21.1"
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
66 :group 'tools
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
67 :group 'diff)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
68
|
|
54528
|
69 (defcustom diff-default-read-only nil
|
|
39386
|
70 "If non-nil, `diff-mode' buffers default to being read-only."
|
|
|
71 :type 'boolean
|
|
|
72 :group 'diff-mode)
|
|
|
73
|
|
37866
|
74 (defcustom diff-jump-to-old-file nil
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75 "*Non-nil means `diff-goto-source' jumps to the old file.
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 Else, it jumps to the new file."
|
|
62531
|
77 :type 'boolean
|
|
|
78 :group 'diff-mode)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
79
|
|
37866
|
80 (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
|
81 "*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
|
82 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
|
83 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
|
84 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
|
85 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
|
86 when editing big diffs)."
|
|
62531
|
87 :type 'boolean
|
|
|
88 :group 'diff-mode)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
89
|
|
32061
|
90 (defcustom diff-advance-after-apply-hunk t
|
|
|
91 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
|
|
62531
|
92 :type 'boolean
|
|
|
93 :group 'diff-mode)
|
|
32061
|
94
|
|
|
95
|
|
54528
|
96 (defcustom diff-mode-hook nil
|
|
|
97 "Run after setting up the `diff-mode' major mode."
|
|
|
98 :type 'hook
|
|
62531
|
99 :options '(diff-delete-empty-files diff-make-unified)
|
|
|
100 :group 'diff-mode)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
101
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
102 (defvar diff-outline-regexp
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 "\\([*+][*+][*+] [^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
|
104
|
|
33432
|
105 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 ;;;; keymap, menu, ...
|
|
33432
|
107 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
108
|
|
28240
|
109 (easy-mmode-defmap diff-mode-shared-map
|
|
30873
|
110 '(;; From Pavel Machek's patch-mode.
|
|
28240
|
111 ("n" . diff-hunk-next)
|
|
|
112 ("N" . diff-file-next)
|
|
|
113 ("p" . diff-hunk-prev)
|
|
|
114 ("P" . diff-file-prev)
|
|
|
115 ("k" . diff-hunk-kill)
|
|
|
116 ("K" . diff-file-kill)
|
|
30873
|
117 ;; From compilation-minor-mode.
|
|
28240
|
118 ("}" . diff-file-next)
|
|
|
119 ("{" . diff-file-prev)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
120 ("\C-m" . diff-goto-source)
|
|
54869
|
121 ([mouse-2] . diff-goto-source)
|
|
30873
|
122 ;; From XEmacs' diff-mode.
|
|
74269
|
123 ;; Standard M-w is useful, so don't change M-W.
|
|
|
124 ;;("W" . widen)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
125 ;;("." . 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
|
126 ;;("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
|
127 ("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
|
128 ;;("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
|
129 ;;("N" . diff-narrow)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 ;;("h" . diff-show-header)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 ;;("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
|
132 ;;("q" . diff-quit)
|
|
71556
|
133 ;; Not useful if you have to metafy them.
|
|
|
134 ;;(" " . scroll-up)
|
|
|
135 ;;("\177" . scroll-down)
|
|
|
136 ;; Standard M-a is useful, so don't change M-A.
|
|
|
137 ;;("A" . diff-ediff-patch)
|
|
|
138 ;; Standard M-r is useful, so don't change M-r or M-R.
|
|
|
139 ;;("r" . diff-restrict-view)
|
|
|
140 ;;("R" . diff-reverse-direction)
|
|
53782
|
141 ("q" . quit-window))
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
142 "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
|
143
|
|
28240
|
144 (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
|
145 `(("\e" . ,diff-mode-shared-map)
|
|
30873
|
146 ;; From compilation-minor-mode.
|
|
|
147 ("\C-c\C-c" . diff-goto-source)
|
|
|
148 ;; Misc operations.
|
|
70333
|
149 ("\C-c\C-a" . diff-apply-hunk)
|
|
|
150 ("\C-c\C-e" . diff-ediff-patch)
|
|
|
151 ("\C-c\C-n" . diff-restrict-view)
|
|
|
152 ("\C-c\C-r" . diff-reverse-direction)
|
|
33432
|
153 ("\C-c\C-s" . diff-split-hunk)
|
|
56919
|
154 ("\C-c\C-t" . diff-test-hunk)
|
|
70333
|
155 ("\C-c\C-u" . diff-context->unified)
|
|
74269
|
156 ;; `d' because it duplicates the context :-( --Stef
|
|
|
157 ("\C-c\C-d" . diff-unified->context)
|
|
70333
|
158 ("\C-c\C-w" . diff-refine-hunk)
|
57020
f1329d47fa1a
(diff-mode-map): Rename `next-error-follow-mode' to `next-error-follow-minor-mode'.
Juri Linkov <juri@jurta.org>
diff
changeset
|
159 ("\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
|
160 "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
|
161
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
162 (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
|
163 "Menu for `diff-mode'."
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
164 '("Diff"
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
165 ["Jump to Source" diff-goto-source t]
|
|
33432
|
166 ["Apply hunk" diff-apply-hunk t]
|
|
|
167 ["Apply diff with Ediff" diff-ediff-patch t]
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 ["-----" nil nil]
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
169 ["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
|
170 ["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
|
171 ["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
|
172 ;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173 ))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
174
|
|
31973
|
175 (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>
diff
changeset
|
176 "Prefix key for `diff-minor-mode' commands."
|
|
62531
|
177 :type '(choice (string "\e") (string "C-c=") string)
|
|
|
178 :group 'diff-mode)
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
179
|
|
28240
|
180 (easy-mmode-defmap diff-minor-mode-map
|
|
|
181 `((,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>
diff
changeset
|
182 "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>
diff
changeset
|
183
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
184
|
|
33432
|
185 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
186 ;;;; font-lock support
|
|
33432
|
187 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
188
|
|
63197
|
189 (defface diff-header
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
190 '((((class color) (min-colors 88) (background light))
|
|
57418
|
191 :background "grey85")
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
192 (((class color) (min-colors 88) (background dark))
|
|
57418
|
193 :background "grey45")
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
194 (((class color) (background light))
|
|
57418
|
195 :foreground "blue1" :weight bold)
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
196 (((class color) (background dark))
|
|
57418
|
197 :foreground "green" :weight bold)
|
|
|
198 (t :weight bold))
|
|
62553
|
199 "`diff-mode' face inherited by hunk and index header faces."
|
|
|
200 :group 'diff-mode)
|
|
63197
|
201 ;; backward-compatibility alias
|
|
|
202 (put 'diff-header-face 'face-alias 'diff-header)
|
|
|
203 (defvar diff-header-face 'diff-header)
|
|
31734
|
204
|
|
63197
|
205 (defface diff-file-header
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
206 '((((class color) (min-colors 88) (background light))
|
|
57418
|
207 :background "grey70" :weight bold)
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
208 (((class color) (min-colors 88) (background dark))
|
|
57418
|
209 :background "grey60" :weight bold)
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
210 (((class color) (background light))
|
|
64496
|
211 :foreground "green" :weight bold)
|
55322
a02bfe4ba7ab
(diff-header-face, diff-file-header-face): Use min-colors.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
212 (((class color) (background dark))
|
|
57418
|
213 :foreground "cyan" :weight bold)
|
|
|
214 (t :weight bold)) ; :height 1.3
|
|
62553
|
215 "`diff-mode' face used to highlight file header lines."
|
|
|
216 :group 'diff-mode)
|
|
63197
|
217 ;; backward-compatibility alias
|
|
|
218 (put 'diff-file-header-face 'face-alias 'diff-file-header)
|
|
|
219 (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
|
220
|
|
63197
|
221 (defface diff-index
|
|
|
222 '((t :inherit diff-file-header))
|
|
62553
|
223 "`diff-mode' face used to highlight index header lines."
|
|
|
224 :group 'diff-mode)
|
|
63197
|
225 ;; backward-compatibility alias
|
|
|
226 (put 'diff-index-face 'face-alias 'diff-index)
|
|
|
227 (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
|
228
|
|
63197
|
229 (defface diff-hunk-header
|
|
|
230 '((t :inherit diff-header))
|
|
62553
|
231 "`diff-mode' face used to highlight hunk header lines."
|
|
|
232 :group 'diff-mode)
|
|
63197
|
233 ;; backward-compatibility alias
|
|
|
234 (put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
|
|
|
235 (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
|
236
|
|
63197
|
237 (defface diff-removed
|
|
|
238 '((t :inherit diff-changed))
|
|
62553
|
239 "`diff-mode' face used to highlight removed lines."
|
|
|
240 :group 'diff-mode)
|
|
63197
|
241 ;; backward-compatibility alias
|
|
|
242 (put 'diff-removed-face 'face-alias 'diff-removed)
|
|
|
243 (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
|
244
|
|
63197
|
245 (defface diff-added
|
|
|
246 '((t :inherit diff-changed))
|
|
62553
|
247 "`diff-mode' face used to highlight added lines."
|
|
|
248 :group 'diff-mode)
|
|
63197
|
249 ;; backward-compatibility alias
|
|
|
250 (put 'diff-added-face 'face-alias 'diff-added)
|
|
|
251 (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
|
252
|
|
63197
|
253 (defface diff-changed
|
|
32576
|
254 '((((type tty pc) (class color) (background light))
|
|
57418
|
255 :foreground "magenta" :weight bold :slant italic)
|
|
32576
|
256 (((type tty pc) (class color) (background dark))
|
|
57418
|
257 :foreground "yellow" :weight bold :slant italic))
|
|
62553
|
258 "`diff-mode' face used to highlight changed lines."
|
|
|
259 :group 'diff-mode)
|
|
63197
|
260 ;; backward-compatibility alias
|
|
|
261 (put 'diff-changed-face 'face-alias 'diff-changed)
|
|
|
262 (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
|
263
|
|
64496
|
264 (defface diff-indicator-removed
|
|
|
265 '((t :inherit diff-removed))
|
|
|
266 "`diff-mode' face used to highlight indicator of removed lines (-, <)."
|
|
|
267 :group 'diff-mode
|
|
|
268 :version "22.1")
|
|
|
269 (defvar diff-indicator-removed-face 'diff-indicator-removed)
|
|
|
270
|
|
|
271 (defface diff-indicator-added
|
|
|
272 '((t :inherit diff-added))
|
|
|
273 "`diff-mode' face used to highlight indicator of added lines (+, >)."
|
|
|
274 :group 'diff-mode
|
|
|
275 :version "22.1")
|
|
|
276 (defvar diff-indicator-added-face 'diff-indicator-added)
|
|
|
277
|
|
|
278 (defface diff-indicator-changed
|
|
|
279 '((t :inherit diff-changed))
|
|
|
280 "`diff-mode' face used to highlight indicator of changed lines."
|
|
|
281 :group 'diff-mode
|
|
|
282 :version "22.1")
|
|
|
283 (defvar diff-indicator-changed-face 'diff-indicator-changed)
|
|
|
284
|
|
63197
|
285 (defface diff-function
|
69608
0c54773776e4
(diff-function): Make it inherit from diff-header instead of diff-context.
Nick Roberts <nickrob@snap.net.nz>
diff
changeset
|
286 '((t :inherit diff-header))
|
|
62553
|
287 "`diff-mode' face used to highlight function names produced by \"diff -p\"."
|
|
|
288 :group 'diff-mode)
|
|
63197
|
289 ;; backward-compatibility alias
|
|
|
290 (put 'diff-function-face 'face-alias 'diff-function)
|
|
|
291 (defvar diff-function-face 'diff-function)
|
|
32603
|
292
|
|
63197
|
293 (defface diff-context
|
|
64496
|
294 '((((class color grayscale) (min-colors 88)) :inherit shadow))
|
|
62553
|
295 "`diff-mode' face used to highlight context and other side-information."
|
|
|
296 :group 'diff-mode)
|
|
63197
|
297 ;; backward-compatibility alias
|
|
|
298 (put 'diff-context-face 'face-alias 'diff-context)
|
|
|
299 (defvar diff-context-face 'diff-context)
|
|
31734
|
300
|
|
63197
|
301 (defface diff-nonexistent
|
|
|
302 '((t :inherit diff-file-header))
|
|
62553
|
303 "`diff-mode' face used to highlight nonexistent files in recursive diffs."
|
|
|
304 :group 'diff-mode)
|
|
63197
|
305 ;; backward-compatibility alias
|
|
|
306 (put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
|
|
|
307 (defvar diff-nonexistent-face 'diff-nonexistent)
|
|
37531
|
308
|
|
54528
|
309 (defconst diff-yank-handler '(diff-yank-function))
|
|
|
310 (defun diff-yank-function (text)
|
|
54540
|
311 ;; FIXME: the yank-handler is now called separately on each piece of text
|
|
|
312 ;; with a yank-handler property, so the next-single-property-change call
|
|
|
313 ;; below will always return nil :-( --stef
|
|
54528
|
314 (let ((mixed (next-single-property-change 0 'yank-handler text))
|
|
|
315 (start (point)))
|
|
|
316 ;; First insert the text.
|
|
|
317 (insert text)
|
|
|
318 ;; If the text does not include any diff markers and if we're not
|
|
|
319 ;; yanking back into a diff-mode buffer, get rid of the prefixes.
|
|
|
320 (unless (or mixed (derived-mode-p 'diff-mode))
|
|
|
321 (undo-boundary) ; Just in case the user wanted the prefixes.
|
|
|
322 (let ((re (save-excursion
|
|
|
323 (if (re-search-backward "^[><!][ \t]" start t)
|
|
|
324 (if (eq (char-after) ?!)
|
|
|
325 "^[!+- ][ \t]" "^[<>][ \t]")
|
|
|
326 "^[ <>!+-]"))))
|
|
|
327 (save-excursion
|
|
|
328 (while (re-search-backward re start t)
|
|
|
329 (replace-match "" t t)))))))
|
|
61269
|
330
|
|
54528
|
331
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
332 (defvar diff-font-lock-keywords
|
|
64496
|
333 `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
|
|
|
334 (1 diff-hunk-header-face) (2 diff-function-face))
|
|
|
335 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context
|
|
|
336 (1 diff-hunk-header-face) (2 diff-function-face))
|
|
31817
|
337 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context
|
|
64496
|
338 ("^--- .+ ----$" . diff-hunk-header-face) ;context
|
|
|
339 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal
|
|
|
340 ("^---$" . diff-hunk-header-face) ;normal
|
|
32111
|
341 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)\\(.*[^*-]\\)?\n"
|
|
31734
|
342 (0 diff-header-face) (2 diff-file-header-face prepend))
|
|
64496
|
343 ("^\\([-<]\\)\\(.*\n\\)"
|
|
|
344 (1 diff-indicator-removed-face) (2 diff-removed-face))
|
|
|
345 ("^\\([+>]\\)\\(.*\n\\)"
|
|
|
346 (1 diff-indicator-added-face) (2 diff-added-face))
|
|
|
347 ("^\\(!\\)\\(.*\n\\)"
|
|
|
348 (1 diff-indicator-changed-face) (2 diff-changed-face))
|
|
|
349 ("^Index: \\(.+\\).*\n"
|
|
|
350 (0 diff-header-face) (1 diff-index-face prepend))
|
|
37567
|
351 ("^Only in .*\n" . diff-nonexistent-face)
|
|
64496
|
352 ("^\\(#\\)\\(.*\\)"
|
|
64512
|
353 (1 font-lock-comment-delimiter-face)
|
|
|
354 (2 font-lock-comment-face))
|
|
64496
|
355 ("^[^-=+*!<>#].*\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
|
356
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
357 (defconst diff-font-lock-defaults
|
|
28858
|
358 '(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
|
359
|
|
31269
|
360 (defvar diff-imenu-generic-expression
|
|
|
361 ;; Prefer second name as first is most likely to be a backup or
|
|
33488
|
362 ;; version-control name. The [\t\n] at the end of the unidiff pattern
|
|
|
363 ;; catches Debian source diff files (which lack the trailing date).
|
|
|
364 '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)[\t\n]" 1) ; unidiffs
|
|
31269
|
365 (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs
|
|
|
366
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 ;;;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
368 ;;;; Movement
|
|
33432
|
369 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370
|
|
29423
|
371 (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
|
|
57279
|
372 (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
|
373 (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
|
374
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (defun diff-end-of-hunk (&optional style)
|
54928
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
376 (when (looking-at diff-hunk-header-re)
|
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
377 (unless style
|
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
378 ;; Especially important for unified (because headers are ambiguous).
|
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
379 (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
|
28a55e2ec30f
(diff-end-of-hunk): Be more careful with unified hunks.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
380 (goto-char (match-end 0)))
|
|
28858
|
381 (let ((end (and (re-search-forward (case style
|
|
41526
|
382 ;; A `unified' header is ambiguous.
|
|
|
383 (unified (concat "^[^-+# \\]\\|"
|
|
|
384 diff-file-header-re))
|
|
28858
|
385 (context "^[^-+#! \\]")
|
|
|
386 (normal "^[^<>#\\]")
|
|
|
387 (t "^[^-+#!<> \\]"))
|
|
|
388 nil t)
|
|
|
389 (match-beginning 0))))
|
|
|
390 ;; The return value is used by easy-mmode-define-navigation.
|
|
|
391 (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
|
392
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
393 (defun diff-beginning-of-hunk ()
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 (beginning-of-line)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
395 (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
|
396 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
397 (condition-case ()
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
398 (re-search-backward diff-hunk-header-re)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
399 (error (error "Can't find the beginning of the hunk")))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
400
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
401 (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
|
402 (beginning-of-line)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
403 (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
|
404 (forward-line 2)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
405 (condition-case ()
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
406 (re-search-backward diff-file-header-re)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
407 (error (error "Can't find the beginning of the file")))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
408
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
409 (defun diff-end-of-file ()
|
|
28858
|
410 (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
|
|
54528
|
411 (re-search-forward (concat "^[^-+#!<>0-9@* \\]\\|" diff-file-header-re)
|
|
|
412 nil 'move)
|
|
|
413 (if (match-beginning 1)
|
|
|
414 (goto-char (match-beginning 1))
|
|
|
415 (beginning-of-line)))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
416
|
|
28240
|
417 ;; Define diff-{hunk,file}-{prev,next}
|
|
|
418 (easy-mmode-define-navigation
|
|
53058
|
419 diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view)
|
|
28240
|
420 (easy-mmode-define-navigation
|
|
|
421 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
|
422
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
423 (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
|
424 "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
|
425 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
|
426 (interactive "P")
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
427 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
428 (if arg (diff-beginning-of-file) (diff-beginning-of-hunk))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
429 (narrow-to-region (point)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
430 (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
|
431 (point)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
432 (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
|
433
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
434
|
|
28240
|
435 (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
|
436 "Kill current hunk."
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
437 (interactive)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
438 (diff-beginning-of-hunk)
|
|
41526
|
439 (let* ((start (point))
|
|
54528
|
440 (nexthunk (when (re-search-forward diff-hunk-header-re nil t)
|
|
|
441 (match-beginning 0)))
|
|
41526
|
442 (firsthunk (ignore-errors
|
|
|
443 (goto-char start)
|
|
|
444 (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>
diff
changeset
|
445 (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>
diff
changeset
|
446 (inhibit-read-only t))
|
|
41526
|
447 (goto-char start)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
448 (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
|
449 (or (null nexthunk)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
450 (and nextfile (> nexthunk nextfile))))
|
|
41526
|
451 ;; It's the only hunk for this file, so kill the file.
|
|
28240
|
452 (diff-file-kill)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
453 (diff-end-of-hunk)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 (kill-region start (point)))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455
|
|
28240
|
456 (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
|
457 "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
|
458 (interactive)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
459 (diff-beginning-of-file)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
460 (let* ((start (point))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
461 (prevhunk (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 (ignore-errors
|
|
28240
|
463 (diff-hunk-prev) (point))))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
464 (index (save-excursion
|
71249
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
465 (re-search-backward "^Index: " prevhunk t)))
|
3798a822991e
* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
466 (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
|
467 (when index (setq start index))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
468 (diff-end-of-file)
|
|
54528
|
469 (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
|
470 (kill-region start (point))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471
|
|
27637
|
472 (defun diff-kill-junk ()
|
|
|
473 "Kill spurious empty diffs."
|
|
|
474 (interactive)
|
|
|
475 (save-excursion
|
|
|
476 (let ((inhibit-read-only t))
|
|
|
477 (goto-char (point-min))
|
|
|
478 (while (re-search-forward (concat "^\\(Index: .*\n\\)"
|
|
|
479 "\\([^-+!* <>].*\n\\)*?"
|
|
|
480 "\\(\\(Index:\\) \\|"
|
|
|
481 diff-file-header-re "\\)")
|
|
|
482 nil t)
|
|
|
483 (delete-region (if (match-end 4) (match-beginning 0) (match-end 1))
|
|
|
484 (match-beginning 3))
|
|
|
485 (beginning-of-line)))))
|
|
|
486
|
|
33432
|
487 (defun diff-count-matches (re start end)
|
|
|
488 (save-excursion
|
|
|
489 (let ((n 0))
|
|
|
490 (goto-char start)
|
|
|
491 (while (re-search-forward re end t) (incf n))
|
|
|
492 n)))
|
|
|
493
|
|
|
494 (defun diff-split-hunk ()
|
|
|
495 "Split the current (unified diff) hunk at point into two hunks."
|
|
|
496 (interactive)
|
|
|
497 (beginning-of-line)
|
|
|
498 (let ((pos (point))
|
|
|
499 (start (progn (diff-beginning-of-hunk) (point))))
|
|
|
500 (unless (looking-at "@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@")
|
|
|
501 (error "diff-split-hunk only works on unified context diffs"))
|
|
|
502 (forward-line 1)
|
|
|
503 (let* ((start1 (string-to-number (match-string 1)))
|
|
|
504 (start2 (string-to-number (match-string 2)))
|
|
|
505 (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>
diff
changeset
|
506 (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>
diff
changeset
|
507 (inhibit-read-only t))
|
|
33432
|
508 (goto-char pos)
|
|
|
509 ;; Hopefully the after-change-function will not screw us over.
|
|
|
510 (insert "@@ -" (number-to-string newstart1) ",1 +"
|
|
|
511 (number-to-string newstart2) ",1 @@\n")
|
|
|
512 ;; Fix the original hunk-header.
|
|
|
513 (diff-fixup-modifs start pos))))
|
|
49588
|
514
|
|
33432
|
515
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
516 ;;;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
517 ;;;; jump to other buffers
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
518 ;;;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
519
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
520 (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>
diff
changeset
|
521
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 (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
|
523 (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
|
524
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
525 (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>
diff
changeset
|
526 "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>
diff
changeset
|
527 Returns the merged string if successful or nil otherwise.
|
|
28240
|
528 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>
diff
changeset
|
529 If ANCESTOR = FROM, returns TO.
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
530 If ANCESTOR = TO, returns FROM.
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
531 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>
diff
changeset
|
532 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>
diff
changeset
|
533 ;; Ideally, we want:
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
534 ;; AMB ANB CMD -> CND
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
535 ;; 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>
diff
changeset
|
536 ;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1
|
|
28240
|
537 (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>
diff
changeset
|
538 (when (and (string-match (concat
|
|
28240
|
539 "\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n"
|
|
|
540 "\\1\\(.*\\)\\3\n"
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
541 "\\(.*\\(\\2\\).*\\)\\'") str)
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
542 (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>
diff
changeset
|
543 (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>
diff
changeset
|
544 (match-string 4 str)
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
545 (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>
diff
changeset
|
546
|
|
54528
|
547 (defun diff-tell-file-name (old name)
|
|
|
548 "Tell Emacs where the find the source file of the current hunk.
|
|
|
549 If the OLD prefix arg is passed, tell the file NAME of the old file."
|
|
|
550 (interactive
|
|
|
551 (let* ((old current-prefix-arg)
|
|
|
552 (fs (diff-hunk-file-names current-prefix-arg)))
|
|
|
553 (unless fs (error "No file name to look for"))
|
|
|
554 (list old (read-file-name (format "File for %s: " (car fs))
|
|
|
555 nil (diff-find-file-name old) t))))
|
|
|
556 (let ((fs (diff-hunk-file-names old)))
|
|
|
557 (unless fs (error "No file name to look for"))
|
|
|
558 (push (cons fs name) diff-remembered-files-alist)))
|
|
61269
|
559
|
|
54528
|
560 (defun diff-hunk-file-names (&optional old)
|
|
|
561 "Give the list of file names textually mentioned for the current hunk."
|
|
|
562 (save-excursion
|
|
|
563 (unless (looking-at diff-file-header-re)
|
|
|
564 (or (ignore-errors (diff-beginning-of-file))
|
|
|
565 (re-search-forward diff-file-header-re nil t)))
|
|
|
566 (let ((limit (save-excursion
|
|
|
567 (condition-case ()
|
|
|
568 (progn (diff-hunk-prev) (point))
|
|
|
569 (error (point-min)))))
|
|
|
570 (header-files
|
|
|
571 (if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\(\\s-.*\\)?\n[-+][-+][-+] \\(\\S-+\\)")
|
|
|
572 (list (if old (match-string 1) (match-string 3))
|
|
|
573 (if old (match-string 3) (match-string 1)))
|
|
|
574 (forward-line 1) nil)))
|
|
|
575 (delq nil
|
|
|
576 (append
|
|
|
577 (when (and (not old)
|
|
|
578 (save-excursion
|
|
|
579 (re-search-backward "^Index: \\(.+\\)" limit t)))
|
|
|
580 (list (match-string 1)))
|
|
|
581 header-files
|
|
|
582 (when (re-search-backward
|
|
|
583 "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?"
|
|
|
584 nil t)
|
|
|
585 (list (if old (match-string 2) (match-string 4))
|
|
|
586 (if old (match-string 4) (match-string 2)))))))))
|
|
|
587
|
|
71556
|
588 (defun diff-find-file-name (&optional old prefix)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
589 "Return the file corresponding to the current patch.
|
|
71556
|
590 Non-nil OLD means that we want the old file.
|
|
|
591 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
|
592 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
593 (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
|
594 (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
|
595 (re-search-forward diff-file-header-re nil t)))
|
|
54528
|
596 (let ((fs (diff-hunk-file-names old)))
|
|
71556
|
597 (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
|
598 (or
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
599 ;; use any previously used preference
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
600 (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>
diff
changeset
|
601 ;; 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>
diff
changeset
|
602 (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>
diff
changeset
|
603 (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>
diff
changeset
|
604 (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>
diff
changeset
|
605 ;; 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>
diff
changeset
|
606 ;; 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>
diff
changeset
|
607 (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>
diff
changeset
|
608 (file nil nil))
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
609 ((or (null files)
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
610 (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>
diff
changeset
|
611 (file (car files) (car files)))
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
612 ((or (null file) (file-exists-p file))
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
613 file))))
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
614 file))
|
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
615 ;; <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
|
616 (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
|
617 (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
|
618 (when (file-exists-p file) file)))
|
|
71556
|
619 ;; If we haven't found the file, maybe it's because we haven't paid
|
|
|
620 ;; attention to the PCL-CVS hint.
|
|
|
621 (and (not prefix)
|
|
|
622 (boundp 'cvs-pcl-cvs-dirchange-re)
|
|
|
623 (save-excursion
|
|
|
624 (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
|
|
|
625 (diff-find-file-name old (match-string 1)))
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
626 ;; 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>
diff
changeset
|
627 (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>
diff
changeset
|
628 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>
diff
changeset
|
629 (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>
diff
changeset
|
630 (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
|
631 file)))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
632
|
|
32012
|
633
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
634 (defun diff-ediff-patch ()
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
635 "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
|
636 (interactive)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
637 (condition-case err
|
|
28858
|
638 (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
|
639 (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
|
640
|
|
49588
|
641 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
642 ;;;; Conversion functions
|
|
49588
|
643 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
644
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
645 ;;(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
|
646 ;; "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
|
647
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
648 (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
|
649 "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
|
650 START and END are either taken from the region (if a prefix arg is given) or
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
651 else cover the whole bufer."
|
|
70542
|
652 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
|
|
|
653 (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
|
654 (list (point-min) (point-max))))
|
|
71556
|
655 (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
|
656 (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
|
657 (inhibit-read-only t))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
658 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
659 (goto-char start)
|
|
29423
|
660 (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
|
661 (< (point) end))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
662 (combine-after-change-calls
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
663 (if (match-beginning 2)
|
|
28858
|
664 ;; 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
|
665 (progn
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
666 ;; 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
|
667 (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
|
668 (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
|
669 ;; 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
|
670 (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
|
671 (lines1 (match-string 5))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
672 (line2 (match-string 6))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
673 (lines2 (match-string 7)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
674 (replace-match
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
675 (concat "***************\n*** " line1 ","
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
676 (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
|
677 (string-to-number lines1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
678 -1)) " ****"))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
679 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
680 (save-restriction
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
681 (narrow-to-region (point)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
682 (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
|
683 (let ((hunk (buffer-string)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
684 (goto-char (point-min))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
685 (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
|
686 (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
|
687 (goto-char (point-max))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
688 (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
|
689 (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
|
690 (= (forward-line -1) 0))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
691 (case (char-after)
|
|
64045
|
692 (?\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
|
693 (?+ (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
|
694 (?- (if (not modif)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
695 (progn (forward-char 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
696 (insert " "))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
697 (delete-char 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
698 (insert "! "))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
699 (backward-char 2))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
700 (?\\ (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
|
701 (= (char-after) ?+))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
702 (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
|
703 (t (setq modif nil))))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
704 (goto-char (point-max))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
705 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
706 (insert "--- " line2 ","
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
707 (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
|
708 (string-to-number lines2)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
709 -1)) " ----\n" hunk))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
710 ;;(goto-char (point-min))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
711 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
712 (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
|
713 (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
|
714 (let ((modif nil) (delete nil))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
715 (while (not (eobp))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
716 (case (char-after)
|
|
64045
|
717 (?\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
|
718 (?- (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
|
719 (?+ (if (not modif)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
720 (progn (forward-char 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
721 (insert " "))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
722 (delete-char 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
723 (insert "! "))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
724 (backward-char 2))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
725 (?\\ (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
|
726 (not (eobp)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
727 (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
|
728 (t (setq modif nil)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
729 (let ((last-pt (point)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
730 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
731 (when delete
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
732 (delete-region last-pt (point))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
733 (setq delete nil)))))))))))))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
734
|
|
70333
|
735 (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
|
736 "Convert context diffs to unified diffs.
|
|
70333
|
737 START and END are either taken from the region
|
|
|
738 \(when it is highlighted) or else cover the whole buffer.
|
|
|
739 With a prefix argument, convert unified format to context format."
|
|
|
740 (interactive (if (and transient-mark-mode mark-active)
|
|
70542
|
741 (list (region-beginning) (region-end) current-prefix-arg)
|
|
70333
|
742 (list (point-min) (point-max) current-prefix-arg)))
|
|
|
743 (if to-context
|
|
|
744 (diff-unified->context start end)
|
|
71556
|
745 (unless (markerp end) (setq end (copy-marker end t)))
|
|
70333
|
746 (let ( ;;(diff-inhibit-after-change t)
|
|
|
747 (inhibit-read-only t))
|
|
|
748 (save-excursion
|
|
|
749 (goto-char start)
|
|
|
750 (while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t)
|
|
|
751 (< (point) end))
|
|
|
752 (combine-after-change-calls
|
|
|
753 (if (match-beginning 2)
|
|
|
754 ;; we matched a file header
|
|
|
755 (progn
|
|
|
756 ;; use reverse order to make sure the indices are kept valid
|
|
|
757 (replace-match "+++" t t nil 3)
|
|
|
758 (replace-match "---" t t nil 2))
|
|
|
759 ;; we matched a hunk header
|
|
|
760 (let ((line1s (match-string 4))
|
|
|
761 (line1e (match-string 5))
|
|
|
762 (pt1 (match-beginning 0)))
|
|
|
763 (replace-match "")
|
|
|
764 (unless (re-search-forward
|
|
|
765 "^--- \\([0-9]+\\),\\(-?[0-9]+\\) ----$" nil t)
|
|
|
766 (error "Can't find matching `--- n1,n2 ----' line"))
|
|
|
767 (let ((line2s (match-string 1))
|
|
|
768 (line2e (match-string 2))
|
|
|
769 (pt2 (progn
|
|
|
770 (delete-region (progn (beginning-of-line) (point))
|
|
|
771 (progn (forward-line 1) (point)))
|
|
|
772 (point-marker))))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
773 (goto-char pt1)
|
|
70333
|
774 (forward-line 1)
|
|
|
775 (while (< (point) pt2)
|
|
|
776 (case (char-after)
|
|
|
777 ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
|
|
|
778 (?\s ;merge with the other half of the chunk
|
|
|
779 (let* ((endline2
|
|
|
780 (save-excursion
|
|
|
781 (goto-char pt2) (forward-line 1) (point)))
|
|
|
782 (c (char-after pt2)))
|
|
|
783 (case c
|
|
|
784 ((?! ?+)
|
|
|
785 (insert "+"
|
|
|
786 (prog1 (buffer-substring (+ pt2 2) endline2)
|
|
|
787 (delete-region pt2 endline2))))
|
|
|
788 (?\s ;FIXME: check consistency
|
|
|
789 (delete-region pt2 endline2)
|
|
|
790 (delete-char 1)
|
|
|
791 (forward-line 1))
|
|
|
792 (?\\ (forward-line 1))
|
|
|
793 (t (delete-char 1) (forward-line 1)))))
|
|
|
794 (t (forward-line 1))))
|
|
|
795 (while (looking-at "[+! ] ")
|
|
|
796 (if (/= (char-after) ?!) (forward-char 1)
|
|
|
797 (delete-char 1) (insert "+"))
|
|
|
798 (delete-char 1) (forward-line 1))
|
|
|
799 (save-excursion
|
|
|
800 (goto-char pt1)
|
|
|
801 (insert "@@ -" line1s ","
|
|
|
802 (number-to-string (- (string-to-number line1e)
|
|
|
803 (string-to-number line1s)
|
|
|
804 -1))
|
|
|
805 " +" line2s ","
|
|
|
806 (number-to-string (- (string-to-number line2e)
|
|
|
807 (string-to-number line2s)
|
|
|
808 -1)) " @@")))))))))))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
809
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
810 (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
|
811 "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
|
812 START and END are either taken from the region (if a prefix arg is given) or
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
813 else cover the whole bufer."
|
|
70542
|
814 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
|
|
|
815 (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
|
816 (list (point-min) (point-max))))
|
|
71556
|
817 (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
|
818 (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
|
819 (inhibit-read-only t))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
820 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
821 (goto-char start)
|
|
29423
|
822 (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
|
823 (< (point) end))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
824 (combine-after-change-calls
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
825 (cond
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
826 ;; a file header
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
827 ((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
|
828 ;; 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
|
829 ((match-beginning 6)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
830 (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
|
831 (lines1 (match-string 6)))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
832 (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
|
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 (let ((half1s (point)))
|
|
28858
|
835 (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
|
836 (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
|
837 (forward-line 1))
|
|
27637
|
838 (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
|
839 (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
|
840 (insert half1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
841 (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
|
842 (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
|
843 (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
|
844 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
845 (let ((half2s (point)))
|
|
28858
|
846 (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
|
847 (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
|
848 (forward-line 1))
|
|
27637
|
849 (let ((half2 (delete-and-extract-region half2s (point))))
|
|
28858
|
850 (insert (or half1 ""))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
851 (goto-char half1s)
|
|
28858
|
852 (insert (or half2 ""))))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
853 (goto-char pt-lines1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
854 (insert str1))))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
855 ;; 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
|
856 ((match-beginning 7)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
857 (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
|
858 (forward-line 1)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
859 (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
|
860 (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
|
861 (?- (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
|
862 (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
|
863 (?+ (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
|
864 (delete-char 1) (insert "-") t)
|
|
28858
|
865 ((?\\ ?#) t)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
866 (t (when (and first last (< first last))
|
|
46407
|
867 (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
|
868 (setq first nil last nil)
|
|
64004
|
869 (equal ?\s c)))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
870 (forward-line 1))))))))))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
871
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
872 (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
|
873 "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
|
874 START and END are either taken from the region (if a prefix arg is given) or
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
875 else cover the whole bufer."
|
|
70542
|
876 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
|
|
|
877 (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
|
878 (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
|
879 (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
|
880 (save-excursion
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
881 (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
|
882 (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
|
883 (while (and (= (forward-line -1) 0) (<= start (point)))
|
|
57279
|
884 (if (not (looking-at
|
|
|
885 (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
|
|
|
886 "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
|
|
|
887 "\\|--- .+\n\\+\\+\\+ ")))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
888 (case (char-after)
|
|
57279
|
889 (?\s (incf space))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
890 (?+ (incf plus))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
891 (?- (incf minus))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
892 (?! (incf bang))
|
|
28858
|
893 ((?\\ ?#) nil)
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
894 (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
|
895 (cond
|
|
29423
|
896 ((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
|
897 (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
|
898 (old2 (match-string 2))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
899 (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
|
900 (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
|
901 (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
|
902 (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
|
903 ((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
|
904 (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
|
905 (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
|
906 (old2 (match-string 2))
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
907 (new (number-to-string
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
908 (+ 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
|
909 (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
|
910 ((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
|
911 (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
|
912 (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
|
913 (new (format
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
914 (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
|
915 (+ 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
|
916 (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
|
917 (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
|
918
|
|
49588
|
919 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
920 ;;;; Hooks
|
|
49588
|
921 ;;;;
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
922
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
923 (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
|
924 "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
|
925 (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
|
926 nil)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
927
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
928 ;; 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
|
929 ;; *-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
|
930 ;; 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
|
931 (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
|
932 (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
|
933 "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
|
934 See `after-change-functions' for the meaning of BEG, END and LEN."
|
|
29423
|
935 ;; Ignoring changes when inhibit-read-only is set is strictly speaking
|
|
|
936 ;; incorrect, but it turns out that inhibit-read-only is normally not set
|
|
|
937 ;; inside editing commands, while it tends to be set when the buffer gets
|
|
|
938 ;; updated by an async process or by a conversion function, both of which
|
|
|
939 ;; 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
|
940 (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
|
941 (if diff-unhandled-changes
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
942 (setq diff-unhandled-changes
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
943 (cons (min beg (car diff-unhandled-changes))
|
|
46407
|
944 (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
|
945 (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
|
946
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
947 (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
|
948 "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
|
949 (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
|
950 (ignore-errors
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
951 (save-excursion
|
|
27637
|
952 (goto-char (car diff-unhandled-changes))
|
|
46407
|
953 ;; Maybe we've cut the end of the hunk before point.
|
|
|
954 (if (and (bolp) (not (bobp))) (backward-char 1))
|
|
41526
|
955 ;; We used to fixup modifs on all the changes, but it turns out
|
|
|
956 ;; that it's safer not to do it on big changes, for example
|
|
|
957 ;; when yanking a big diff, since we might then screw up perfectly
|
|
|
958 ;; correct values. -stef
|
|
|
959 ;; (unless (ignore-errors
|
|
|
960 ;; (diff-beginning-of-hunk)
|
|
|
961 ;; (save-excursion
|
|
|
962 ;; (diff-end-of-hunk)
|
|
|
963 ;; (> (point) (car diff-unhandled-changes))))
|
|
|
964 ;; (goto-char (car diff-unhandled-changes))
|
|
|
965 ;; (re-search-forward diff-hunk-header-re (cdr diff-unhandled-changes))
|
|
|
966 ;; (diff-beginning-of-hunk))
|
|
|
967 ;; (diff-fixup-modifs (point) (cdr diff-unhandled-changes))
|
|
|
968 (diff-beginning-of-hunk)
|
|
|
969 (when (save-excursion
|
|
|
970 (diff-end-of-hunk)
|
|
46407
|
971 (>= (point) (cdr diff-unhandled-changes)))
|
|
41526
|
972 (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
|
973 (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
|
974
|
|
55088
|
975 (defun diff-next-error (arg reset)
|
|
|
976 ;; Select a window that displays the current buffer so that point
|
|
|
977 ;; movements are reflected in that window. Otherwise, the user might
|
|
|
978 ;; never see the hunk corresponding to the source she's jumping to.
|
|
|
979 (pop-to-buffer (current-buffer))
|
|
|
980 (if reset (goto-char (point-min)))
|
|
|
981 (diff-hunk-next arg)
|
|
|
982 (diff-goto-source))
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
983
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
984 ;;;###autoload
|
|
28240
|
985 (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>
diff
changeset
|
986 "Major mode for viewing/editing context diffs.
|
|
39386
|
987 Supports unified and context diffs as well as (to a lesser extent)
|
|
76323
|
988 normal diffs. If you edit the buffer manually, diff-mode will try
|
|
|
989 to update the hunk headers for you on-the-fly.
|
|
|
990
|
|
47445
|
991 When the buffer is read-only, the ESC prefix is not necessary.
|
|
63415
|
992 If you edit the buffer manually, diff-mode will try to update the hunk
|
|
47445
|
993 headers for you on-the-fly.
|
|
|
994
|
|
|
995 You can also switch between context diff and unified diff with \\[diff-context->unified],
|
|
66130
|
996 or vice versa with \\[diff-unified->context] and you can also reverse the direction of
|
|
71556
|
997 a diff with \\[diff-reverse-direction].
|
|
76323
|
998
|
|
|
999 When the buffer is read-only, the Meta- modifier is not necessary
|
|
|
1000 to run the Diff mode commands:
|
|
|
1001
|
|
|
1002 \\{diff-mode-map}"
|
|
|
1003
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1004 (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
|
1005 (set (make-local-variable 'outline-regexp) diff-outline-regexp)
|
|
31269
|
1006 (set (make-local-variable 'imenu-generic-expression)
|
|
|
1007 diff-imenu-generic-expression)
|
|
31479
|
1008 ;; These are not perfect. They would be better done separately for
|
|
|
1009 ;; context diffs and unidiffs.
|
|
|
1010 ;; (set (make-local-variable 'paragraph-start)
|
|
|
1011 ;; (concat "@@ " ; unidiff hunk
|
|
|
1012 ;; "\\|\\*\\*\\* " ; context diff hunk or file start
|
|
|
1013 ;; "\\|--- [^\t]+\t")) ; context or unidiff file
|
|
|
1014 ;; ; start (first or second line)
|
|
|
1015 ;; (set (make-local-variable 'paragraph-separate) paragraph-start)
|
|
|
1016 ;; (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
|
|
|
1017 ;; compile support
|
|
55088
|
1018 (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>
diff
changeset
|
1019
|
|
71248
|
1020 (setq buffer-read-only diff-default-read-only)
|
|
27637
|
1021 ;; setup change hooks
|
|
37866
|
1022 (if (not diff-update-on-the-fly)
|
|
53833
|
1023 (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
|
1024 (make-local-variable 'diff-unhandled-changes)
|
|
31973
|
1025 (add-hook 'after-change-functions 'diff-after-change-function nil t)
|
|
|
1026 (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
|
1027 ;; Neat trick from Dave Love to add more bindings in read-only mode:
|
|
71556
|
1028 (lexical-let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
|
|
54528
|
1029 (add-to-list 'minor-mode-overriding-map-alist ro-bind)
|
|
|
1030 ;; Turn off this little trick in case the buffer is put in view-mode.
|
|
|
1031 (add-hook 'view-mode-hook
|
|
71556
|
1032 (lambda ()
|
|
|
1033 (setq minor-mode-overriding-map-alist
|
|
|
1034 (delq ro-bind minor-mode-overriding-map-alist)))
|
|
54528
|
1035 nil t))
|
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1036 ;; add-log support
|
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1037 (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>
diff
changeset
|
1038 'diff-current-defun)
|
|
32012
|
1039 (set (make-local-variable 'add-log-buffer-file-name-function)
|
|
|
1040 '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
|
1041
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1042 ;;;###autoload
|
26748
8b8438e9ac12
* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1043 (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>
diff
changeset
|
1044 "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>
diff
changeset
|
1045 \\{diff-minor-mode-map}"
|
|
61269
|
1046 :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>
diff
changeset
|
1047 ;; FIXME: setup font-lock
|
|
27637
|
1048 ;; setup change hooks
|
|
37866
|
1049 (if (not diff-update-on-the-fly)
|
|
53833
|
1050 (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)
|
|
27637
|
1051 (make-local-variable 'diff-unhandled-changes)
|
|
31973
|
1052 (add-hook 'after-change-functions 'diff-after-change-function nil t)
|
|
|
1053 (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>
diff
changeset
|
1054
|
|
71556
|
1055 ;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
54528
|
1056
|
|
|
1057 (defun diff-delete-if-empty ()
|
|
|
1058 ;; An empty diff file means there's no more diffs to integrate, so we
|
|
|
1059 ;; can just remove the file altogether. Very handy for .rej files if we
|
|
|
1060 ;; remove hunks as we apply them.
|
|
|
1061 (when (and buffer-file-name
|
|
|
1062 (eq 0 (nth 7 (file-attributes buffer-file-name))))
|
|
|
1063 (delete-file buffer-file-name)))
|
|
|
1064
|
|
|
1065 (defun diff-delete-empty-files ()
|
|
|
1066 "Arrange for empty diff files to be removed."
|
|
|
1067 (add-hook 'after-save-hook 'diff-delete-if-empty nil t))
|
|
|
1068
|
|
|
1069 (defun diff-make-unified ()
|
|
|
1070 "Turn context diffs into unified diffs if applicable."
|
|
|
1071 (if (save-excursion
|
|
|
1072 (goto-char (point-min))
|
|
55392
|
1073 (and (looking-at diff-hunk-header-re) (eq (char-after) ?*)))
|
|
54528
|
1074 (let ((mod (buffer-modified-p)))
|
|
|
1075 (unwind-protect
|
|
|
1076 (diff-context->unified (point-min) (point-max))
|
|
|
1077 (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
|
1078
|
|
30873
|
1079 ;;;
|
|
|
1080 ;;; Misc operations that have proved useful at some point.
|
|
|
1081 ;;;
|
|
|
1082
|
|
|
1083 (defun diff-next-complex-hunk ()
|
|
|
1084 "Jump to the next \"complex\" hunk.
|
|
|
1085 \"Complex\" is approximated by \"the hunk changes the number of lines\".
|
|
|
1086 Only works for unified diffs."
|
|
|
1087 (interactive)
|
|
|
1088 (while
|
|
|
1089 (and (re-search-forward "^@@ [-0-9]+,\\([0-9]+\\) [+0-9]+,\\([0-9]+\\) @@"
|
|
|
1090 nil t)
|
|
|
1091 (equal (match-string 1) (match-string 2)))))
|
|
|
1092
|
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1093 (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>
diff
changeset
|
1094 (let ((count lines))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1095 (while
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1096 (cond
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1097 ((and (memq (char-after) '(?\s ?! ?+ ?-))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1098 (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>
diff
changeset
|
1099 (decf count) t)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1100 ((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>
diff
changeset
|
1101 ((memq (char-after) '(?! ?+ ?-))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1102 (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>
diff
changeset
|
1103 (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>
diff
changeset
|
1104 (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>
diff
changeset
|
1105 (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>
diff
changeset
|
1106 ((< lines 0)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1107 (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>
diff
changeset
|
1108 ((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>
diff
changeset
|
1109 (error "Abort!"))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1110 ((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>
diff
changeset
|
1111 (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>
diff
changeset
|
1112 (forward-line))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1113
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1114 (defun diff-sanity-check-hunk ()
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1115 (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>
diff
changeset
|
1116 ;; 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>
diff
changeset
|
1117 (inhibit-read-only t))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1118 (save-excursion
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1119 (cond
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1120 ((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>
diff
changeset
|
1121 (error "Not recognizable hunk header"))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1122
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1123 ;; A context diff.
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1124 ((eq (char-after) ?*)
|
|
75727
|
1125 (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>
diff
changeset
|
1126 (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>
diff
changeset
|
1127 (forward-line 2)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1128 (diff-sanity-check-context-hunk-half
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1129 (1+ (- (string-to-number (match-string 2))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1130 (string-to-number (match-string 1)))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1131 (if (not (looking-at "--- \\([0-9]+\\),\\([0-9]+\\) ----$"))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1132 (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>
diff
changeset
|
1133 (forward-line)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1134 (diff-sanity-check-context-hunk-half
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1135 (1+ (- (string-to-number (match-string 2))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1136 (string-to-number (match-string 1))))))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1137
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1138 ;; A unified diff.
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1139 ((eq (char-after) ?@)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1140 (if (not (looking-at
|
|
75709
|
1141 "@@ -[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>
diff
changeset
|
1142 (error "Unrecognized unified diff hunk header format")
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1143 (let ((before (string-to-number (match-string 1)))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1144 (after (string-to-number (match-string 2))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1145 (forward-line)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1146 (while
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1147 (case (char-after)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1148 (?\s (decf before) (decf after) t)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1149 (?- (decf before) t)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1150 (?+ (decf after) t)
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1151 (t
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1152 (cond
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1153 ((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>
diff
changeset
|
1154 ((or (< before 0) (< after 0))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1155 (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>
diff
changeset
|
1156 "End of hunk ambiguously marked"
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1157 "Hunk seriously messed up")))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1158 ((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>
diff
changeset
|
1159 (error "Abort!"))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1160 ((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>
diff
changeset
|
1161 (t (insert " ")
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1162 (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>
diff
changeset
|
1163 (forward-line)))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1164
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1165 ;; A plain diff.
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1166 (t
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1167 ;; TODO.
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1168 )))))
|
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1169
|
|
41526
|
1170 (defun diff-hunk-text (hunk destp char-offset)
|
|
|
1171 "Return the literal source text from HUNK as (TEXT . OFFSET).
|
|
70542
|
1172 If DESTP is nil, TEXT is the source, otherwise the destination text.
|
|
41526
|
1173 CHAR-OFFSET is a char-offset in HUNK, and OFFSET is the corresponding
|
|
|
1174 char-offset in TEXT."
|
|
31556
|
1175 (with-temp-buffer
|
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1176 (insert hunk)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1177 (goto-char (point-min))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1178 (let ((src-pos nil)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1179 (dst-pos nil)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1180 (divider-pos nil)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1181 (num-pfx-chars 2))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1182 ;; Set the following variables:
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1183 ;; 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>
diff
changeset
|
1184 ;; 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>
diff
changeset
|
1185 ;; 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>
diff
changeset
|
1186 ;; 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>
diff
changeset
|
1187 (cond ((looking-at "^@@")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1188 ;; unified diff
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1189 (setq num-pfx-chars 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1190 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1191 (setq src-pos (point) dst-pos (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1192 ((looking-at "^\\*\\*")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1193 ;; context diff
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1194 (forward-line 2)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1195 (setq src-pos (point))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1196 (re-search-forward "^--- " nil t)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1197 (forward-line 0)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1198 (setq divider-pos (point))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1199 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1200 (setq dst-pos (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1201 ((looking-at "^[0-9]+a[0-9,]+$")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1202 ;; normal diff, insert
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1203 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1204 (setq dst-pos (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1205 ((looking-at "^[0-9,]+d[0-9]+$")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1206 ;; normal diff, delete
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1207 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1208 (setq src-pos (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1209 ((looking-at "^[0-9,]+c[0-9,]+$")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1210 ;; normal diff, change
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1211 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1212 (setq src-pos (point))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1213 (re-search-forward "^---$" nil t)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1214 (forward-line 0)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1215 (setq divider-pos (point))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1216 (forward-line 1)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1217 (setq dst-pos (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1218 (t
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1219 (error "Unknown diff hunk type")))
|
|
30873
|
1220
|
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1221 (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>
diff
changeset
|
1222 ;; Implied empty text
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1223 (if char-offset '("" . 0) "")
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1224
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1225 ;; 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>
diff
changeset
|
1226 ;; 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>
diff
changeset
|
1227 (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>
diff
changeset
|
1228 ((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>
diff
changeset
|
1229
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1230 (when char-offset (goto-char (+ (point-min) char-offset)))
|
|
31538
|
1231
|
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1232 ;; Get rid of anything except the desired text.
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1233 (save-excursion
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1234 ;; Delete unused text region
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1235 (let ((keep (if destp dst-pos src-pos)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1236 (when (and divider-pos (> divider-pos keep))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1237 (delete-region divider-pos (point-max)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1238 (delete-region (point-min) keep))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1239 ;; 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>
diff
changeset
|
1240 (let ((kill-char (if destp ?- ?+)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1241 (goto-char (point-min))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1242 (while (not (eobp))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1243 (if (eq (char-after) kill-char)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1244 (delete-region (point) (progn (forward-line 1) (point)))
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1245 (delete-char num-pfx-chars)
|
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1246 (forward-line 1)))))
|
|
31538
|
1247
|
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1248 (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>
diff
changeset
|
1249 (if char-offset (cons text (- (point) (point-min))) text))))))
|
|
31817
|
1250
|
|
31538
|
1251
|
|
31734
|
1252 (defun diff-find-text (text)
|
|
41526
|
1253 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
|
|
31538
|
1254 If TEXT isn't found, nil is returned."
|
|
|
1255 (let* ((orig (point))
|
|
|
1256 (forw (and (search-forward text nil t)
|
|
41526
|
1257 (cons (match-beginning 0) (match-end 0))))
|
|
31538
|
1258 (back (and (goto-char (+ orig (length text)))
|
|
|
1259 (search-backward text nil t)
|
|
41526
|
1260 (cons (match-beginning 0) (match-end 0)))))
|
|
|
1261 ;; Choose the closest match.
|
|
31538
|
1262 (if (and forw back)
|
|
41526
|
1263 (if (> (- (car forw) orig) (- orig (car back))) back forw)
|
|
|
1264 (or back forw))))
|
|
|
1265
|
|
|
1266 (defun diff-find-approx-text (text)
|
|
|
1267 "Return the buffer position (BEG . END) of the nearest occurrence of TEXT.
|
|
|
1268 Whitespace differences are ignored."
|
|
|
1269 (let* ((orig (point))
|
|
|
1270 (re (concat "^[ \t\n ]*"
|
|
|
1271 (mapconcat 'regexp-quote (split-string text) "[ \t\n ]+")
|
|
|
1272 "[ \t\n ]*\n"))
|
|
|
1273 (forw (and (re-search-forward re nil t)
|
|
|
1274 (cons (match-beginning 0) (match-end 0))))
|
|
|
1275 (back (and (goto-char (+ orig (length text)))
|
|
|
1276 (re-search-backward re nil t)
|
|
|
1277 (cons (match-beginning 0) (match-end 0)))))
|
|
|
1278 ;; Choose the closest match.
|
|
|
1279 (if (and forw back)
|
|
|
1280 (if (> (- (car forw) orig) (- orig (car back))) back forw)
|
|
31538
|
1281 (or back forw))))
|
|
|
1282
|
|
31817
|
1283 (defsubst diff-xor (a b) (if a (not b) b))
|
|
|
1284
|
|
31786
|
1285 (defun diff-find-source-location (&optional other-file reverse)
|
|
41526
|
1286 "Find out (BUF LINE-OFFSET POS SRC DST SWITCHED).
|
|
|
1287 BUF is the buffer corresponding to the source file.
|
|
|
1288 LINE-OFFSET is the offset between the expected and actual positions
|
|
|
1289 of the text of the hunk or nil if the text was not found.
|
|
|
1290 POS is a pair (BEG . END) indicating the position of the text in the buffer.
|
|
|
1291 SRC and DST are the two variants of text as returned by `diff-hunk-text'.
|
|
|
1292 SRC is the variant that was found in the buffer.
|
|
|
1293 SWITCHED is non-nil if the patch is already applied."
|
|
31735
|
1294 (save-excursion
|
|
37866
|
1295 (let* ((other (diff-xor other-file diff-jump-to-old-file))
|
|
31817
|
1296 (char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
|
75191
98ad9ce30ba1
(diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1297 ;; 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>
diff
changeset
|
1298 ;; 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>
diff
changeset
|
1299 ;; (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>
diff
changeset
|
1300 ;; 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>
diff
changeset
|
1301 (_ (diff-sanity-check-hunk))
|
|
31817
|
1302 (hunk (buffer-substring (point)
|
|
|
1303 (save-excursion (diff-end-of-hunk) (point))))
|
|
|
1304 (old (diff-hunk-text hunk reverse char-offset))
|
|
|
1305 (new (diff-hunk-text hunk (not reverse) char-offset))
|
|
31735
|
1306 ;; Find the location specification.
|
|
31786
|
1307 (line (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
|
|
31817
|
1308 (error "Can't find the hunk header")
|
|
|
1309 (if other (match-string 1)
|
|
|
1310 (if (match-end 3) (match-string 3)
|
|
|
1311 (unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
|
|
|
1312 (error "Can't find the hunk separator"))
|
|
|
1313 (match-string 1)))))
|
|
|
1314 (file (or (diff-find-file-name other) (error "Can't find the file")))
|
|
|
1315 (buf (find-file-noselect file)))
|
|
31735
|
1316 ;; Update the user preference if he so wished.
|
|
|
1317 (when (> (prefix-numeric-value other-file) 8)
|
|
37866
|
1318 (setq diff-jump-to-old-file other))
|
|
31786
|
1319 (with-current-buffer buf
|
|
|
1320 (goto-line (string-to-number line))
|
|
|
1321 (let* ((orig-pos (point))
|
|
41526
|
1322 (switched nil)
|
|
54528
|
1323 ;; FIXME: Check for case where both OLD and NEW are found.
|
|
41526
|
1324 (pos (or (diff-find-text (car old))
|
|
|
1325 (progn (setq switched t) (diff-find-text (car new)))
|
|
|
1326 (progn (setq switched nil)
|
|
54528
|
1327 (condition-case nil
|
|
|
1328 (diff-find-approx-text (car old))
|
|
|
1329 (invalid-regexp nil))) ;Regex too big.
|
|
41526
|
1330 (progn (setq switched t)
|
|
54528
|
1331 (condition-case nil
|
|
|
1332 (diff-find-approx-text (car new))
|
|
|
1333 (invalid-regexp nil))) ;Regex too big.
|
|
41526
|
1334 (progn (setq switched nil) nil))))
|
|
31817
|
1335 (nconc
|
|
|
1336 (list buf)
|
|
41526
|
1337 (if pos
|
|
|
1338 (list (count-lines orig-pos (car pos)) pos)
|
|
|
1339 (list nil (cons orig-pos (+ orig-pos (length (car old))))))
|
|
31817
|
1340 (if switched (list new old t) (list old new))))))))
|
|
|
1341
|
|
31735
|
1342
|
|
31817
|
1343 (defun diff-hunk-status-msg (line-offset reversed dry-run)
|
|
|
1344 (let ((msg (if dry-run
|
|
|
1345 (if reversed "already applied" "not yet applied")
|
|
|
1346 (if reversed "undone" "applied"))))
|
|
|
1347 (message (cond ((null line-offset) "Hunk text not found")
|
|
|
1348 ((= line-offset 0) "Hunk %s")
|
|
|
1349 ((= line-offset 1) "Hunk %s at offset %d line")
|
|
|
1350 (t "Hunk %s at offset %d lines"))
|
|
|
1351 msg line-offset)))
|
|
|
1352
|
|
72813
|
1353 (defvar diff-apply-hunk-to-backup-file nil)
|
|
31817
|
1354
|
|
|
1355 (defun diff-apply-hunk (&optional reverse)
|
31819
e5a0c7120611
(diff-hunk-text): Properly handle one-sided context diffs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1356 "Apply the current hunk to the source file and go to the next.
|
|
31538
|
1357 By default, the new source file is patched, but if the variable
|
|
37866
|
1358 `diff-jump-to-old-file' is non-nil, then the old source file is
|
|
31538
|
1359 patched instead (some commands, such as `diff-goto-source' can change
|
|
|
1360 the value of this variable when given an appropriate prefix argument).
|
|
|
1361
|
|
32063
|
1362 With a prefix argument, REVERSE the hunk."
|
|
31817
|
1363 (interactive "P")
|
|
|
1364 (destructuring-bind (buf line-offset pos old new &optional switched)
|
|
54528
|
1365 ;; If REVERSE go to the new file, otherwise go to the old.
|
|
|
1366 (diff-find-source-location (not reverse) reverse)
|
|
31817
|
1367 (cond
|
|
32063
|
1368 ((null line-offset)
|
|
|
1369 (error "Can't find the text to patch"))
|
|
72813
|
1370 ((with-current-buffer buf
|
|
|
1371 (and buffer-file-name
|
|
|
1372 (backup-file-name-p buffer-file-name)
|
|
|
1373 (not diff-apply-hunk-to-backup-file)
|
|
|
1374 (not (set (make-local-variable 'diff-apply-hunk-to-backup-file)
|
|
|
1375 (yes-or-no-p (format "Really apply this hunk to %s? "
|
|
|
1376 (file-name-nondirectory
|
|
|
1377 buffer-file-name)))))))
|
|
76453
|
1378 (error "%s"
|
|
|
1379 (substitute-command-keys
|
|
72813
|
1380 (format "Use %s\\[diff-apply-hunk] to apply it to the other file"
|
|
|
1381 (if (not reverse) "\\[universal-argument] ")))))
|
|
31817
|
1382 ((and switched
|
35526
b40a6cecc4d5
(diff-mode): Disable preliminary support for `compile'.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1383 ;; A reversed patch was detected, perhaps apply it in reverse.
|
|
31817
|
1384 (not (save-window-excursion
|
|
|
1385 (pop-to-buffer buf)
|
|
41526
|
1386 (goto-char (+ (car pos) (cdr old)))
|
|
31817
|
1387 (y-or-n-p
|
|
|
1388 (if reverse
|
|
|
1389 "Hunk hasn't been applied yet; apply it now? "
|
|
|
1390 "Hunk has already been applied; undo it? ")))))
|
|
32063
|
1391 (message "(Nothing done)"))
|
|
31817
|
1392 (t
|
|
32063
|
1393 ;; Apply the hunk
|
|
|
1394 (with-current-buffer buf
|
|
41526
|
1395 (goto-char (car pos))
|
|
|
1396 (delete-region (car pos) (cdr pos))
|
|
32063
|
1397 (insert (car new)))
|
|
|
1398 ;; Display BUF in a window
|
|
41526
|
1399 (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))
|
|
32063
|
1400 (diff-hunk-status-msg line-offset (diff-xor switched reverse) nil)
|
|
|
1401 (when diff-advance-after-apply-hunk
|
|
|
1402 (diff-hunk-next))))))
|
|
31538
|
1403
|
|
31684
|
1404
|
|
31817
|
1405 (defun diff-test-hunk (&optional reverse)
|
|
|
1406 "See whether it's possible to apply the current hunk.
|
|
32063
|
1407 With a prefix argument, try to REVERSE the hunk."
|
|
31817
|
1408 (interactive "P")
|
|
|
1409 (destructuring-bind (buf line-offset pos src dst &optional switched)
|
|
54528
|
1410 ;; If REVERSE go to the new file, otherwise go to the old.
|
|
|
1411 (diff-find-source-location (not reverse) reverse)
|
|
41526
|
1412 (set-window-point (display-buffer buf) (+ (car pos) (cdr src)))
|
|
32063
|
1413 (diff-hunk-status-msg line-offset (diff-xor reverse switched) t)))
|
|
31538
|
1414
|
|
|
1415
|
|
54869
|
1416 (defalias 'diff-mouse-goto-source 'diff-goto-source)
|
|
|
1417
|
|
|
1418 (defun diff-goto-source (&optional other-file event)
|
|
31538
|
1419 "Jump to the corresponding source line.
|
|
37866
|
1420 `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>
diff
changeset
|
1421 is given) determines whether to jump to the old or the new file.
|
|
31538
|
1422 If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument])
|
|
70542
|
1423 then `diff-jump-to-old-file' is also set, for the next invocations."
|
|
54869
|
1424 (interactive (list current-prefix-arg last-input-event))
|
|
32111
|
1425 ;; When pointing at a removal line, we probably want to jump to
|
|
|
1426 ;; the old location, and else to the new (i.e. as if reverting).
|
|
|
1427 ;; This is a convenient detail when using smerge-diff.
|
|
54869
|
1428 (if event (posn-set-point (event-end event)))
|
|
32111
|
1429 (let ((rev (not (save-excursion (beginning-of-line) (looking-at "[-<]")))))
|
|
|
1430 (destructuring-bind (buf line-offset pos src dst &optional switched)
|
|
|
1431 (diff-find-source-location other-file rev)
|
|
|
1432 (pop-to-buffer buf)
|
|
41526
|
1433 (goto-char (+ (car pos) (cdr src)))
|
|
32143
|
1434 (diff-hunk-status-msg line-offset (diff-xor rev switched) t))))
|
|
31817
|
1435
|
|
31786
|
1436
|
31795
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1437 (defun diff-current-defun ()
|
|
31817
|
1438 "Find the name of function at point.
|
|
|
1439 For use in `add-log-current-defun-function'."
|
|
56073
|
1440 (save-excursion
|
|
|
1441 (when (looking-at diff-hunk-header-re)
|
|
|
1442 (forward-line 1)
|
|
57418
|
1443 (re-search-forward "^[^ ]" nil t))
|
|
56073
|
1444 (destructuring-bind (buf line-offset pos src dst &optional switched)
|
|
|
1445 (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>
diff
changeset
|
1446 (beginning-of-line)
|
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1447 (or (when (memq (char-after) '(?< ?-))
|
|
31817
|
1448 ;; Cursor is pointing at removed text. This could be a removed
|
|
|
1449 ;; function, in which case, going to the source buffer will
|
|
|
1450 ;; not help since the function is now removed. Instead,
|
|
|
1451 ;; 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>
diff
changeset
|
1452 (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>
diff
changeset
|
1453 (with-temp-buffer
|
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1454 (insert (car old))
|
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1455 (funcall (with-current-buffer buf major-mode))
|
|
46407
|
1456 (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>
diff
changeset
|
1457 (add-log-current-defun))))
|
868648c4a36b
* diff-mode.el (diff-add-log-file-name, diff-current-defun): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1458 (with-current-buffer buf
|
|
41526
|
1459 (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>
diff
changeset
|
1460 (add-log-current-defun))))))
|
|
30873
|
1461
|
|
54528
|
1462 (defun diff-refine-hunk ()
|
|
|
1463 "Refine the current hunk by ignoring space differences."
|
|
|
1464 (interactive)
|
|
|
1465 (let* ((char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
|
|
|
1466 (opts (case (char-after) (?@ "-bu") (?* "-bc") (t "-b")))
|
|
|
1467 (line-nb (and (or (looking-at "[^0-9]+\\([0-9]+\\)")
|
|
|
1468 (error "Can't find line number"))
|
|
|
1469 (string-to-number (match-string 1))))
|
|
|
1470 (hunk (delete-and-extract-region
|
|
|
1471 (point) (save-excursion (diff-end-of-hunk) (point))))
|
|
|
1472 (lead (make-string (1- line-nb) ?\n)) ;Line nums start at 1.
|
|
|
1473 (file1 (make-temp-file "diff1"))
|
|
|
1474 (file2 (make-temp-file "diff2"))
|
|
|
1475 (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>
diff
changeset
|
1476 (inhibit-read-only t)
|
|
54528
|
1477 old new)
|
|
|
1478 (unwind-protect
|
|
|
1479 (save-excursion
|
|
|
1480 (setq old (diff-hunk-text hunk nil char-offset))
|
|
|
1481 (setq new (diff-hunk-text hunk t char-offset))
|
|
|
1482 (write-region (concat lead (car old)) nil file1 nil 'nomessage)
|
|
|
1483 (write-region (concat lead (car new)) nil file2 nil 'nomessage)
|
|
|
1484 (with-temp-buffer
|
|
|
1485 (let ((status
|
|
|
1486 (call-process diff-command nil t nil
|
|
|
1487 opts file1 file2)))
|
|
|
1488 (case status
|
|
|
1489 (0 nil) ;Nothing to reformat.
|
|
|
1490 (1 (goto-char (point-min))
|
|
|
1491 ;; Remove the file-header.
|
|
|
1492 (when (re-search-forward diff-hunk-header-re nil t)
|
|
|
1493 (delete-region (point-min) (match-beginning 0))))
|
|
|
1494 (t (goto-char (point-max))
|
|
|
1495 (unless (bolp) (insert "\n"))
|
|
|
1496 (insert hunk)))
|
|
|
1497 (setq hunk (buffer-string))
|
|
|
1498 (unless (memq status '(0 1))
|
|
|
1499 (error "Diff returned: %s" status)))))
|
|
|
1500 ;; Whatever happens, put back some equivalent text: either the new
|
|
|
1501 ;; one or the original one in case some error happened.
|
|
|
1502 (insert hunk)
|
|
|
1503 (delete-file file1)
|
|
|
1504 (delete-file file2))))
|
|
|
1505
|
25959
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1506 ;; provide the package
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1507 (provide 'diff-mode)
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1508
|
|
30873
|
1509 ;;; 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
|
1510 ;; 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
|
1511 ;; (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
|
1512 ;; (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
|
1513 ;; (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
|
1514 ;; 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
|
1515 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1516 ;; 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
|
1517 ;; 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
|
1518 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1519 ;; 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
|
1520 ;; - added basic `compile' support.
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1521 ;; - 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
|
1522 ;; - 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
|
1523 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1524 ;; 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
|
1525 ;; - 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
|
1526 ;; - accept diffs using -T
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1527 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1528 ;; 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
|
1529 ;; interface to ediff-patch
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1530 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1531 ;; 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
|
1532 ;; (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
|
1533 ;; (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
|
1534 ;; (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
|
1535 ;; 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
|
1536 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1537 ;; 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
|
1538 ;; (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
|
1539 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1540 ;; 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
|
1541 ;; 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
|
1542 ;;
|
1c62cbeca833
Initial revision, known outside of Emacs as version 1.8.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1543
|
|
57418
|
1544 ;; 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
|
1545 ;;; diff-mode.el ends here
|
