| blob | 80e121b6cda69a5707e6507422d65495cf534adc |
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 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, or (at your option)
24 ;; 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; see the file COPYING. If not, write to the
33 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
34 ;; Boston, MA 02110-1301, USA.
36 ;;; Commentary:
38 ;; Never read that diff output again!
39 ;; Apply patch interactively!
40 ;; Merge with ease!
42 ;; This package provides a convenient way of simultaneous browsing through
43 ;; the differences between a pair (or a triple) of files or buffers. The
44 ;; files being compared, file-A, file-B, and file-C (if applicable) are
45 ;; shown in separate windows (side by side, one above the another, or in
46 ;; separate frames), and the differences are highlighted as you step
47 ;; through them. You can also copy difference regions from one buffer to
48 ;; another (and recover old differences if you change your mind).
50 ;; Ediff also supports merging operations on files and buffers, including
51 ;; merging using ancestor versions. Both comparison and merging operations can
52 ;; be performed on directories, i.e., by pairwise comparison of files in those
53 ;; directories.
55 ;; In addition, Ediff can apply a patch to a file and then let you step
56 ;; though both files, the patched and the original one, simultaneously,
57 ;; difference-by-difference. You can even apply a patch right out of a
58 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
59 ;; Since Ediff lets you copy differences between buffers, you can, in
60 ;; effect, apply patches selectively (i.e., you can copy a difference
61 ;; region from file_orig to file, thereby undoing any particular patch that
62 ;; you don't like).
64 ;; Ediff is aware of version control, which lets the user compare
65 ;; files with their older versions. Ediff can also work with remote and
66 ;; compressed files. Details are given below.
68 ;; Finally, Ediff supports directory-level comparison, merging and patching.
69 ;; See the on-line manual for details.
71 ;; This package builds upon the ideas borrowed from emerge.el and several
72 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
73 ;; Ediff provides is also influenced by emerge.el.
75 ;; The present version of Ediff supersedes Emerge. It provides a superior user
76 ;; interface and has numerous major features not found in Emerge. In
77 ;; particular, it can do patching, and 2-way and 3-way file comparison,
78 ;; merging, and directory operations.
82 ;;; Bugs:
84 ;; 1. The undo command doesn't restore deleted regions well. That is, if
85 ;; you delete all characters in a difference region and then invoke
86 ;; `undo', the reinstated text will most likely be inserted outside of
87 ;; what Ediff thinks is the current difference region. (This problem
88 ;; doesn't seem to exist with XEmacs.)
89 ;;
90 ;; If at any point you feel that difference regions are no longer correct,
91 ;; you can hit '!' to recompute the differences.
93 ;; 2. On a monochrome display, the repertoire of faces with which to
94 ;; highlight fine differences is limited. By default, Ediff is using
95 ;; underlining. However, if the region is already underlined by some other
96 ;; overlays, there is no simple way to temporarily remove that residual
97 ;; underlining. This problem occurs when a buffer is highlighted with
98 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
99 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
100 ;; provide commands for unhighlighting buffers. You can either place these
101 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
102 ;; buffer used by Ediff) or you can execute them interactively, at any time
103 ;; and on any buffer.
106 ;;; Acknowledgements:
108 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
109 ;; Ediff would not have been possible without the help and encouragement of
110 ;; its many users. See Ediff on-line Info for the full list of those who
111 ;; helped. Improved defaults in Ediff file-name reading commands.
113 ;;; Code:
117 ;; Compiler pacifier
126 ;; end pacifier
132 "A comprehensive visual interface to diff & patch."
138 "*If t, Ediff will use previous directory as default when reading file name."
142 ;; Last directory used by an Ediff command for file-A.
144 ;; Last directory used by an Ediff command for file-B.
146 ;; Last directory used by an Ediff command for file-C.
148 ;; Last directory used by an Ediff command for the ancestor file.
150 ;; Last directory used by an Ediff command as the output directory for merge.
154 ;; Used as a startup hook to set `_orig' patch file read-only.
159 ;; Return a plausible default for ediff's first file:
160 ;; In dired, return the file number FILENO (or 0) in the list
161 ;; (all-selected-files, filename under the cursor), where directories are
162 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
163 ;; if the buffer is visiting a file, return that file name.
170 aux-list choices result)
179 default)))
183 ))
185 ;;; Compare files/buffers
187 ;;;###autoload
189 "Run Ediff on a pair of files, FILE-A and FILE-B."
192 ediff-last-dir-A
193 default-directory))
194 dir-B f)
196 "File A to compare"
197 dir-A
203 ediff-last-dir-B
207 'file-name-history
211 dir-B)))
213 )))
218 file-B)
219 nil ; file-C
220 startup-hooks
223 ;;;###autoload
225 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
228 ediff-last-dir-A
229 default-directory))
230 dir-B dir-C f ff)
232 "File A to compare"
233 dir-A
239 ediff-last-dir-B
243 'file-name-history
247 dir-B)))
251 ediff-last-dir-C
255 'file-name-history
259 dir-C)))
261 )))
266 file-B)
270 file-C)
271 startup-hooks
274 ;;;###autoload
278 ;; Visit FILE and arrange its buffer to Ediff's liking.
279 ;; FILE is actually a variable symbol that must contain a true 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.
296 ;; some of the commands, below, require full file name
299 ;; Record the directory of the file
303 ;; Setup the buffer
309 ;;; ange-ftp-hook-function--arrange for temp file
316 ;; file processed via auto-mode-alist, a la uncompress.el
328 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
338 ;;(sit-for 0)
341 ;;(sit-for 0)
346 ;;(sit-for 0)
353 buf-B file-B
354 buf-C file-C
355 startup-hooks
357 merge-buffer-file)))
361 ;;;###autoload
364 ;;;###autoload
366 "Run Ediff on FILE and its backup file.
367 Uses the latest backup, if there are several numerical backups.
368 If this file is a backup, `ediff' it with its original."
370 ;; The code is taken from `diff-backup'.
378 ori file))
381 ;;;###autoload
383 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
390 ;; realign buffers so that two visible bufs will be
391 ;; at the top
394 t))))
398 ;;;###autoload
402 ;;;###autoload
405 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
412 ;; realign buffers so that two visible
413 ;; bufs will be at the top
416 t))
419 ;; realign buffers so that three visible
420 ;; bufs will be at the top
423 t)
424 )))
428 ;;;###autoload
433 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
441 file-A file-B file-C)
465 file-C
470 startup-hooks)
472 merge-buffer-file)))
475 ;;; Directory and file group operations
477 ;; Get appropriate default name for directory:
478 ;; If ediff-use-last-dir, use ediff-last-dir-A.
479 ;; In dired mode, use the directory that is under the point (if any);
480 ;; otherwise, use default-directory
486 f
487 default-directory)))
491 ;;;###autoload
493 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
494 the same name in both. The third argument, REGEXP, is nil or a regular
495 expression; only file names that match the regexp are considered."
499 f)
504 ediff-last-dir-B
510 default-regexp)
512 nil
513 'ediff-filtering-regexp-history
515 )))
518 ))
520 ;;;###autoload
524 ;;;###autoload
526 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
527 The second argument, REGEXP, is a regular expression that filters the file
528 names. Only the files that are under revision control are taken into account."
532 )
538 default-regexp)
540 nil
541 'ediff-filtering-regexp-history
543 )))
546 ))
548 ;;;###autoload
552 ;;;###autoload
554 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
555 have the same name in all three. The last argument, REGEXP, is nil or a
556 regular expression; only file names that match the regexp are considered."
561 f)
565 ediff-last-dir-B
570 ediff-last-dir-C
576 default-regexp)
578 nil
579 'ediff-filtering-regexp-history
581 )))
584 ))
586 ;;;###autoload
589 ;;;###autoload
591 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
592 the same name in both. The third argument, REGEXP, is nil or a regular
593 expression; only file names that match the regexp are considered."
597 f)
602 ediff-last-dir-B
608 default-regexp)
610 nil
611 'ediff-filtering-regexp-history
613 )))
616 nil merge-autostore-dir
617 ))
619 ;;;###autoload
622 ;;;###autoload
624 &optional
625 merge-autostore-dir)
626 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
627 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
628 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
629 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
630 only file names that match the regexp are considered."
634 f)
638 ediff-last-dir-B
643 ediff-last-dir-C
649 default-regexp)
651 nil
652 'ediff-filtering-regexp-history
654 )))
656 dir1 dir2 ancestor-dir regexp
658 nil merge-autostore-dir
659 ))
661 ;;;###autoload
664 "Run Ediff on a directory, DIR1, merging its files with their revisions.
665 The second argument, REGEXP, is a regular expression that filters the file
666 names. Only the files that are under revision control are taken into account."
670 )
676 default-regexp)
678 nil
679 'ediff-filtering-regexp-history
681 )))
684 nil merge-autostore-dir
685 ))
687 ;;;###autoload
690 ;;;###autoload
692 &optional
693 merge-autostore-dir)
694 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
695 The second argument, REGEXP, is a regular expression that filters the file
696 names. Only the files that are under revision control are taken into account."
700 )
702 "Directory to merge with revisions and ancestors:"
707 default-regexp)
709 nil
710 'ediff-filtering-regexp-history
712 )))
714 dir1 regexp 'ediff-merge-revisions-with-ancestor
715 'ediff-merge-directory-revisions-with-ancestor
716 nil merge-autostore-dir
717 ))
719 ;;;###autoload
721 'edir-merge-revisions-with-ancestor
724 ;;;###autoload
727 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
728 ;; on a pair of directories (three directories, in case of ancestor).
729 ;; The third argument, REGEXP, is nil or a regular expression;
730 ;; only file names that match the regexp are considered.
731 ;; JOBNAME is the symbol indicating the meta-job to be performed.
732 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
734 &optional startup-hooks
735 merge-autostore-dir)
751 jobname)))
753 ;; It is a structure where ediff-intersect-directories returns
754 ;; commonalities and differences among directories
755 dir-diff-struct
756 meta-buf)
763 ediff-last-merge-autostore-dir
765 nil
767 ;; verify we are not merging into an orig directory
783 jobname
784 regexp dir1 dir2 dir3 merge-autostore-dir))
786 ;; this sets various vars in the meta buffer inside
787 ;; ediff-prepare-meta-buffer
789 ;; tell what to do if the user clicks on a session record
791 ;; set ediff-dir-difference-list
794 startup-hooks))
796 'ediff-filegroup-action
798 "*Ediff Session Group Panel"
799 'ediff-redraw-directory-group-buffer
800 jobname
801 startup-hooks))
803 ))
805 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
806 ;; files
808 &optional startup-hooks
809 merge-autostore-dir)
815 jobname)))
823 ediff-last-merge-autostore-dir
825 nil
827 ;; verify merge-autostore-dir != dir1
837 jobname regexp dir1 merge-autostore-dir))
839 ;; this sets various vars in the meta buffer inside
840 ;; ediff-prepare-meta-buffer
842 ;; tell what to do if the user clicks on a session record
844 startup-hooks))
846 'ediff-filegroup-action
847 file-list
848 "*Ediff Session Group Panel"
849 'ediff-redraw-directory-group-buffer
850 jobname
851 startup-hooks))
853 ))
856 ;;; Compare regions and windows
858 ;;;###autoload
860 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
861 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
862 follows:
863 If WIND-A is nil, use selected window.
864 If WIND-B is nil, use window next to WIND-A."
869 ;;;###autoload
871 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
872 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
873 follows:
874 If WIND-A is nil, use selected window.
875 If WIND-B is nil, use window next to WIND-A."
880 ;; Compare WIND-A and WIND-B, which are selected by clicking.
881 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
882 ;; works as follows:
883 ;; If WIND-A is nil, use selected window.
884 ;; If WIND-B is nil, use window next to WIND-A.
894 beg-A end-A beg-B end-B)
908 buffer-B
912 buffer-A beg-A end-A buffer-B beg-B end-B
913 startup-hooks job-name word-mode nil)))
916 ;;;###autoload
918 "Run Ediff on a pair of regions in specified buffers.
919 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
920 This function is effective only for relatively small regions, up to 200
921 lines. For large regions, use `ediff-regions-linewise'."
928 ;; realign buffers so that two visible bufs will be
929 ;; at the top
932 t))))
943 reg-A-beg reg-A-end reg-B-beg reg-B-end)
957 ;;;###autoload
959 "Run Ediff on a pair of regions in specified buffers.
960 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
961 Each region is enlarged to contain full lines.
962 This function is effective for large regions, over 100-200
963 lines. For small regions, use `ediff-regions-wordwise'."
970 ;; realign buffers so that two visible bufs will be
971 ;; at the top
974 t))))
984 reg-A-beg reg-A-end reg-B-beg reg-B-end)
989 ;; enlarge the region to hold full lines
1001 ;; enlarge the region to hold full lines
1016 ;; compare region beg-A to end-A of buffer-A
1017 ;; to regions beg-B -- end-B in buffer-B.
1019 startup-hooks job-name word-mode
1020 setup-parameters)
1022 overl-A overl-B
1023 file-A file-B)
1025 ;; in case beg/end-A/B aren't markers--make them into markers
1033 ;; make file-A
1039 ;; make file-B
1048 buffer-B file-B
1049 nil nil ; buffer & file C
1053 startup-hooks)
1058 setup-parameters))
1059 ))
1062 ;;; Merge files and buffers
1064 ;;;###autoload
1069 ;; Can't remember why this is here, but it may cause the automatically merged
1070 ;; buffer to be lost. So, keep the buffer modified.
1071 ;;(ediff-with-current-buffer ediff-buffer-C
1072 ;; (set-buffer-modified-p nil))
1073 )
1075 ;;;###autoload
1077 ;; MERGE-BUFFER-FILE is the file to be
1078 ;; associated with the merge buffer
1080 "Merge two files without ancestor."
1083 ediff-last-dir-A
1084 default-directory))
1085 dir-B f)
1087 "File A to merge"
1088 dir-A
1094 ediff-last-dir-B
1098 'file-name-history
1102 dir-B)))
1104 )))
1110 file-B)
1111 nil ; file-C
1112 startup-hooks
1113 'ediff-merge-files
1114 merge-buffer-file))
1116 ;;;###autoload
1118 &optional
1119 startup-hooks
1120 ;; MERGE-BUFFER-FILE is the file
1121 ;; to be associated with the
1122 ;; merge buffer
1123 merge-buffer-file)
1124 "Merge two files with ancestor."
1127 ediff-last-dir-A
1128 default-directory))
1129 dir-B dir-ancestor f ff)
1131 "File A to merge"
1132 dir-A
1138 ediff-last-dir-B
1142 'file-name-history
1146 dir-B)))
1151 ediff-last-dir-ancestor
1155 'file-name-history
1159 dir-ancestor)))
1161 )))
1167 file-B)
1168 file-ancestor
1169 startup-hooks
1170 'ediff-merge-files-with-ancestor
1171 merge-buffer-file))
1173 ;;;###autoload
1176 ;;;###autoload
1178 &optional
1179 ;; MERGE-BUFFER-FILE is the file to be
1180 ;; associated with the merge buffer
1181 startup-hooks job-name merge-buffer-file)
1182 "Merge buffers without ancestor."
1189 ;; realign buffers so that two visible bufs will be
1190 ;; at the top
1193 t))))
1198 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1200 ;;;###autoload
1202 &optional
1203 startup-hooks
1204 job-name
1205 ;; MERGE-BUFFER-FILE is the
1206 ;; file to be associated
1207 ;; with the merge buffer
1208 merge-buffer-file)
1209 "Merge buffers with ancestor."
1216 ;; realign buffers so that two visible
1217 ;; bufs will be at the top
1220 t))
1223 ;; realign buffers so that three visible
1224 ;; bufs will be at the top
1227 t)
1228 )))
1233 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1236 ;;;###autoload
1238 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1239 "Run Ediff by merging two revisions of a file.
1240 The file is the optional FILE argument or the file visited by the current
1241 buffer."
1248 "Version 1 to merge (default %s's working version): "
1251 rev2
1254 "Version 2 to merge (default %s): "
1258 ;; ancestor-revision=nil
1261 rev1 rev2 nil startup-hooks merge-buffer-file)))
1264 ;;;###autoload
1266 file startup-hooks
1267 ;; MERGE-BUFFER-FILE is the file to
1268 ;; be associated with the merge
1269 ;; buffer
1270 merge-buffer-file)
1271 "Run Ediff by merging two revisions of a file with a common ancestor.
1272 The file is the optional FILE argument or the file visited by the current
1273 buffer."
1280 "Version 1 to merge (default %s's working version): "
1283 rev2
1286 "Version 2 to merge (default %s): "
1289 ancestor-rev
1292 "Ancestor version (default %s's base revision): "
1298 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1300 ;;; Apply patch
1302 ;;;###autoload
1304 "Run Ediff by patching SOURCE-FILENAME.
1305 If optional PATCH-BUF is given, use the patch in that buffer
1306 and don't ask the user.
1307 If prefix argument, then: if even argument, assume that the patch is in a
1308 buffer. If odd -- assume it is in a file."
1324 "File to patch (directory, if multifile patch): "
1325 ;; use an explicit initial file
1329 ;;;###autoload
1331 "Run Ediff by patching the buffer specified at prompt.
1332 Without the optional prefix ARG, asks if the patch is in some buffer and
1333 prompts for the buffer or a file, depending on the answer.
1334 With ARG=1, assumes the patch is in a file and prompts for the file.
1335 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1336 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1337 patch. If not given, the user is prompted according to the prefix argument."
1344 patch-buf
1346 "Which buffer to patch? "
1350 ;;;###autoload
1352 ;;;###autoload
1357 \f
1358 ;;; Versions Control functions
1360 ;;;###autoload
1362 "Run Ediff by comparing versions of a file.
1363 The file is an optional FILE argument or the file entered at the prompt.
1364 Default: the file visited by the current buffer.
1365 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1366 ;; if buffer is non-nil, use that buffer instead of the current buffer
1372 ediff-last-dir-A
1373 default-directory)
1386 rev2
1393 rev1 rev2 startup-hooks)
1394 ))
1397 ;;;###autoload
1401 ;; Test if version control package is loaded and load if not
1402 ;; Is SILENT is non-nil, don't report error if package is not found.
1412 ediff-version-control-package)))))
1415 ;;;###autoload
1417 "Return string describing the version of Ediff.
1418 When called interactively, displays the version."
1424 ;; info is run first, and will autoload info.el.
1427 ;;;###autoload
1429 "Display Ediff's manual.
1430 With optional NODE, goes to that node."
1456 "^Hmm... I don't see an Ediff command around here...$"
1457 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1458 ": This command runs in Ediff Control Buffer only!$"
1459 ": Invalid op in ediff-check-version$"
1460 "^ediff-shrink-window-C can be used only for merging jobs$"
1461 "^Lost difference info on these directories$"
1462 "^This command is inapplicable in the present context$"
1463 "^This session group has no parent$"
1464 "^Can't hide active session, $"
1465 "^Ediff: something wrong--no multiple diffs buffer$"
1466 "^Can't make context diff for Session $"
1467 "^The patch buffer wasn't found$"
1468 "^Aborted$"
1469 "^This Ediff session is not part of a session group$"
1470 "^No active Ediff sessions or corrupted session registry$"
1471 "^No session info in this line$"
1472 "^`.*' is not an ordinary file$"
1473 "^Patch appears to have failed$"
1474 "^Recomputation of differences cancelled$"
1475 "^No fine differences in this mode$"
1476 "^Lost connection to ancestor buffer...sorry$"
1477 "^Not merging with ancestor$"
1478 "^Don't know how to toggle read-only in buffer "
1479 "Emacs is not running as a window application$"
1480 "^This command makes sense only when merging with an ancestor$"
1481 "^At end of the difference list$"
1482 "^At beginning of the difference list$"
1483 "^Nothing saved for diff .* in buffer "
1484 "^Buffer is out of sync for file "
1485 "^Buffer out of sync for file "
1486 "^Output from `diff' not found$"
1487 "^You forgot to specify a region in buffer "
1488 "^All right. Make up your mind and come back...$"
1489 "^Current buffer is not visiting any file$"
1490 "^Failed to retrieve revision: $"
1491 "^Can't determine display width.$"
1492 "^File `.*' does not exist or is not readable$"
1493 "^File `.*' is a directory$"
1494 "^Buffer .* doesn't exist$"
1495 "^Directories . and . are the same: "
1496 "^Directory merge aborted$"
1497 "^Merge of directory revisions aborted$"
1498 "^Buffer .* doesn't exist$"
1499 "^There is no file to merge$"
1509 ;;; Local Variables:
1510 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1511 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1512 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1513 ;;; End:
1515 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1516 ;;; ediff.el ends here