Mercurial > emacs
annotate lisp/diff.el @ 96384:59d141ae8c74
cc-mode.el (c-mode-base-map): Don't bind C-M-[ae] to the CC Mode specific
functions; this is no longer needed, since {beginning,end}-of-defun now
pass ARG to ...-of-defun-function.
cc-defs.el (c-emacs-features): new feature 'argumentative-bod-function.
----------------------------------------------------------------------
cc-defs.el cc-mode.el CVS:
----------------------------------------------------------------------
author | Alan Mackenzie <acm@muc.de> |
---|---|
date | Fri, 27 Jun 2008 21:12:46 +0000 |
parents | ee5932bf781d |
children | 34f4c0ab1342 |
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 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, |
79721 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
894 | 5 |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
38414
diff
changeset
|
6 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1215
diff
changeset
|
7 ;; Keywords: unix, tools |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
669
diff
changeset
|
8 |
349 | 9 ;; This file is part of GNU Emacs. |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
349 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
14 ;; (at your option) any later version. |
349 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
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 |
18143 | 32 (defgroup diff nil |
33 "Comparing files with `diff'." | |
34 :group 'tools) | |
894 | 35 |
18143 | 36 ;;;###autoload |
37 (defcustom diff-switches "-c" | |
55255
3654c6b288e0
(diff-switches): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55117
diff
changeset
|
38 "*A string or list of strings specifying switches to be passed to diff." |
18143 | 39 :type '(choice string (repeat string)) |
40 :group 'diff) | |
41 | |
42 ;;;###autoload | |
43 (defcustom diff-command "diff" | |
44 "*The command to use to run diff." | |
18150
960597385f1c
(diff-command): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18143
diff
changeset
|
45 :type 'string |
18143 | 46 :group 'diff) |
9736
093d80b4ae17
(diff-command): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8195
diff
changeset
|
47 |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
48 (defvar diff-old-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
49 "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
|
50 (defvar diff-new-temp-file nil |
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
51 "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
|
52 |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
53 ;; prompt if prefix arg present |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
54 (defun diff-switches () |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
55 (if current-prefix-arg |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
56 (read-string "Diff switches: " |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
57 (if (stringp diff-switches) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
58 diff-switches |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
59 (mapconcat 'identity diff-switches " "))))) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
60 |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
61 (defun diff-sentinel (code) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
62 "Code run when the diff process exits. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
63 CODE is the exit code of the process. It should be 0 only if no diffs |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
64 were found." |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
65 (if diff-old-temp-file (delete-file diff-old-temp-file)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
66 (if diff-new-temp-file (delete-file diff-new-temp-file)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
67 (save-excursion |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
68 (goto-char (point-max)) |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
69 (let ((inhibit-read-only t)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
70 (insert (format "\nDiff finished%s. %s\n" |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
71 (if (equal 0 code) " (no differences)" "") |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
72 (current-time-string)))))) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
73 |
85686
a55a536ce0db
* emulation/pc-select.el (next-line-mark, next-line-nomark)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
74 (defvar diff-old-file nil) |
a55a536ce0db
* emulation/pc-select.el (next-line-mark, next-line-nomark)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
75 (defvar diff-new-file nil) |
a55a536ce0db
* emulation/pc-select.el (next-line-mark, next-line-nomark)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
76 (defvar diff-extra-args nil) |
a55a536ce0db
* emulation/pc-select.el (next-line-mark, next-line-nomark)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
77 |
349 | 78 ;;;###autoload |
47301
bac8aaf18835
(diff): Add optional argument no-async, and use the above argument.
Colin Walters <walters@gnu.org>
parents:
45472
diff
changeset
|
79 (defun diff (old new &optional switches no-async) |
349 | 80 "Find and display the differences between OLD and NEW files. |
4759 | 81 Interactively the current buffer's file name is the default for NEW |
894 | 82 and a backup file for NEW is the default for OLD. |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
83 If NO-ASYNC is non-nil, call diff synchronously. |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
84 With prefix arg, prompt for diff switches." |
349 | 85 (interactive |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
86 (let (oldf newf) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
87 (setq newf (buffer-file-name) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
88 newf (if (and newf (file-exists-p newf)) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
89 (read-file-name |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
90 (concat "Diff new file (default " |
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
91 (file-name-nondirectory newf) "): ") |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
92 nil newf t) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
93 (read-file-name "Diff new file: " nil nil t))) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
94 (setq oldf (file-newest-backup newf) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
95 oldf (if (and oldf (file-exists-p oldf)) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
96 (read-file-name |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
97 (concat "Diff original file (default " |
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
64762
diff
changeset
|
98 (file-name-nondirectory oldf) "): ") |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
99 (file-name-directory oldf) oldf t) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
100 (read-file-name "Diff original file: " |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
101 (file-name-directory newf) nil t))) |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
102 (list oldf newf (diff-switches)))) |
349 | 103 (setq new (expand-file-name new) |
104 old (expand-file-name old)) | |
53917
04ab10f25d5c
(diff): Simplify code handling `switch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53916
diff
changeset
|
105 (or switches (setq switches diff-switches)) ; If not specified, use default. |
04ab10f25d5c
(diff): Simplify code handling `switch'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53916
diff
changeset
|
106 (let* ((old-alt (file-local-copy old)) |
1134
05c961416bb5
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1112
diff
changeset
|
107 (new-alt (file-local-copy new)) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
108 (command |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
109 (mapconcat 'identity |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
110 `(,diff-command |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
111 ;; Use explicitly specified switches |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
112 ,@(if (listp switches) switches (list switches)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
113 ,@(if (or old-alt new-alt) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
114 (list "-L" old "-L" new)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
115 ,(shell-quote-argument (or old-alt old)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
116 ,(shell-quote-argument (or new-alt new))) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
117 " ")) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
118 (buf (get-buffer-create "*Diff*")) |
55117
9ef081d74155
(diff): Set default-directory in diff buffer.
Andreas Schwab <schwab@suse.de>
parents:
53918
diff
changeset
|
119 (thisdir default-directory) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
120 proc) |
15932
e4d0cf418b2b
(diff): Don't pop to *diff* buffer. Change bogus
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
121 (save-excursion |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
122 (display-buffer buf) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
123 (set-buffer buf) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
124 (setq buffer-read-only nil) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
125 (buffer-disable-undo (current-buffer)) |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
126 (let ((inhibit-read-only t)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
127 (erase-buffer)) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
128 (buffer-enable-undo (current-buffer)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
129 (diff-mode) |
80857
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
130 ;; Use below 2 vars for backward-compatibility. |
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
131 (set (make-local-variable 'diff-old-file) old) |
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
132 (set (make-local-variable 'diff-new-file) new) |
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
133 (set (make-local-variable 'diff-extra-args) (list switches no-async)) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
134 (set (make-local-variable 'revert-buffer-function) |
80857
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
135 (lambda (ignore-auto noconfirm) |
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
136 (apply 'diff diff-old-file diff-new-file diff-extra-args))) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
137 (set (make-local-variable 'diff-old-temp-file) old-alt) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
138 (set (make-local-variable 'diff-new-temp-file) new-alt) |
55117
9ef081d74155
(diff): Set default-directory in diff buffer.
Andreas Schwab <schwab@suse.de>
parents:
53918
diff
changeset
|
139 (setq default-directory thisdir) |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
140 (let ((inhibit-read-only t)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
141 (insert command "\n")) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
142 (if (and (not no-async) (fboundp 'start-process)) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
143 (progn |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
144 (setq proc (start-process "Diff" buf shell-file-name |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
145 shell-command-switch command)) |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
146 (set-process-filter proc 'diff-process-filter) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
147 (set-process-sentinel |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
148 proc (lambda (proc msg) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
149 (with-current-buffer (process-buffer proc) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
150 (diff-sentinel (process-exit-status proc)))))) |
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
151 ;; Async processes aren't available. |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
152 (let ((inhibit-read-only t)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
153 (diff-sentinel |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
154 (call-process shell-file-name nil buf nil |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
155 shell-command-switch command))))) |
53918
3619e67b00f4
Don't use compile any more, use diff-mode instead.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53917
diff
changeset
|
156 buf)) |
474 | 157 |
71248
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
158 (defun diff-process-filter (proc string) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
159 (with-current-buffer (process-buffer proc) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
160 (let ((moving (= (point) (process-mark proc)))) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
161 (save-excursion |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
162 ;; Insert the text, advancing the process marker. |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
163 (goto-char (process-mark proc)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
164 (let ((inhibit-read-only t)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
165 (insert string)) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
166 (set-marker (process-mark proc) (point))) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
167 (if moving (goto-char (process-mark proc)))))) |
3071d2ae4624
* diff-mode.el (diff-mode): Set buffer-read-only to t when
Chong Yidong <cyd@stupidchicken.com>
parents:
68651
diff
changeset
|
168 |
894 | 169 ;;;###autoload |
170 (defun diff-backup (file &optional switches) | |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
171 "Diff this file with its backup file or vice versa. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
172 Uses the latest backup, if there are several numerical backups. |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
173 If this file is a backup, diff it with its original. |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
174 The backup file is the first file given to `diff'. |
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
175 With prefix arg, prompt for diff switches." |
894 | 176 (interactive (list (read-file-name "Diff (file with backup): ") |
53914
0ceb9e9ae2b0
(diff-switches): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52894
diff
changeset
|
177 (diff-switches))) |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
178 (let (bak ori) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
179 (if (backup-file-name-p file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
180 (setq bak file |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
181 ori (file-name-sans-versions file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
182 (setq bak (or (diff-latest-backup-file file) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
183 (error "No backup found for %s" file)) |
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
184 ori file)) |
894 | 185 (diff bak ori switches))) |
474 | 186 |
881
945558e05127
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
187 (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
|
188 "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
|
189 (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
|
190 (if handler |
6321
8c667dc4566e
(diff-latest-backup-file): Call file name handler properly.
Richard M. Stallman <rms@gnu.org>
parents:
6147
diff
changeset
|
191 (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
|
192 (file-newest-backup fn)))) |
474 | 193 |
2541
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
194 (provide 'diff) |
09e58f572f19
(diff-parse-differences): Small robustification --- don't lose if we
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2307
diff
changeset
|
195 |
80857
b8d11546ac61
(diff): Use buffer-local vars diff-old-file and diff-new-file
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
196 ;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
474
diff
changeset
|
197 ;;; diff.el ends here |