| blob | 5418039143fededb6b2316503dc5a2c4a2706eec |
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 Ediff 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."
370 ;; This duplicates code from menu-bar.el.
380 buffer-auto-save-file-name
385 buffer-auto-save-file-name
386 buffer-file-name))
398 ;; Assume same modes:
403 ;;;###autoload
405 "Run Ediff on FILE and its backup file.
406 Uses the latest backup, if there are several numerical backups.
407 If this file is a backup, `ediff' it with its original."
409 ;; The code is taken from `diff-backup'.
417 ori file))
420 ;;;###autoload
422 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
429 ;; realign buffers so that two visible bufs will be
430 ;; at the top
433 t))))
437 ;;;###autoload
441 ;;;###autoload
444 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
451 ;; realign buffers so that two visible
452 ;; bufs will be at the top
455 t))
458 ;; realign buffers so that three visible
459 ;; bufs will be at the top
462 t)
463 )))
467 ;;;###autoload
472 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
480 file-A file-B file-C)
506 file-C
511 startup-hooks)
513 merge-buffer-file))
522 ;;; Directory and file group operations
524 ;; Get appropriate default name for directory:
525 ;; If ediff-use-last-dir, use ediff-last-dir-A.
526 ;; In dired mode, use the directory that is under the point (if any);
527 ;; otherwise, use default-directory
533 f
534 default-directory)))
538 ;;;###autoload
540 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
541 the same name in both. The third argument, REGEXP, is nil or a regular
542 expression; only file names that match the regexp are considered."
546 f)
551 ediff-last-dir-B
557 default-regexp)
559 nil
560 'ediff-filtering-regexp-history
562 )))
565 ))
567 ;;;###autoload
571 ;;;###autoload
573 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
574 The second argument, REGEXP, is a regular expression that filters the file
575 names. Only the files that are under revision control are taken into account."
579 )
585 default-regexp)
587 nil
588 'ediff-filtering-regexp-history
590 )))
593 ))
595 ;;;###autoload
599 ;;;###autoload
601 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
602 have the same name in all three. The last argument, REGEXP, is nil or a
603 regular expression; only file names that match the regexp are considered."
608 f)
612 ediff-last-dir-B
617 ediff-last-dir-C
623 default-regexp)
625 nil
626 'ediff-filtering-regexp-history
628 )))
631 ))
633 ;;;###autoload
636 ;;;###autoload
638 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
639 the same name in both. The third argument, REGEXP, is nil or a regular
640 expression; only file names that match the regexp are considered."
644 f)
649 ediff-last-dir-B
655 default-regexp)
657 nil
658 'ediff-filtering-regexp-history
660 )))
663 nil merge-autostore-dir
664 ))
666 ;;;###autoload
669 ;;;###autoload
671 &optional
672 merge-autostore-dir)
673 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
674 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
675 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
676 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
677 only file names that match the regexp are considered."
681 f)
685 ediff-last-dir-B
690 ediff-last-dir-C
696 default-regexp)
698 nil
699 'ediff-filtering-regexp-history
701 )))
703 dir1 dir2 ancestor-dir regexp
705 nil merge-autostore-dir
706 ))
708 ;;;###autoload
711 "Run Ediff on a directory, DIR1, merging its files with their revisions.
712 The second argument, REGEXP, is a regular expression that filters the file
713 names. Only the files that are under revision control are taken into account."
717 )
723 default-regexp)
725 nil
726 'ediff-filtering-regexp-history
728 )))
731 nil merge-autostore-dir
732 ))
734 ;;;###autoload
737 ;;;###autoload
739 &optional
740 merge-autostore-dir)
741 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
742 The second argument, REGEXP, is a regular expression that filters the file
743 names. Only the files that are under revision control are taken into account."
747 )
749 "Directory to merge with revisions and ancestors:"
754 default-regexp)
756 nil
757 'ediff-filtering-regexp-history
759 )))
761 dir1 regexp 'ediff-merge-revisions-with-ancestor
762 'ediff-merge-directory-revisions-with-ancestor
763 nil merge-autostore-dir
764 ))
766 ;;;###autoload
768 'edir-merge-revisions-with-ancestor
771 ;;;###autoload
774 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
775 ;; on a pair of directories (three directories, in case of ancestor).
776 ;; The third argument, REGEXP, is nil or a regular expression;
777 ;; only file names that match the regexp are considered.
778 ;; JOBNAME is the symbol indicating the meta-job to be performed.
779 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
781 &optional startup-hooks
782 merge-autostore-dir)
798 jobname)))
800 ;; It is a structure where ediff-intersect-directories returns
801 ;; commonalities and differences among directories
802 dir-diff-struct
803 meta-buf)
810 ediff-last-merge-autostore-dir
812 nil
814 ;; verify we are not merging into an orig directory
830 jobname
831 regexp dir1 dir2 dir3 merge-autostore-dir))
833 ;; this sets various vars in the meta buffer inside
834 ;; ediff-prepare-meta-buffer
836 ;; tell what to do if the user clicks on a session record
838 ;; set ediff-dir-difference-list
841 startup-hooks))
843 'ediff-filegroup-action
845 "*Ediff Session Group Panel"
846 'ediff-redraw-directory-group-buffer
847 jobname
848 startup-hooks))
850 ))
852 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
853 ;; files
855 &optional startup-hooks
856 merge-autostore-dir)
862 jobname)))
870 ediff-last-merge-autostore-dir
872 nil
874 ;; verify merge-autostore-dir != dir1
884 jobname regexp dir1 merge-autostore-dir))
886 ;; this sets various vars in the meta buffer inside
887 ;; ediff-prepare-meta-buffer
889 ;; tell what to do if the user clicks on a session record
891 startup-hooks))
893 'ediff-filegroup-action
894 file-list
895 "*Ediff Session Group Panel"
896 'ediff-redraw-directory-group-buffer
897 jobname
898 startup-hooks))
900 ))
903 ;;; Compare regions and windows
905 ;;;###autoload
907 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
908 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
909 follows:
910 If WIND-A is nil, use selected window.
911 If WIND-B is nil, use window next to WIND-A."
916 ;;;###autoload
918 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
919 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
920 follows:
921 If WIND-A is nil, use selected window.
922 If WIND-B is nil, use window next to WIND-A."
927 ;; Compare WIND-A and WIND-B, which are selected by clicking.
928 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
929 ;; works as follows:
930 ;; If WIND-A is nil, use selected window.
931 ;; If WIND-B is nil, use window next to WIND-A.
941 beg-A end-A beg-B end-B)
955 buffer-B
959 buffer-A beg-A end-A buffer-B beg-B end-B
960 startup-hooks job-name word-mode nil)))
963 ;;;###autoload
965 "Run Ediff on a pair of regions in specified buffers.
966 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
967 This function is effective only for relatively small regions, up to 200
968 lines. For large regions, use `ediff-regions-linewise'."
975 ;; realign buffers so that two visible bufs will be
976 ;; at the top
979 t))))
990 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1003 ;;;###autoload
1005 "Run Ediff on a pair of regions in specified buffers.
1006 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
1007 Each region is enlarged to contain full lines.
1008 This function is effective for large regions, over 100-200
1009 lines. For small regions, use `ediff-regions-wordwise'."
1016 ;; realign buffers so that two visible bufs will be
1017 ;; at the top
1020 t))))
1030 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1034 ;; enlarge the region to hold full lines
1046 ;; enlarge the region to hold full lines
1061 ;; compare region beg-A to end-A of buffer-A
1062 ;; to regions beg-B -- end-B in buffer-B.
1064 startup-hooks job-name word-mode
1065 setup-parameters)
1067 overl-A overl-B
1068 file-A file-B)
1071 ;; in case beg/end-A/B aren't markers--make them into markers
1079 ;; make file-A
1085 ;; make file-B
1094 buffer-B file-B
1095 nil nil ; buffer & file C
1099 startup-hooks)
1104 setup-parameters)))
1109 ))
1112 ;;; Merge files and buffers
1114 ;;;###autoload
1119 ;; Can't remember why this is here, but it may cause the automatically merged
1120 ;; buffer to be lost. So, keep the buffer modified.
1121 ;;(ediff-with-current-buffer ediff-buffer-C
1122 ;; (set-buffer-modified-p nil))
1123 )
1125 ;;;###autoload
1127 ;; MERGE-BUFFER-FILE is the file to be
1128 ;; associated with the merge buffer
1130 "Merge two files without ancestor."
1133 ediff-last-dir-A
1134 default-directory))
1135 dir-B f)
1137 "File A to merge"
1138 dir-A
1144 ediff-last-dir-B
1148 'file-name-history
1152 dir-B)))
1154 )))
1160 file-B)
1161 nil ; file-C
1162 startup-hooks
1163 'ediff-merge-files
1164 merge-buffer-file))
1166 ;;;###autoload
1168 &optional
1169 startup-hooks
1170 ;; MERGE-BUFFER-FILE is the file
1171 ;; to be associated with the
1172 ;; merge buffer
1173 merge-buffer-file)
1174 "Merge two files with ancestor."
1177 ediff-last-dir-A
1178 default-directory))
1179 dir-B dir-ancestor f ff)
1181 "File A to merge"
1182 dir-A
1188 ediff-last-dir-B
1192 'file-name-history
1196 dir-B)))
1201 ediff-last-dir-ancestor
1205 'file-name-history
1209 dir-ancestor)))
1211 )))
1217 file-B)
1218 file-ancestor
1219 startup-hooks
1220 'ediff-merge-files-with-ancestor
1221 merge-buffer-file))
1223 ;;;###autoload
1226 ;;;###autoload
1228 &optional
1229 ;; MERGE-BUFFER-FILE is the file to be
1230 ;; associated with the merge buffer
1231 startup-hooks job-name merge-buffer-file)
1232 "Merge buffers without ancestor."
1239 ;; realign buffers so that two visible bufs will be
1240 ;; at the top
1243 t))))
1248 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1250 ;;;###autoload
1252 &optional
1253 startup-hooks
1254 job-name
1255 ;; MERGE-BUFFER-FILE is the
1256 ;; file to be associated
1257 ;; with the merge buffer
1258 merge-buffer-file)
1259 "Merge buffers with ancestor."
1266 ;; realign buffers so that two visible
1267 ;; bufs will be at the top
1270 t))
1273 ;; realign buffers so that three visible
1274 ;; bufs will be at the top
1277 t)
1278 )))
1283 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1286 ;;;###autoload
1288 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1289 "Run Ediff by merging two revisions of a file.
1290 The file is the optional FILE argument or the file visited by the current
1291 buffer."
1298 "Version 1 to merge (default %s's working version): "
1301 rev2
1304 "Version 2 to merge (default %s): "
1308 ;; ancestor-revision=nil
1311 rev1 rev2 nil startup-hooks merge-buffer-file)))
1314 ;;;###autoload
1316 file startup-hooks
1317 ;; MERGE-BUFFER-FILE is the file to
1318 ;; be associated with the merge
1319 ;; buffer
1320 merge-buffer-file)
1321 "Run Ediff by merging two revisions of a file with a common ancestor.
1322 The file is the optional FILE argument or the file visited by the current
1323 buffer."
1330 "Version 1 to merge (default %s's working version): "
1333 rev2
1336 "Version 2 to merge (default %s): "
1339 ancestor-rev
1342 "Ancestor version (default %s's base revision): "
1348 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1350 ;;; Apply patch
1358 ;;;###autoload
1360 "Query for a file name, and then run Ediff by patching that file.
1361 If optional PATCH-BUF is given, use the patch in that buffer
1362 and don't ask the user.
1363 If prefix argument, then: if even argument, assume that the patch is in a
1364 buffer. If odd -- assume it is in a file."
1380 "File to patch (directory, if multifile patch): "
1381 ;; use an explicit initial file
1388 ;;;###autoload
1390 "Run Ediff by patching the buffer specified at prompt.
1391 Without the optional prefix ARG, asks if the patch is in some buffer and
1392 prompts for the buffer or a file, depending on the answer.
1393 With ARG=1, assumes the patch is in a file and prompts for the file.
1394 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1395 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1396 patch. If not given, the user is prompted according to the prefix argument."
1403 patch-buf
1405 "Which buffer to patch? "
1409 ;;;###autoload
1411 ;;;###autoload
1416 \f
1417 ;;; Versions Control functions
1419 ;;;###autoload
1421 "Run Ediff by comparing versions of a file.
1422 The file is an optional FILE argument or the file entered at the prompt.
1423 Default: the file visited by the current buffer.
1424 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1425 ;; if buffer is non-nil, use that buffer instead of the current buffer
1431 ediff-last-dir-A
1432 default-directory)
1445 rev2
1452 rev1 rev2 startup-hooks)
1453 ))
1456 ;;;###autoload
1460 ;; Test if version control package is loaded and load if not
1461 ;; Is SILENT is non-nil, don't report error if package is not found.
1471 ediff-version-control-package)))))
1474 ;;;###autoload
1476 "Return string describing the version of Ediff.
1477 When called interactively, displays the version."
1485 ;; info is run first, and will autoload info.el.
1488 ;;;###autoload
1490 "Display Ediff's manual.
1491 With optional NODE, goes to that node."
1517 "^Hmm... I don't see an Ediff command around here...$"
1518 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1519 ": This command runs in Ediff Control Buffer only!$"
1520 ": Invalid op in ediff-check-version$"
1521 "^ediff-shrink-window-C can be used only for merging jobs$"
1522 "^Lost difference info on these directories$"
1523 "^This command is inapplicable in the present context$"
1524 "^This session group has no parent$"
1525 "^Can't hide active session, $"
1526 "^Ediff: something wrong--no multiple diffs buffer$"
1527 "^Can't make context diff for Session $"
1528 "^The patch buffer wasn't found$"
1529 "^Aborted$"
1530 "^This Ediff session is not part of a session group$"
1531 "^No active Ediff sessions or corrupted session registry$"
1532 "^No session info in this line$"
1533 "^`.*' is not an ordinary file$"
1534 "^Patch appears to have failed$"
1535 "^Recomputation of differences cancelled$"
1536 "^No fine differences in this mode$"
1537 "^Lost connection to ancestor buffer...sorry$"
1538 "^Not merging with ancestor$"
1539 "^Don't know how to toggle read-only in buffer "
1540 "Emacs is not running as a window application$"
1541 "^This command makes sense only when merging with an ancestor$"
1542 "^At end of the difference list$"
1543 "^At beginning of the difference list$"
1544 "^Nothing saved for diff .* in buffer "
1545 "^Buffer is out of sync for file "
1546 "^Buffer out of sync for file "
1547 "^Output from `diff' not found$"
1548 "^You forgot to specify a region in buffer "
1549 "^All right. Make up your mind and come back...$"
1550 "^Current buffer is not visiting any file$"
1551 "^Failed to retrieve revision: $"
1552 "^Can't determine display width.$"
1553 "^File `.*' does not exist or is not readable$"
1554 "^File `.*' is a directory$"
1555 "^Buffer .* doesn't exist$"
1556 "^Directories . and . are the same: "
1557 "^Directory merge aborted$"
1558 "^Merge of directory revisions aborted$"
1559 "^Buffer .* doesn't exist$"
1560 "^There is no file to merge$"
1565 \f
1566 ;;; Command line interface
1568 ;;;###autoload
1575 ;;;###autoload
1583 ;;;###autoload
1590 ;;;###autoload
1598 ;;;###autoload
1606 ;;;###autoload
1615 ;;;###autoload
1623 ;;;###autoload
1639 ;; Local Variables:
1640 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1641 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1642 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1643 ;; End:
1645 ;;; ediff.el ends here