Mercurial > emacs
annotate lisp/diff.el @ 89910:548375b6b1f8
Update unicode branch
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Apr 2004 07:01:43 +0000 |
parents | 68c22ea6027c |
children | 4c90ffeb71c5 |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
25413
diff
changeset
|
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 |
89909 | 3 ;; Copyright (C) 1992, 1994, 1996, 2001, 2004 Free Software Foundation, Inc. |
894 | 4 |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
38414
diff
changeset
|
5 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1215
diff
changeset
|
6 ;; Keywords: unix, tools |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
7 |
349 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; 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
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
349 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
349 | 24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 ;; 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
|
28 ;; 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
|
29 ;; You can specify options with `diff-switches'. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
30 |
894 | 31 ;;; Code: |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
32 |
18143 | 33 (defgroup diff nil |
34 "Comparing files with `diff'." | |
35 :group 'tools) | |
894 | 36 |
18143 | 37 ;;;###autoload |
38 (defcustom diff-switches "-c" | |
39 "*A string or list of strings specifying switches to be be passed to diff." | |
40 :type '(choice string (repeat string)) | |
41 :group 'diff) | |
42 | |
43 ;;;###autoload | |
44 (defcustom diff-command "diff" | |
45 "*The command to use to run diff." | |
18150
960597385f1c
(diff-command): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18143
diff
changeset
|
46 :type 'string |
18143 | 47 :group 'diff) |
9736
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
48 |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
49 (defvar diff-old-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
50 "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
|
51 (defvar diff-new-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
52 "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
|
53 |
89909 | 54 ;; prompt if prefix arg present |
55 (defun diff-switches () | |
56 (if current-prefix-arg | |
57 (read-string "Diff switches: " | |
58 (if (stringp diff-switches) | |
59 diff-switches | |
60 (mapconcat 'identity diff-switches " "))))) | |
894 | 61 |
89909 | 62 (defun diff-sentinel (code) |
63 "Code run when the diff process exits. | |
64 CODE is the exit code of the process. It should be 0 iff no diffs were found." | |
65 (if diff-old-temp-file (delete-file diff-old-temp-file)) | |
66 (if diff-new-temp-file (delete-file diff-new-temp-file)) | |
67 (save-excursion | |
68 (goto-char (point-max)) | |
69 (insert (format "\nDiff finished%s. %s\n" | |
70 (if (equal 0 code) " (no differences)" "") | |
71 (current-time-string))))) | |
16984
100ef50c2c01
* (diff-process-setup): New function, sets up the
Eli Zaretskii <eliz@gnu.org>
parents:
15932
diff
changeset
|
72 |
349 | 73 ;;;###autoload |
47301
bac8aaf18835
(diff): Add optional argument no-async, and use the above argument.
Colin Walters <walters@gnu.org>
parents:
45472
diff
changeset
|
74 (defun diff (old new &optional switches no-async) |
349 | 75 "Find and display the differences between OLD and NEW files. |
4759 | 76 Interactively the current buffer's file name is the default for NEW |
894 | 77 and a backup file for NEW is the default for OLD. |
89909 | 78 If NO-ASYNC is non-nil, call diff synchronously. |
79 With prefix arg, prompt for diff switches." | |
349 | 80 (interactive |
89909 | 81 (let (oldf newf) |
82 (setq newf (buffer-file-name) | |
83 newf (if (and newf (file-exists-p newf)) | |
84 (read-file-name | |
85 (concat "Diff new file: (default " | |
86 (file-name-nondirectory newf) ") ") | |
87 nil newf t) | |
88 (read-file-name "Diff new file: " nil nil t))) | |
89 (setq oldf (file-newest-backup newf) | |
90 oldf (if (and oldf (file-exists-p oldf)) | |
91 (read-file-name | |
92 (concat "Diff original file: (default " | |
93 (file-name-nondirectory oldf) ") ") | |
94 (file-name-directory oldf) oldf t) | |
95 (read-file-name "Diff original file: " | |
96 (file-name-directory newf) nil t))) | |
97 (list oldf newf (diff-switches)))) | |
349 | 98 (setq new (expand-file-name new) |
99 old (expand-file-name old)) | |
89909 | 100 (or switches (setq switches diff-switches)) ; If not specified, use default. |
101 (let* ((old-alt (file-local-copy old)) | |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
102 (new-alt (file-local-copy new)) |
89909 | 103 (command |
104 (mapconcat 'identity | |
105 `(,diff-command | |
106 ;; Use explicitly specified switches | |
107 ,@(if (listp switches) switches (list switches)) | |
108 ,@(if (or old-alt new-alt) | |
109 (list "-L" old "-L" new)) | |
110 ,(shell-quote-argument (or old-alt old)) | |
111 ,(shell-quote-argument (or new-alt new))) | |
112 " ")) | |
113 (buf (get-buffer-create "*Diff*")) | |
114 proc) | |
15932
e4d0cf418b2b
(diff): Don't pop to *diff* buffer. Change bogus
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
115 (save-excursion |
89909 | 116 (display-buffer buf) |
117 (set-buffer buf) | |
118 (setq buffer-read-only nil) | |
119 (buffer-disable-undo (current-buffer)) | |
120 (erase-buffer) | |
121 (buffer-enable-undo (current-buffer)) | |
122 (diff-mode) | |
123 (set (make-local-variable 'revert-buffer-function) | |
124 `(lambda (ignore-auto noconfirm) | |
125 (diff ',old ',new ',switches ',no-async))) | |
126 (set (make-local-variable 'diff-old-temp-file) old-alt) | |
127 (set (make-local-variable 'diff-new-temp-file) new-alt) | |
128 (insert command "\n") | |
129 (if (and (not no-async) (fboundp 'start-process)) | |
130 (progn | |
131 (setq proc (start-process "Diff" buf shell-file-name | |
132 shell-command-switch command)) | |
133 (set-process-sentinel | |
134 proc (lambda (proc msg) | |
135 (with-current-buffer (process-buffer proc) | |
136 (diff-sentinel (process-exit-status proc)))))) | |
137 ;; Async processes aren't available. | |
138 (diff-sentinel | |
139 (call-process shell-file-name nil buf nil | |
140 shell-command-switch command)))) | |
141 buf)) | |
474 | 142 |
894 | 143 ;;;###autoload |
144 (defun diff-backup (file &optional switches) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
145 "Diff this file with its backup file or vice versa. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
146 Uses the latest backup, if there are several numerical backups. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
147 If this file is a backup, diff it with its original. |
89909 | 148 The backup file is the first file given to `diff'. |
149 With prefix arg, prompt for diff switches." | |
894 | 150 (interactive (list (read-file-name "Diff (file with backup): ") |
89909 | 151 (diff-switches))) |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
152 (let (bak ori) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
153 (if (backup-file-name-p file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
154 (setq bak file |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
155 ori (file-name-sans-versions file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
156 (setq bak (or (diff-latest-backup-file file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
157 (error "No backup found for %s" file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
158 ori file)) |
894 | 159 (diff bak ori switches))) |
474 | 160 |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
161 (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
|
162 "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
|
163 (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
|
164 (if handler |
6321
8c667dc4566e
(diff-latest-backup-file): Call file name handler properly.
Richard M. Stallman <rms@gnu.org>
parents:
6147
diff
changeset
|
165 (funcall handler 'diff-latest-backup-file fn) |
45472
6b7dcaa53b5c
(diff-latest-backup-file): Replace the main code by a call of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
45198
diff
changeset
|
166 (file-newest-backup fn)))) |
474 | 167 |
2541
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
168 (provide 'diff) |
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
169 |
89909 | 170 ;;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
474
diff
changeset
|
171 ;;; diff.el ends here |