| blob | d8abe89d17b4401162adcc28e7687866a991170c |
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
3 ;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, vc, tools, unix
8 ;; Version: 2.81.4
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 ;;; Acknowledgments:
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
120 ;; end pacifier
126 "Comprehensive visual interface to `diff' and `patch'."
132 "If t, Ediff will use previous directory as default when reading file name."
136 ;; Last directory used by an Ediff command for file-A.
138 ;; Last directory used by an Ediff command for file-B.
140 ;; Last directory used by an Ediff command for file-C.
142 ;; Last directory used by an Ediff command for the ancestor file.
144 ;; Last directory used by an Ediff command as the output directory for merge.
148 ;; Used as a startup hook to set `_orig' patch file read-only.
158 ;; Return a plausible default for ediff's first file:
159 ;; In dired, return the file number FILENO (or 0) in the list
160 ;; (all-selected-files, filename under the cursor), where directories are
161 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
162 ;; if the buffer is visiting a file, return that file name.
169 aux-list choices result)
178 default)))
182 ))
184 ;;; Compare files/buffers
186 ;;;###autoload
188 "Run Ediff on a pair of files, FILE-A and FILE-B."
191 ediff-last-dir-A
192 default-directory))
193 dir-B f)
195 "File A to compare"
196 dir-A
202 ediff-last-dir-B
206 'file-name-history
210 dir-B)))
212 )))
217 file-B)
218 nil ; file-C
219 startup-hooks
222 ;;;###autoload
224 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
227 ediff-last-dir-A
228 default-directory))
229 dir-B dir-C f ff)
231 "File A to compare"
232 dir-A
238 ediff-last-dir-B
242 'file-name-history
246 dir-B)))
250 ediff-last-dir-C
254 'file-name-history
258 dir-C)))
260 )))
265 file-B)
269 file-C)
270 startup-hooks
273 ;;;###autoload
278 "Visit FILE and arrange its buffer to Ediff's liking.
279 FILE-VAR is actually a variable symbol whose value must contain a true
280 file name.
281 BUFFER-NAME is a variable symbol, which will get the buffer object into
282 which FILE is read.
283 LAST-DIR is the directory variable symbol where FILE's
284 directory name should be returned. HOOKS-VAR is a variable symbol that will
285 be assigned the hook to be executed after `ediff-startup' is finished.
286 `ediff-find-file' arranges that the temp files it might create will be
287 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 "Start ediff between current buffer and its file on disk.
367 This command can be used instead of `revert-buffer'. If there is
368 nothing to revert then this command fails."
371 revert-buffer-insert-file-contents-function
378 buffer-auto-save-file-name
383 buffer-auto-save-file-name
384 buffer-file-name))
396 ;; Assume same modes:
401 ;;;###autoload
403 "Run Ediff on FILE and its backup file.
404 Uses the latest backup, if there are several numerical backups.
405 If this file is a backup, `ediff' it with its original."
407 ;; The code is taken from `diff-backup'.
415 ori file))
418 ;;;###autoload
420 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
427 ;; realign buffers so that two visible bufs will be
428 ;; at the top
431 t))))
435 ;;;###autoload
439 ;;;###autoload
442 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
449 ;; realign buffers so that two visible
450 ;; bufs will be at the top
453 t))
456 ;; realign buffers so that three visible
457 ;; bufs will be at the top
460 t)
461 )))
465 ;;;###autoload
470 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
478 file-A file-B file-C)
504 file-C
509 startup-hooks)
511 merge-buffer-file))
520 ;;; Directory and file group operations
522 ;; Get appropriate default name for directory:
523 ;; If ediff-use-last-dir, use ediff-last-dir-A.
524 ;; In dired mode, use the directory that is under the point (if any);
525 ;; otherwise, use default-directory
531 f
532 default-directory)))
536 ;;;###autoload
538 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
539 the same name in both. The third argument, REGEXP, is nil or a regular
540 expression; only file names that match the regexp are considered."
544 f)
549 ediff-last-dir-B
555 default-regexp)
557 nil
558 'ediff-filtering-regexp-history
560 )))
563 ))
565 ;;;###autoload
569 ;;;###autoload
571 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
572 The second argument, REGEXP, is a regular expression that filters the file
573 names. Only the files that are under revision control are taken into account."
577 )
583 default-regexp)
585 nil
586 'ediff-filtering-regexp-history
588 )))
591 ))
593 ;;;###autoload
597 ;;;###autoload
599 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
600 have the same name in all three. The last argument, REGEXP, is nil or a
601 regular expression; only file names that match the regexp are considered."
606 f)
610 ediff-last-dir-B
615 ediff-last-dir-C
621 default-regexp)
623 nil
624 'ediff-filtering-regexp-history
626 )))
629 ))
631 ;;;###autoload
634 ;;;###autoload
636 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
637 the same name in both. The third argument, REGEXP, is nil or a regular
638 expression; only file names that match the regexp are considered."
642 f)
647 ediff-last-dir-B
653 default-regexp)
655 nil
656 'ediff-filtering-regexp-history
658 )))
661 nil merge-autostore-dir
662 ))
664 ;;;###autoload
667 ;;;###autoload
669 &optional
670 merge-autostore-dir)
671 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
672 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
673 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
674 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
675 only file names that match the regexp are considered."
679 f)
683 ediff-last-dir-B
688 ediff-last-dir-C
694 default-regexp)
696 nil
697 'ediff-filtering-regexp-history
699 )))
701 dir1 dir2 ancestor-dir regexp
703 nil merge-autostore-dir
704 ))
706 ;;;###autoload
709 "Run Ediff on a directory, DIR1, merging its files with their revisions.
710 The second argument, REGEXP, is a regular expression that filters the file
711 names. Only the files that are under revision control are taken into account."
715 )
721 default-regexp)
723 nil
724 'ediff-filtering-regexp-history
726 )))
729 nil merge-autostore-dir
730 ))
732 ;;;###autoload
735 ;;;###autoload
737 &optional
738 merge-autostore-dir)
739 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
740 The second argument, REGEXP, is a regular expression that filters the file
741 names. Only the files that are under revision control are taken into account."
745 )
747 "Directory to merge with revisions and ancestors:"
752 default-regexp)
754 nil
755 'ediff-filtering-regexp-history
757 )))
759 dir1 regexp 'ediff-merge-revisions-with-ancestor
760 'ediff-merge-directory-revisions-with-ancestor
761 nil merge-autostore-dir
762 ))
764 ;;;###autoload
766 'edir-merge-revisions-with-ancestor
769 ;;;###autoload
772 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
773 ;; on a pair of directories (three directories, in case of ancestor).
774 ;; The third argument, REGEXP, is nil or a regular expression;
775 ;; only file names that match the regexp are considered.
776 ;; JOBNAME is the symbol indicating the meta-job to be performed.
777 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
779 &optional startup-hooks
780 merge-autostore-dir)
796 jobname)))
798 ;; It is a structure where ediff-intersect-directories returns
799 ;; commonalities and differences among directories
800 dir-diff-struct
801 meta-buf)
808 ediff-last-merge-autostore-dir
810 nil
812 ;; verify we are not merging into an orig directory
828 jobname
829 regexp dir1 dir2 dir3 merge-autostore-dir))
831 ;; this sets various vars in the meta buffer inside
832 ;; ediff-prepare-meta-buffer
834 ;; tell what to do if the user clicks on a session record
836 ;; set ediff-dir-difference-list
839 startup-hooks))
841 'ediff-filegroup-action
843 "*Ediff Session Group Panel"
844 'ediff-redraw-directory-group-buffer
845 jobname
846 startup-hooks))
848 ))
850 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
851 ;; files
853 &optional startup-hooks
854 merge-autostore-dir)
860 jobname)))
868 ediff-last-merge-autostore-dir
870 nil
872 ;; verify merge-autostore-dir != dir1
882 jobname regexp dir1 merge-autostore-dir))
884 ;; this sets various vars in the meta buffer inside
885 ;; ediff-prepare-meta-buffer
887 ;; tell what to do if the user clicks on a session record
889 startup-hooks))
891 'ediff-filegroup-action
892 file-list
893 "*Ediff Session Group Panel"
894 'ediff-redraw-directory-group-buffer
895 jobname
896 startup-hooks))
898 ))
901 ;;; Compare regions and windows
903 ;;;###autoload
905 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
906 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
907 follows:
908 If WIND-A is nil, use selected window.
909 If WIND-B is nil, use window next to WIND-A."
914 ;;;###autoload
916 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
917 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
918 follows:
919 If WIND-A is nil, use selected window.
920 If WIND-B is nil, use window next to WIND-A."
925 ;; Compare WIND-A and WIND-B, which are selected by clicking.
926 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
927 ;; works as follows:
928 ;; If WIND-A is nil, use selected window.
929 ;; If WIND-B is nil, use window next to WIND-A.
939 beg-A end-A beg-B end-B)
953 buffer-B
957 buffer-A beg-A end-A buffer-B beg-B end-B
958 startup-hooks job-name word-mode nil)))
961 ;;;###autoload
963 "Run Ediff on a pair of regions in specified buffers.
964 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
965 This function is effective only for relatively small regions, up to 200
966 lines. For large regions, use `ediff-regions-linewise'."
973 ;; realign buffers so that two visible bufs will be
974 ;; at the top
977 t))))
988 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1001 ;;;###autoload
1003 "Run Ediff on a pair of regions in specified buffers.
1004 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
1005 Each region is enlarged to contain full lines.
1006 This function is effective for large regions, over 100-200
1007 lines. For small regions, use `ediff-regions-wordwise'."
1014 ;; realign buffers so that two visible bufs will be
1015 ;; at the top
1018 t))))
1028 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1032 ;; enlarge the region to hold full lines
1044 ;; enlarge the region to hold full lines
1059 ;; compare region beg-A to end-A of buffer-A
1060 ;; to regions beg-B -- end-B in buffer-B.
1062 startup-hooks job-name word-mode
1063 setup-parameters)
1065 overl-A overl-B
1066 file-A file-B)
1069 ;; in case beg/end-A/B aren't markers--make them into markers
1077 ;; make file-A
1083 ;; make file-B
1092 buffer-B file-B
1093 nil nil ; buffer & file C
1097 startup-hooks)
1102 setup-parameters)))
1107 ))
1110 ;;; Merge files and buffers
1112 ;;;###autoload
1117 ;; Can't remember why this is here, but it may cause the automatically merged
1118 ;; buffer to be lost. So, keep the buffer modified.
1119 ;;(ediff-with-current-buffer ediff-buffer-C
1120 ;; (set-buffer-modified-p nil))
1121 )
1123 ;;;###autoload
1125 ;; MERGE-BUFFER-FILE is the file to be
1126 ;; associated with the merge buffer
1128 "Merge two files without ancestor."
1131 ediff-last-dir-A
1132 default-directory))
1133 dir-B f)
1135 "File A to merge"
1136 dir-A
1142 ediff-last-dir-B
1146 'file-name-history
1150 dir-B)))
1152 )))
1158 file-B)
1159 nil ; file-C
1160 startup-hooks
1161 'ediff-merge-files
1162 merge-buffer-file))
1164 ;;;###autoload
1166 &optional
1167 startup-hooks
1168 ;; MERGE-BUFFER-FILE is the file
1169 ;; to be associated with the
1170 ;; merge buffer
1171 merge-buffer-file)
1172 "Merge two files with ancestor."
1175 ediff-last-dir-A
1176 default-directory))
1177 dir-B dir-ancestor f ff)
1179 "File A to merge"
1180 dir-A
1186 ediff-last-dir-B
1190 'file-name-history
1194 dir-B)))
1199 ediff-last-dir-ancestor
1203 'file-name-history
1207 dir-ancestor)))
1209 )))
1215 file-B)
1216 file-ancestor
1217 startup-hooks
1218 'ediff-merge-files-with-ancestor
1219 merge-buffer-file))
1221 ;;;###autoload
1224 ;;;###autoload
1226 &optional
1227 ;; MERGE-BUFFER-FILE is the file to be
1228 ;; associated with the merge buffer
1229 startup-hooks job-name merge-buffer-file)
1230 "Merge buffers without ancestor."
1237 ;; realign buffers so that two visible bufs will be
1238 ;; at the top
1241 t))))
1246 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1248 ;;;###autoload
1250 &optional
1251 startup-hooks
1252 job-name
1253 ;; MERGE-BUFFER-FILE is the
1254 ;; file to be associated
1255 ;; with the merge buffer
1256 merge-buffer-file)
1257 "Merge buffers with ancestor."
1264 ;; realign buffers so that two visible
1265 ;; bufs will be at the top
1268 t))
1271 ;; realign buffers so that three visible
1272 ;; bufs will be at the top
1275 t)
1276 )))
1281 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1284 ;;;###autoload
1286 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1287 "Run Ediff by merging two revisions of a file.
1288 The file is the optional FILE argument or the file visited by the current
1289 buffer."
1296 "Version 1 to merge (default %s's working version): "
1299 rev2
1302 "Version 2 to merge (default %s): "
1306 ;; ancestor-revision=nil
1309 rev1 rev2 nil startup-hooks merge-buffer-file)))
1312 ;;;###autoload
1314 file startup-hooks
1315 ;; MERGE-BUFFER-FILE is the file to
1316 ;; be associated with the merge
1317 ;; buffer
1318 merge-buffer-file)
1319 "Run Ediff by merging two revisions of a file with a common ancestor.
1320 The file is the optional FILE argument or the file visited by the current
1321 buffer."
1328 "Version 1 to merge (default %s's working version): "
1331 rev2
1334 "Version 2 to merge (default %s): "
1337 ancestor-rev
1340 "Ancestor version (default %s's base revision): "
1346 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1348 ;;; Apply patch
1356 ;;;###autoload
1358 "Query for a file name, and then run Ediff by patching that file.
1359 If optional PATCH-BUF is given, use the patch in that buffer
1360 and don't ask the user.
1361 If prefix argument, then: if even argument, assume that the patch is in a
1362 buffer. If odd -- assume it is in a file."
1378 "File to patch (directory, if multifile patch): "
1379 ;; use an explicit initial file
1386 ;;;###autoload
1388 "Run Ediff by patching the buffer specified at prompt.
1389 Without the optional prefix ARG, asks if the patch is in some buffer and
1390 prompts for the buffer or a file, depending on the answer.
1391 With ARG=1, assumes the patch is in a file and prompts for the file.
1392 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1393 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1394 patch. If not given, the user is prompted according to the prefix argument."
1401 patch-buf
1403 "Which buffer to patch? "
1407 ;;;###autoload
1409 ;;;###autoload
1414 \f
1415 ;;; Versions Control functions
1417 ;;;###autoload
1419 "Run Ediff by comparing versions of a file.
1420 The file is an optional FILE argument or the file entered at the prompt.
1421 Default: the file visited by the current buffer.
1422 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1423 ;; if buffer is non-nil, use that buffer instead of the current buffer
1429 ediff-last-dir-A
1430 default-directory)
1443 rev2
1450 rev1 rev2 startup-hooks)
1451 ))
1454 ;;;###autoload
1458 ;; Test if version control package is loaded and load if not
1459 ;; Is SILENT is non-nil, don't report error if package is not found.
1469 ediff-version-control-package)))))
1472 ;;;###autoload
1474 "Return string describing the version of Ediff.
1475 When called interactively, displays the version."
1483 ;; info is run first, and will autoload info.el.
1486 ;;;###autoload
1488 "Display Ediff's manual.
1489 With optional NODE, goes to that node."
1515 "^Hmm... I don't see an Ediff command around here...$"
1516 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1517 ": This command runs in Ediff Control Buffer only!$"
1518 ": Invalid op in ediff-check-version$"
1519 "^ediff-shrink-window-C can be used only for merging jobs$"
1520 "^Lost difference info on these directories$"
1521 "^This command is inapplicable in the present context$"
1522 "^This session group has no parent$"
1523 "^Can't hide active session, $"
1524 "^Ediff: something wrong--no multiple diffs buffer$"
1525 "^Can't make context diff for Session $"
1526 "^The patch buffer wasn't found$"
1527 "^Aborted$"
1528 "^This Ediff session is not part of a session group$"
1529 "^No active Ediff sessions or corrupted session registry$"
1530 "^No session info in this line$"
1531 "^`.*' is not an ordinary file$"
1532 "^Patch appears to have failed$"
1533 "^Recomputation of differences cancelled$"
1534 "^No fine differences in this mode$"
1535 "^Lost connection to ancestor buffer...sorry$"
1536 "^Not merging with ancestor$"
1537 "^Don't know how to toggle read-only in buffer "
1538 "Emacs is not running as a window application$"
1539 "^This command makes sense only when merging with an ancestor$"
1540 "^At end of the difference list$"
1541 "^At beginning of the difference list$"
1542 "^Nothing saved for diff .* in buffer "
1543 "^Buffer is out of sync for file "
1544 "^Buffer out of sync for file "
1545 "^Output from `diff' not found$"
1546 "^You forgot to specify a region in buffer "
1547 "^All right. Make up your mind and come back...$"
1548 "^Current buffer is not visiting any file$"
1549 "^Failed to retrieve revision: $"
1550 "^Can't determine display width.$"
1551 "^File `.*' does not exist or is not readable$"
1552 "^File `.*' is a directory$"
1553 "^Buffer .* doesn't exist$"
1554 "^Directories . and . are the same: "
1555 "^Directory merge aborted$"
1556 "^Merge of directory revisions aborted$"
1557 "^Buffer .* doesn't exist$"
1558 "^There is no file to merge$"
1563 \f
1564 ;;; Command line interface
1566 ;;;###autoload
1573 ;;;###autoload
1581 ;;;###autoload
1588 ;;;###autoload
1596 ;;;###autoload
1604 ;;;###autoload
1613 ;;;###autoload
1621 ;;;###autoload
1637 ;; Local Variables:
1638 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1639 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1640 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1641 ;; End:
1643 ;;; ediff.el ends here