| blob | 97dc537cd7e3ed9ed4de05fa21ae4e2322b66a60 |
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix
10 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
11 ;; file on 20/3/2008, and the maintainer agreed that when a bug is
12 ;; filed in the Emacs bug reporting system against this file, a copy
13 ;; of the bug report be sent to the maintainer's email address.
19 ;; This file is part of GNU Emacs.
21 ;; GNU Emacs is free software: you can redistribute it and/or modify
22 ;; it under the terms of the GNU General Public License as published by
23 ;; the Free Software Foundation, either version 3 of the License, or
24 ;; (at your option) any later version.
26 ;; GNU Emacs is distributed in the hope that it will be useful,
27 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
28 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29 ;; GNU General Public License for more details.
31 ;; You should have received a copy of the GNU General Public License
32 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
34 ;;; Commentary:
36 ;; Never read that diff output again!
37 ;; Apply patch interactively!
38 ;; Merge with ease!
40 ;; This package provides a convenient way of simultaneous browsing through
41 ;; the differences between a pair (or a triple) of files or buffers. The
42 ;; files being compared, file-A, file-B, and file-C (if applicable) are
43 ;; shown in separate windows (side by side, one above the another, or in
44 ;; separate frames), and the differences are highlighted as you step
45 ;; through them. You can also copy difference regions from one buffer to
46 ;; another (and recover old differences if you change your mind).
48 ;; Ediff also supports merging operations on files and buffers, including
49 ;; merging using ancestor versions. Both comparison and merging operations can
50 ;; be performed on directories, i.e., by pairwise comparison of files in those
51 ;; directories.
53 ;; In addition, Ediff can apply a patch to a file and then let you step
54 ;; though both files, the patched and the original one, simultaneously,
55 ;; difference-by-difference. You can even apply a patch right out of a
56 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
57 ;; Since Ediff lets you copy differences between buffers, you can, in
58 ;; effect, apply patches selectively (i.e., you can copy a difference
59 ;; region from file_orig to file, thereby undoing any particular patch that
60 ;; you don't like).
62 ;; Ediff is aware of version control, which lets the user compare
63 ;; files with their older versions. Ediff can also work with remote and
64 ;; compressed files. Details are given below.
66 ;; Finally, Ediff supports directory-level comparison, merging and patching.
67 ;; See the on-line manual for details.
69 ;; This package builds upon the ideas borrowed from emerge.el and several
70 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
71 ;; Ediff provides is also influenced by emerge.el.
73 ;; The present version of Ediff supersedes Emerge. It provides a superior user
74 ;; interface and has numerous major features not found in Emerge. In
75 ;; particular, it can do patching, and 2-way and 3-way file comparison,
76 ;; merging, and directory operations.
80 ;;; Bugs:
82 ;; 1. The undo command doesn't restore deleted regions well. That is, if
83 ;; you delete all characters in a difference region and then invoke
84 ;; `undo', the reinstated text will most likely be inserted outside of
85 ;; what Ediff thinks is the current difference region. (This problem
86 ;; doesn't seem to exist with XEmacs.)
87 ;;
88 ;; If at any point you feel that difference regions are no longer correct,
89 ;; you can hit '!' to recompute the differences.
91 ;; 2. On a monochrome display, the repertoire of faces with which to
92 ;; highlight fine differences is limited. By default, Ediff is using
93 ;; underlining. However, if the region is already underlined by some other
94 ;; overlays, there is no simple way to temporarily remove that residual
95 ;; underlining. This problem occurs when a buffer is highlighted with
96 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
97 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
98 ;; provide commands for unhighlighting buffers. You can either place these
99 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
100 ;; buffer used by Ediff) or you can execute them interactively, at any time
101 ;; and on any buffer.
104 ;;; Acknowledgements:
106 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
107 ;; Ediff would not have been possible without the help and encouragement of
108 ;; its many users. See Ediff on-line Info for the full list of those who
109 ;; helped. Improved defaults in Ediff file-name reading commands.
111 ;;; Code:
115 ;; Compiler pacifier
124 ;; end pacifier
130 "A comprehensive visual interface to diff & patch."
136 "If t, Ediff will use previous directory as default when reading file name."
140 ;; Last directory used by an Ediff command for file-A.
142 ;; Last directory used by an Ediff command for file-B.
144 ;; Last directory used by an Ediff command for file-C.
146 ;; Last directory used by an Ediff command for the ancestor file.
148 ;; Last directory used by an Ediff command as the output directory for merge.
152 ;; Used as a startup hook to set `_orig' patch file read-only.
157 ;; Return a plausible default for ediff's first file:
158 ;; In dired, return the file number FILENO (or 0) in the list
159 ;; (all-selected-files, filename under the cursor), where directories are
160 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
161 ;; if the buffer is visiting a file, return that file name.
168 aux-list choices result)
177 default)))
181 ))
183 ;;; Compare files/buffers
185 ;;;###autoload
187 "Run Ediff on a pair of files, FILE-A and FILE-B."
190 ediff-last-dir-A
191 default-directory))
192 dir-B f)
194 "File A to compare"
195 dir-A
201 ediff-last-dir-B
205 'file-name-history
209 dir-B)))
211 )))
216 file-B)
217 nil ; file-C
218 startup-hooks
221 ;;;###autoload
223 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
226 ediff-last-dir-A
227 default-directory))
228 dir-B dir-C f ff)
230 "File A to compare"
231 dir-A
237 ediff-last-dir-B
241 'file-name-history
245 dir-B)))
249 ediff-last-dir-C
253 'file-name-history
257 dir-C)))
259 )))
264 file-B)
268 file-C)
269 startup-hooks
272 ;;;###autoload
277 "Visit FILE and arrange its buffer to Ediff's liking.
278 FILE-VAR is actually a variable symbol whose value must contain a true
279 file name.
280 BUFFER-NAME is a variable symbol, which will get the buffer object into
281 which FILE is read.
282 LAST-DIR is the directory variable symbol where FILE's
283 directory name should be returned. HOOKS-VAR is a variable symbol that will
284 be assigned the hook to be executed after `ediff-startup' is finished.
285 `ediff-find-file' arranges that the temp files it might create will be
286 deleted."
295 ;; some of the commands, below, require full file name
298 ;; Record the directory of the file
302 ;; Setup the buffer
308 ;;; ange-ftp-hook-function--arrange for temp file
315 ;; file processed via auto-mode-alist, a la uncompress.el
327 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
337 ;;(sit-for 0)
340 ;;(sit-for 0)
345 ;;(sit-for 0)
352 buf-B file-B
353 buf-C file-C
354 startup-hooks
356 merge-buffer-file)))
360 ;;;###autoload
363 ;;;###autoload
365 "Start ediff between current buffer and its file on disk.
366 This command can be used instead of `revert-buffer'. If there is
367 nothing to revert then this command fails."
370 revert-buffer-insert-file-contents-function
377 buffer-auto-save-file-name
382 buffer-auto-save-file-name
383 buffer-file-name))
395 ;; Assume same modes:
400 ;;;###autoload
402 "Run Ediff on FILE and its backup file.
403 Uses the latest backup, if there are several numerical backups.
404 If this file is a backup, `ediff' it with its original."
406 ;; The code is taken from `diff-backup'.
414 ori file))
417 ;;;###autoload
419 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
426 ;; realign buffers so that two visible bufs will be
427 ;; at the top
430 t))))
434 ;;;###autoload
438 ;;;###autoload
441 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
448 ;; realign buffers so that two visible
449 ;; bufs will be at the top
452 t))
455 ;; realign buffers so that three visible
456 ;; bufs will be at the top
459 t)
460 )))
464 ;;;###autoload
469 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
477 file-A file-B file-C)
503 file-C
508 startup-hooks)
510 merge-buffer-file))
519 ;;; Directory and file group operations
521 ;; Get appropriate default name for directory:
522 ;; If ediff-use-last-dir, use ediff-last-dir-A.
523 ;; In dired mode, use the directory that is under the point (if any);
524 ;; otherwise, use default-directory
530 f
531 default-directory)))
535 ;;;###autoload
537 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
538 the same name in both. The third argument, REGEXP, is nil or a regular
539 expression; only file names that match the regexp are considered."
543 f)
548 ediff-last-dir-B
554 default-regexp)
556 nil
557 'ediff-filtering-regexp-history
559 )))
562 ))
564 ;;;###autoload
568 ;;;###autoload
570 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
571 The second argument, REGEXP, is a regular expression that filters the file
572 names. Only the files that are under revision control are taken into account."
576 )
582 default-regexp)
584 nil
585 'ediff-filtering-regexp-history
587 )))
590 ))
592 ;;;###autoload
596 ;;;###autoload
598 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
599 have the same name in all three. The last argument, REGEXP, is nil or a
600 regular expression; only file names that match the regexp are considered."
605 f)
609 ediff-last-dir-B
614 ediff-last-dir-C
620 default-regexp)
622 nil
623 'ediff-filtering-regexp-history
625 )))
628 ))
630 ;;;###autoload
633 ;;;###autoload
635 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
636 the same name in both. The third argument, REGEXP, is nil or a regular
637 expression; only file names that match the regexp are considered."
641 f)
646 ediff-last-dir-B
652 default-regexp)
654 nil
655 'ediff-filtering-regexp-history
657 )))
660 nil merge-autostore-dir
661 ))
663 ;;;###autoload
666 ;;;###autoload
668 &optional
669 merge-autostore-dir)
670 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
671 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
672 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
673 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
674 only file names that match the regexp are considered."
678 f)
682 ediff-last-dir-B
687 ediff-last-dir-C
693 default-regexp)
695 nil
696 'ediff-filtering-regexp-history
698 )))
700 dir1 dir2 ancestor-dir regexp
702 nil merge-autostore-dir
703 ))
705 ;;;###autoload
708 "Run Ediff on a directory, DIR1, merging its files with their revisions.
709 The second argument, REGEXP, is a regular expression that filters the file
710 names. Only the files that are under revision control are taken into account."
714 )
720 default-regexp)
722 nil
723 'ediff-filtering-regexp-history
725 )))
728 nil merge-autostore-dir
729 ))
731 ;;;###autoload
734 ;;;###autoload
736 &optional
737 merge-autostore-dir)
738 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
739 The second argument, REGEXP, is a regular expression that filters the file
740 names. Only the files that are under revision control are taken into account."
744 )
746 "Directory to merge with revisions and ancestors:"
751 default-regexp)
753 nil
754 'ediff-filtering-regexp-history
756 )))
758 dir1 regexp 'ediff-merge-revisions-with-ancestor
759 'ediff-merge-directory-revisions-with-ancestor
760 nil merge-autostore-dir
761 ))
763 ;;;###autoload
765 'edir-merge-revisions-with-ancestor
768 ;;;###autoload
771 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
772 ;; on a pair of directories (three directories, in case of ancestor).
773 ;; The third argument, REGEXP, is nil or a regular expression;
774 ;; only file names that match the regexp are considered.
775 ;; JOBNAME is the symbol indicating the meta-job to be performed.
776 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
778 &optional startup-hooks
779 merge-autostore-dir)
795 jobname)))
797 ;; It is a structure where ediff-intersect-directories returns
798 ;; commonalities and differences among directories
799 dir-diff-struct
800 meta-buf)
807 ediff-last-merge-autostore-dir
809 nil
811 ;; verify we are not merging into an orig directory
827 jobname
828 regexp dir1 dir2 dir3 merge-autostore-dir))
830 ;; this sets various vars in the meta buffer inside
831 ;; ediff-prepare-meta-buffer
833 ;; tell what to do if the user clicks on a session record
835 ;; set ediff-dir-difference-list
838 startup-hooks))
840 'ediff-filegroup-action
842 "*Ediff Session Group Panel"
843 'ediff-redraw-directory-group-buffer
844 jobname
845 startup-hooks))
847 ))
849 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
850 ;; files
852 &optional startup-hooks
853 merge-autostore-dir)
859 jobname)))
867 ediff-last-merge-autostore-dir
869 nil
871 ;; verify merge-autostore-dir != dir1
881 jobname regexp dir1 merge-autostore-dir))
883 ;; this sets various vars in the meta buffer inside
884 ;; ediff-prepare-meta-buffer
886 ;; tell what to do if the user clicks on a session record
888 startup-hooks))
890 'ediff-filegroup-action
891 file-list
892 "*Ediff Session Group Panel"
893 'ediff-redraw-directory-group-buffer
894 jobname
895 startup-hooks))
897 ))
900 ;;; Compare regions and windows
902 ;;;###autoload
904 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
905 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
906 follows:
907 If WIND-A is nil, use selected window.
908 If WIND-B is nil, use window next to WIND-A."
913 ;;;###autoload
915 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
916 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
917 follows:
918 If WIND-A is nil, use selected window.
919 If WIND-B is nil, use window next to WIND-A."
924 ;; Compare WIND-A and WIND-B, which are selected by clicking.
925 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
926 ;; works as follows:
927 ;; If WIND-A is nil, use selected window.
928 ;; If WIND-B is nil, use window next to WIND-A.
938 beg-A end-A beg-B end-B)
952 buffer-B
956 buffer-A beg-A end-A buffer-B beg-B end-B
957 startup-hooks job-name word-mode nil)))
960 ;;;###autoload
962 "Run Ediff on a pair of regions in specified buffers.
963 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
964 This function is effective only for relatively small regions, up to 200
965 lines. For large regions, use `ediff-regions-linewise'."
972 ;; realign buffers so that two visible bufs will be
973 ;; at the top
976 t))))
987 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1000 ;;;###autoload
1002 "Run Ediff on a pair of regions in specified buffers.
1003 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
1004 Each region is enlarged to contain full lines.
1005 This function is effective for large regions, over 100-200
1006 lines. For small regions, use `ediff-regions-wordwise'."
1013 ;; realign buffers so that two visible bufs will be
1014 ;; at the top
1017 t))))
1027 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1031 ;; enlarge the region to hold full lines
1043 ;; enlarge the region to hold full lines
1058 ;; compare region beg-A to end-A of buffer-A
1059 ;; to regions beg-B -- end-B in buffer-B.
1061 startup-hooks job-name word-mode
1062 setup-parameters)
1064 overl-A overl-B
1065 file-A file-B)
1068 ;; in case beg/end-A/B aren't markers--make them into markers
1076 ;; make file-A
1082 ;; make file-B
1091 buffer-B file-B
1092 nil nil ; buffer & file C
1096 startup-hooks)
1101 setup-parameters)))
1106 ))
1109 ;;; Merge files and buffers
1111 ;;;###autoload
1116 ;; Can't remember why this is here, but it may cause the automatically merged
1117 ;; buffer to be lost. So, keep the buffer modified.
1118 ;;(ediff-with-current-buffer ediff-buffer-C
1119 ;; (set-buffer-modified-p nil))
1120 )
1122 ;;;###autoload
1124 ;; MERGE-BUFFER-FILE is the file to be
1125 ;; associated with the merge buffer
1127 "Merge two files without ancestor."
1130 ediff-last-dir-A
1131 default-directory))
1132 dir-B f)
1134 "File A to merge"
1135 dir-A
1141 ediff-last-dir-B
1145 'file-name-history
1149 dir-B)))
1151 )))
1157 file-B)
1158 nil ; file-C
1159 startup-hooks
1160 'ediff-merge-files
1161 merge-buffer-file))
1163 ;;;###autoload
1165 &optional
1166 startup-hooks
1167 ;; MERGE-BUFFER-FILE is the file
1168 ;; to be associated with the
1169 ;; merge buffer
1170 merge-buffer-file)
1171 "Merge two files with ancestor."
1174 ediff-last-dir-A
1175 default-directory))
1176 dir-B dir-ancestor f ff)
1178 "File A to merge"
1179 dir-A
1185 ediff-last-dir-B
1189 'file-name-history
1193 dir-B)))
1198 ediff-last-dir-ancestor
1202 'file-name-history
1206 dir-ancestor)))
1208 )))
1214 file-B)
1215 file-ancestor
1216 startup-hooks
1217 'ediff-merge-files-with-ancestor
1218 merge-buffer-file))
1220 ;;;###autoload
1223 ;;;###autoload
1225 &optional
1226 ;; MERGE-BUFFER-FILE is the file to be
1227 ;; associated with the merge buffer
1228 startup-hooks job-name merge-buffer-file)
1229 "Merge buffers without ancestor."
1236 ;; realign buffers so that two visible bufs will be
1237 ;; at the top
1240 t))))
1245 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1247 ;;;###autoload
1249 &optional
1250 startup-hooks
1251 job-name
1252 ;; MERGE-BUFFER-FILE is the
1253 ;; file to be associated
1254 ;; with the merge buffer
1255 merge-buffer-file)
1256 "Merge buffers with ancestor."
1263 ;; realign buffers so that two visible
1264 ;; bufs will be at the top
1267 t))
1270 ;; realign buffers so that three visible
1271 ;; bufs will be at the top
1274 t)
1275 )))
1280 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1283 ;;;###autoload
1285 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1286 "Run Ediff by merging two revisions of a file.
1287 The file is the optional FILE argument or the file visited by the current
1288 buffer."
1295 "Version 1 to merge (default %s's working version): "
1298 rev2
1301 "Version 2 to merge (default %s): "
1305 ;; ancestor-revision=nil
1308 rev1 rev2 nil startup-hooks merge-buffer-file)))
1311 ;;;###autoload
1313 file startup-hooks
1314 ;; MERGE-BUFFER-FILE is the file to
1315 ;; be associated with the merge
1316 ;; buffer
1317 merge-buffer-file)
1318 "Run Ediff by merging two revisions of a file with a common ancestor.
1319 The file is the optional FILE argument or the file visited by the current
1320 buffer."
1327 "Version 1 to merge (default %s's working version): "
1330 rev2
1333 "Version 2 to merge (default %s): "
1336 ancestor-rev
1339 "Ancestor version (default %s's base revision): "
1345 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1347 ;;; Apply patch
1349 ;;;###autoload
1351 "Run Ediff by patching SOURCE-FILENAME.
1352 If optional PATCH-BUF is given, use the patch in that buffer
1353 and don't ask the user.
1354 If prefix argument, then: if even argument, assume that the patch is in a
1355 buffer. If odd -- assume it is in a file."
1371 "File to patch (directory, if multifile patch): "
1372 ;; use an explicit initial file
1376 ;;;###autoload
1378 "Run Ediff by patching the buffer specified at prompt.
1379 Without the optional prefix ARG, asks if the patch is in some buffer and
1380 prompts for the buffer or a file, depending on the answer.
1381 With ARG=1, assumes the patch is in a file and prompts for the file.
1382 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1383 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1384 patch. If not given, the user is prompted according to the prefix argument."
1391 patch-buf
1393 "Which buffer to patch? "
1397 ;;;###autoload
1399 ;;;###autoload
1404 \f
1405 ;;; Versions Control functions
1407 ;;;###autoload
1409 "Run Ediff by comparing versions of a file.
1410 The file is an optional FILE argument or the file entered at the prompt.
1411 Default: the file visited by the current buffer.
1412 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1413 ;; if buffer is non-nil, use that buffer instead of the current buffer
1419 ediff-last-dir-A
1420 default-directory)
1433 rev2
1440 rev1 rev2 startup-hooks)
1441 ))
1444 ;;;###autoload
1448 ;; Test if version control package is loaded and load if not
1449 ;; Is SILENT is non-nil, don't report error if package is not found.
1459 ediff-version-control-package)))))
1462 ;;;###autoload
1464 "Return string describing the version of Ediff.
1465 When called interactively, displays the version."
1467 ;; called-interactively-p - not in XEmacs
1468 ;; (if (called-interactively-p 'interactive)
1473 ;; info is run first, and will autoload info.el.
1476 ;;;###autoload
1478 "Display Ediff's manual.
1479 With optional NODE, goes to that node."
1505 "^Hmm... I don't see an Ediff command around here...$"
1506 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1507 ": This command runs in Ediff Control Buffer only!$"
1508 ": Invalid op in ediff-check-version$"
1509 "^ediff-shrink-window-C can be used only for merging jobs$"
1510 "^Lost difference info on these directories$"
1511 "^This command is inapplicable in the present context$"
1512 "^This session group has no parent$"
1513 "^Can't hide active session, $"
1514 "^Ediff: something wrong--no multiple diffs buffer$"
1515 "^Can't make context diff for Session $"
1516 "^The patch buffer wasn't found$"
1517 "^Aborted$"
1518 "^This Ediff session is not part of a session group$"
1519 "^No active Ediff sessions or corrupted session registry$"
1520 "^No session info in this line$"
1521 "^`.*' is not an ordinary file$"
1522 "^Patch appears to have failed$"
1523 "^Recomputation of differences cancelled$"
1524 "^No fine differences in this mode$"
1525 "^Lost connection to ancestor buffer...sorry$"
1526 "^Not merging with ancestor$"
1527 "^Don't know how to toggle read-only in buffer "
1528 "Emacs is not running as a window application$"
1529 "^This command makes sense only when merging with an ancestor$"
1530 "^At end of the difference list$"
1531 "^At beginning of the difference list$"
1532 "^Nothing saved for diff .* in buffer "
1533 "^Buffer is out of sync for file "
1534 "^Buffer out of sync for file "
1535 "^Output from `diff' not found$"
1536 "^You forgot to specify a region in buffer "
1537 "^All right. Make up your mind and come back...$"
1538 "^Current buffer is not visiting any file$"
1539 "^Failed to retrieve revision: $"
1540 "^Can't determine display width.$"
1541 "^File `.*' does not exist or is not readable$"
1542 "^File `.*' is a directory$"
1543 "^Buffer .* doesn't exist$"
1544 "^Directories . and . are the same: "
1545 "^Directory merge aborted$"
1546 "^Merge of directory revisions aborted$"
1547 "^Buffer .* doesn't exist$"
1548 "^There is no file to merge$"
1558 ;; Local Variables:
1559 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1560 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1561 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1562 ;; End:
1564 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1565 ;;; ediff.el ends here