Mercurial > emacs
annotate lisp/diff.el @ 17886:9129ede641f3
Fix typo in previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 19 May 1997 07:29:00 +0000 |
parents | 442b07348a34 |
children | 3584a8182767 |
rev | line source |
---|---|
894 | 1 ;;; diff.el --- Run `diff' in compilation-mode. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
2 |
14140
db5e78740d5c
(diff): Fix local compilation-exit-message-function to take the proper
Roland McGrath <roland@gnu.org>
parents:
14106
diff
changeset
|
3 ;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. |
894 | 4 |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1215
diff
changeset
|
5 ;; Keywords: unix, tools |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
6 |
349 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
11 ;; the Free Software Foundation; either version 2, or (at your option) |
349 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
349 | 23 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
24 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 ;; This package helps you explore differences between files, using the |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 ;; UNIX command diff(1). The commands are `diff' and `diff-backup'. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 ;; You can specify options with `diff-switches'. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
29 |
894 | 30 ;;; Code: |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
31 |
894 | 32 (require 'compile) |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
33 |
2704 | 34 ;;; This is duplicated in vc.el. |
1179 | 35 (defvar diff-switches "-c" |
894 | 36 "*A string or list of strings specifying switches to be be passed to diff.") |
37 | |
9736
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
38 (defvar diff-command "diff" |
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
39 "*The command to use to run diff.") |
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
40 |
894 | 41 (defvar diff-regexp-alist |
42 '( | |
43 ;; -u format: @@ -OLDSTART,OLDEND +NEWSTART,NEWEND @@ | |
44 ("^@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@$" 1 2) | |
14140
db5e78740d5c
(diff): Fix local compilation-exit-message-function to take the proper
Roland McGrath <roland@gnu.org>
parents:
14106
diff
changeset
|
45 |
894 | 46 ;; -c format: *** OLDSTART,OLDEND **** |
47 ("^\\*\\*\\* \\([0-9]+\\),[0-9]+ \\*\\*\\*\\*$" 1 nil) | |
48 ;; --- NEWSTART,NEWEND ---- | |
49 ("^--- \\([0-9]+\\),[0-9]+ ----$" nil 1) | |
50 | |
51 ;; plain diff format: OLDSTART[,OLDEND]{a,d,c}NEWSTART[,NEWEND] | |
52 ("^\\([0-9]+\\)\\(,[0-9]+\\)?[adc]\\([0-9]+\\)\\(,[0-9]+\\)?$" 1 3) | |
53 | |
54 ;; -e (ed) format: OLDSTART[,OLDEND]{a,d,c} | |
55 ("^\\([0-9]+\\)\\(,[0-9]+\\)?[adc]$" 1) | |
349 | 56 |
894 | 57 ;; -f format: {a,d,c}OLDSTART[ OLDEND] |
58 ;; -n format: {a,d,c}OLDSTART LINES-CHANGED | |
59 ("^[adc]\\([0-9]+\\)\\( [0-9]+\\)?$" 1) | |
60 ) | |
14140
db5e78740d5c
(diff): Fix local compilation-exit-message-function to take the proper
Roland McGrath <roland@gnu.org>
parents:
14106
diff
changeset
|
61 "Alist (REGEXP OLD-IDX NEW-IDX) of regular expressions to match difference |
894 | 62 sections in \\[diff] output. If REGEXP matches, the OLD-IDX'th |
63 subexpression gives the line number in the old file, and NEW-IDX'th | |
64 subexpression gives the line number in the new file. If OLD-IDX or NEW-IDX | |
65 is nil, REGEXP matches only half a section.") | |
349 | 66 |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
67 (defvar diff-old-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
68 "This is the old file name in the comparison in this buffer.") |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
69 (defvar diff-new-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
70 "This is the new file name in the comparison in this buffer.") |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
71 (defvar diff-old-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
72 "This is the name of a temp file to be deleted after diff finishes.") |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
73 (defvar diff-new-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
74 "This is the name of a temp file to be deleted after diff finishes.") |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
75 |
894 | 76 ;; See compilation-parse-errors-function (compile.el). |
907 | 77 (defun diff-parse-differences (limit-search find-at-least) |
894 | 78 (setq compilation-error-list nil) |
79 (message "Parsing differences...") | |
80 | |
81 ;; Don't reparse diffs already seen at last parse. | |
2541
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
82 (if compilation-parsing-end (goto-char compilation-parsing-end)) |
474 | 83 |
894 | 84 ;; Construct in REGEXP a regexp composed of all those in dired-regexp-alist. |
85 (let ((regexp (mapconcat (lambda (elt) | |
86 (concat "\\(" (car elt) "\\)")) | |
87 diff-regexp-alist | |
88 "\\|")) | |
89 ;; (GROUP-IDX OLD-IDX NEW-IDX) | |
90 (groups (let ((subexpr 1)) | |
91 (mapcar (lambda (elt) | |
92 (prog1 | |
93 (cons subexpr | |
94 (mapcar (lambda (n) | |
95 (and n | |
96 (+ subexpr n))) | |
97 (cdr elt))) | |
98 (setq subexpr (+ subexpr 1 | |
99 (count-regexp-groupings | |
100 (car elt)))))) | |
101 diff-regexp-alist))) | |
102 | |
103 (new-error | |
104 (function (lambda (file subexpr) | |
105 (setq compilation-error-list | |
106 (cons | |
1179 | 107 (cons (save-excursion |
108 ;; Report location of message | |
109 ;; at beginning of line. | |
110 (goto-char | |
111 (match-beginning subexpr)) | |
112 (beginning-of-line) | |
113 (point-marker)) | |
114 ;; Report location of corresponding text. | |
894 | 115 (let ((line (string-to-int |
116 (buffer-substring | |
117 (match-beginning subexpr) | |
118 (match-end subexpr))))) | |
119 (save-excursion | |
3874
0a694f8e1730
* diff.el (diff-parse-differences): Preserve the match data
Jim Blandy <jimb@redhat.com>
parents:
3429
diff
changeset
|
120 (save-match-data |
0a694f8e1730
* diff.el (diff-parse-differences): Preserve the match data
Jim Blandy <jimb@redhat.com>
parents:
3429
diff
changeset
|
121 (set-buffer (find-file-noselect file))) |
894 | 122 (save-excursion |
123 (goto-line line) | |
124 (point-marker))))) | |
125 compilation-error-list))))) | |
126 | |
127 (found-desired nil) | |
1215
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
128 (num-loci-found 0) |
894 | 129 g) |
130 | |
131 (while (and (not found-desired) | |
132 ;; We don't just pass LIMIT-SEARCH to re-search-forward | |
133 ;; because we want to find matches containing LIMIT-SEARCH | |
134 ;; but which extend past it. | |
135 (re-search-forward regexp nil t)) | |
136 | |
137 ;; Find which individual regexp matched. | |
138 (setq g groups) | |
139 (while (and g (null (match-beginning (car (car g))))) | |
140 (setq g (cdr g))) | |
141 (setq g (car g)) | |
142 | |
143 (if (nth 1 g) ;OLD-IDX | |
144 (funcall new-error diff-old-file (nth 1 g))) | |
145 (if (nth 2 g) ;NEW-IDX | |
146 (funcall new-error diff-new-file (nth 2 g))) | |
147 | |
1215
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
148 (setq num-loci-found (1+ num-loci-found)) |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
149 (if (or (and find-at-least |
1215
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
150 (>= num-loci-found find-at-least)) |
907 | 151 (and limit-search (>= (point) limit-search))) |
1215
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
152 ;; We have found as many new loci as the user wants, |
907 | 153 ;; or the user wanted a specific diff, and we're past it. |
154 (setq found-desired t))) | |
894 | 155 (if found-desired |
156 (setq compilation-parsing-end (point)) | |
157 ;; Set to point-max, not point, so we don't perpetually | |
158 ;; parse the last bit of text when it isn't a diff header. | |
1215
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
159 (setq compilation-parsing-end (point-max))) |
92554bb95d51
(diff): Don't print echo area message.
Richard M. Stallman <rms@gnu.org>
parents:
1179
diff
changeset
|
160 (message "Parsing differences...done")) |
894 | 161 (setq compilation-error-list (nreverse compilation-error-list))) |
349 | 162 |
16984
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
163 (defun diff-process-setup () |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
164 "Set up \`compilation-exit-message-function' for \`diff'." |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
165 ;; Avoid frightening people with "abnormally terminated" |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
166 ;; if diff finds differences. |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
167 (set (make-local-variable 'compilation-exit-message-function) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
168 (lambda (status code msg) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
169 (cond ((not (eq status 'exit)) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
170 (cons msg code)) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
171 ((zerop code) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
172 '("finished (no differences)\n" . "no differences")) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
173 ((= code 1) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
174 '("finished\n" . "differences found")) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
175 (t |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
176 (cons msg code)))))) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
177 |
349 | 178 ;;;###autoload |
894 | 179 (defun diff (old new &optional switches) |
349 | 180 "Find and display the differences between OLD and NEW files. |
4759 | 181 Interactively the current buffer's file name is the default for NEW |
894 | 182 and a backup file for NEW is the default for OLD. |
183 With prefix arg, prompt for diff switches." | |
349 | 184 (interactive |
894 | 185 (nconc |
186 (let (oldf newf) | |
187 (nreverse | |
188 (list | |
189 (setq newf (buffer-file-name) | |
190 newf (if (and newf (file-exists-p newf)) | |
191 (read-file-name | |
192 (concat "Diff new file: (" | |
193 (file-name-nondirectory newf) ") ") | |
194 nil newf t) | |
195 (read-file-name "Diff new file: " nil nil t))) | |
196 (setq oldf (file-newest-backup newf) | |
197 oldf (if (and oldf (file-exists-p oldf)) | |
198 (read-file-name | |
199 (concat "Diff original file: (" | |
200 (file-name-nondirectory oldf) ") ") | |
201 (file-name-directory oldf) oldf t) | |
202 (read-file-name "Diff original file: " | |
203 (file-name-directory newf) nil t)))))) | |
204 (if current-prefix-arg | |
205 (list (read-string "Diff switches: " | |
206 (if (stringp diff-switches) | |
207 diff-switches | |
208 (mapconcat 'identity diff-switches " ")))) | |
209 nil))) | |
349 | 210 (setq new (expand-file-name new) |
211 old (expand-file-name old)) | |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
212 (let ((old-alt (file-local-copy old)) |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
213 (new-alt (file-local-copy new)) |
1110
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
214 buf) |
15932
e4d0cf418b2b
(diff): Don't pop to *diff* buffer. Change bogus
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
215 (save-excursion |
16984
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
216 (let ((compilation-process-setup-function 'diff-process-setup) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
217 (command |
1110
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
218 (mapconcat 'identity |
9736
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
219 (append (list diff-command) |
3429
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
220 ;; Use explicitly specified switches |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
221 (if switches |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
222 (if (consp switches) |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
223 switches (list switches)) |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
224 ;; If not specified, use default. |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
225 (if (consp diff-switches) |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
226 diff-switches |
5c0a40a8a55d
(diff): Really do use arg SWITCHES.
Richard M. Stallman <rms@gnu.org>
parents:
2704
diff
changeset
|
227 (list diff-switches))) |
1110
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
228 (if (or old-alt new-alt) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
229 (list "-L" old "-L" new)) |
5386
a91748bee657
(diff): Call shell-quote-argument.
Richard M. Stallman <rms@gnu.org>
parents:
4759
diff
changeset
|
230 (list |
a91748bee657
(diff): Call shell-quote-argument.
Richard M. Stallman <rms@gnu.org>
parents:
4759
diff
changeset
|
231 (shell-quote-argument (or old-alt old))) |
a91748bee657
(diff): Call shell-quote-argument.
Richard M. Stallman <rms@gnu.org>
parents:
4759
diff
changeset
|
232 (list |
a91748bee657
(diff): Call shell-quote-argument.
Richard M. Stallman <rms@gnu.org>
parents:
4759
diff
changeset
|
233 (shell-quote-argument (or new-alt new)))) |
1110
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
234 " "))) |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
235 (setq buf |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
236 (compile-internal command |
f165d900e06e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
907
diff
changeset
|
237 "No more differences" "Diff" |
1112 | 238 'diff-parse-differences)) |
15932
e4d0cf418b2b
(diff): Don't pop to *diff* buffer. Change bogus
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
239 (set-buffer buf) |
5542
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
240 (set (make-local-variable 'diff-old-file) old) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
241 (set (make-local-variable 'diff-new-file) new) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
242 (set (make-local-variable 'diff-old-temp-file) old-alt) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
243 (set (make-local-variable 'diff-new-temp-file) new-alt) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
244 (set (make-local-variable 'compilation-finish-function) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
245 (function (lambda (buff msg) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
246 (if diff-old-temp-file |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
247 (delete-file diff-old-temp-file)) |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
248 (if diff-new-temp-file |
004856d1b311
(diff): Select the differences buffer.
Richard M. Stallman <rms@gnu.org>
parents:
5541
diff
changeset
|
249 (delete-file diff-new-temp-file))))) |
16984
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
250 ;; When async processes aren't available, the compilation finish |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
251 ;; function doesn't get chance to run. Invoke it by hand. |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
252 (or (fboundp 'start-process) |
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
253 (funcall compilation-finish-function nil nil)) |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
254 buf)))) |
474 | 255 |
894 | 256 ;;;###autoload |
257 (defun diff-backup (file &optional switches) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
258 "Diff this file with its backup file or vice versa. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
259 Uses the latest backup, if there are several numerical backups. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
260 If this file is a backup, diff it with its original. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
261 The backup file is the first file given to `diff'." |
894 | 262 (interactive (list (read-file-name "Diff (file with backup): ") |
263 (if current-prefix-arg | |
264 (read-string "Diff switches: " | |
265 (if (stringp diff-switches) | |
266 diff-switches | |
267 (mapconcat 'identity | |
268 diff-switches " "))) | |
269 nil))) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
270 (let (bak ori) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
271 (if (backup-file-name-p file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
272 (setq bak file |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
273 ori (file-name-sans-versions file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
274 (setq bak (or (diff-latest-backup-file file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
275 (error "No backup found for %s" file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
276 ori file)) |
894 | 277 (diff bak ori switches))) |
474 | 278 |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
279 (defun diff-latest-backup-file (fn) ; actually belongs into files.el |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
280 "Return the latest existing backup of FILE, or nil." |
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6321
diff
changeset
|
281 (let ((handler (find-file-name-handler fn 'diff-latest-backup-file))) |
6147
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
282 (if handler |
6321
8c667dc4566e
(diff-latest-backup-file): Call file name handler properly.
Richard M. Stallman <rms@gnu.org>
parents:
6147
diff
changeset
|
283 (funcall handler 'diff-latest-backup-file fn) |
6147
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
284 ;; First try simple backup, then the highest numbered of the |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
285 ;; numbered backups. |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
286 ;; Ignore the value of version-control because we look for existing |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
287 ;; backups, which maybe were made earlier or by another user with |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
288 ;; a different value of version-control. |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
289 (setq fn (file-chase-links (expand-file-name fn))) |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
290 (or |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
291 (let ((bak (make-backup-file-name fn))) |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
292 (if (file-exists-p bak) bak)) |
8195
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
293 ;; We use BACKUPNAME to cope with backups stored in a different dir. |
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
294 (let* ((backupname (car (find-backup-file-name fn))) |
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
295 (dir (file-name-directory backupname)) |
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
296 (base-versions (concat (file-name-sans-versions |
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
297 (file-name-nondirectory backupname)) |
a4f0f421752e
(diff-latest-backup-file): Cope with backups stored
Richard M. Stallman <rms@gnu.org>
parents:
7028
diff
changeset
|
298 ".~")) |
17732
442b07348a34
(diff-latest-backup-file):
Richard M. Stallman <rms@gnu.org>
parents:
16984
diff
changeset
|
299 ;; This is a fluid var for backup-extract-version. |
442b07348a34
(diff-latest-backup-file):
Richard M. Stallman <rms@gnu.org>
parents:
16984
diff
changeset
|
300 (backup-extract-version-start (length base-versions))) |
6147
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
301 (concat dir |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
302 (car (sort |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
303 (file-name-all-completions base-versions dir) |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
304 (function |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
305 (lambda (fn1 fn2) |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
306 (> (backup-extract-version fn1) |
f89879182407
(diff-latest-backup-file): Check for a file-name-handler and run it.
Roland McGrath <roland@gnu.org>
parents:
5542
diff
changeset
|
307 (backup-extract-version fn2)))))))))))) |
474 | 308 |
2541
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
309 (provide 'diff) |
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
310 |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
474
diff
changeset
|
311 ;;; diff.el ends here |