| blob | 3e0be86b18b612b8b289b5be1624a50f472422df |
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 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix
14 ;; This file is part of GNU Emacs.
16 ;; GNU Emacs is free software; you can redistribute it and/or modify
17 ;; it under the terms of the GNU General Public License as published by
18 ;; the Free Software Foundation; either version 2, or (at your option)
19 ;; any later version.
21 ;; GNU Emacs is distributed in the hope that it will be useful,
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 ;; GNU General Public License for more details.
26 ;; You should have received a copy of the GNU General Public License
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the
28 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
29 ;; Boston, MA 02110-1301, USA.
31 ;;; Commentary:
33 ;; Never read that diff output again!
34 ;; Apply patch interactively!
35 ;; Merge with ease!
37 ;; This package provides a convenient way of simultaneous browsing through
38 ;; the differences between a pair (or a triple) of files or buffers. The
39 ;; files being compared, file-A, file-B, and file-C (if applicable) are
40 ;; shown in separate windows (side by side, one above the another, or in
41 ;; separate frames), and the differences are highlighted as you step
42 ;; through them. You can also copy difference regions from one buffer to
43 ;; another (and recover old differences if you change your mind).
45 ;; Ediff also supports merging operations on files and buffers, including
46 ;; merging using ancestor versions. Both comparison and merging operations can
47 ;; be performed on directories, i.e., by pairwise comparison of files in those
48 ;; directories.
50 ;; In addition, Ediff can apply a patch to a file and then let you step
51 ;; though both files, the patched and the original one, simultaneously,
52 ;; difference-by-difference. You can even apply a patch right out of a
53 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
54 ;; Since Ediff lets you copy differences between buffers, you can, in
55 ;; effect, apply patches selectively (i.e., you can copy a difference
56 ;; region from file_orig to file, thereby undoing any particular patch that
57 ;; you don't like).
59 ;; Ediff is aware of version control, which lets the user compare
60 ;; files with their older versions. Ediff can also work with remote and
61 ;; compressed files. Details are given below.
63 ;; Finally, Ediff supports directory-level comparison, merging and patching.
64 ;; See the on-line manual for details.
66 ;; This package builds upon the ideas borrowed from emerge.el and several
67 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
68 ;; Ediff provides is also influenced by emerge.el.
70 ;; The present version of Ediff supersedes Emerge. It provides a superior user
71 ;; interface and has numerous major features not found in Emerge. In
72 ;; particular, it can do patching, and 2-way and 3-way file comparison,
73 ;; merging, and directory operations.
77 ;;; Bugs:
79 ;; 1. The undo command doesn't restore deleted regions well. That is, if
80 ;; you delete all characters in a difference region and then invoke
81 ;; `undo', the reinstated text will most likely be inserted outside of
82 ;; what Ediff thinks is the current difference region. (This problem
83 ;; doesn't seem to exist with XEmacs.)
84 ;;
85 ;; If at any point you feel that difference regions are no longer correct,
86 ;; you can hit '!' to recompute the differences.
88 ;; 2. On a monochrome display, the repertoire of faces with which to
89 ;; highlight fine differences is limited. By default, Ediff is using
90 ;; underlining. However, if the region is already underlined by some other
91 ;; overlays, there is no simple way to temporarily remove that residual
92 ;; underlining. This problem occurs when a buffer is highlighted with
93 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
94 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
95 ;; provide commands for unhighlighting buffers. You can either place these
96 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
97 ;; buffer used by Ediff) or you can execute them interactively, at any time
98 ;; and on any buffer.
101 ;;; Acknowledgements:
103 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
104 ;; Ediff would not have been possible without the help and encouragement of
105 ;; its many users. See Ediff on-line Info for the full list of those who
106 ;; helped. Improved defaults in Ediff file-name reading commands.
108 ;;; Code:
111 ;; Compiler pacifier
132 ))
133 ;; end pacifier
139 "A comprehensive visual interface to diff & patch."
145 "*If t, Ediff will use previous directory as default when reading file name."
149 ;; Last directory used by an Ediff command for file-A.
151 ;; Last directory used by an Ediff command for file-B.
153 ;; Last directory used by an Ediff command for file-C.
155 ;; Last directory used by an Ediff command for the ancestor file.
157 ;; Last directory used by an Ediff command as the output directory for merge.
161 ;; Used as a startup hook to set `_orig' patch file read-only.
166 ;; Return a plausible default for ediff's first file:
167 ;; In dired, return the file number FILENO (or 0) in the list
168 ;; (all-selected-files, filename under the cursor), where directories are
169 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
170 ;; if the buffer is visiting a file, return that file name.
177 aux-list choices result)
186 default)))
190 ))
192 ;;; Compare files/buffers
194 ;;;###autoload
196 "Run Ediff on a pair of files, FILE-A and FILE-B."
199 ediff-last-dir-A
200 default-directory))
201 dir-B f)
203 "File A to compare"
204 dir-A
210 ediff-last-dir-B
217 dir-B)))
219 )))
224 file-B)
225 nil ; file-C
226 startup-hooks
229 ;;;###autoload
231 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
234 ediff-last-dir-A
235 default-directory))
236 dir-B dir-C f ff)
238 "File A to compare"
239 dir-A
245 ediff-last-dir-B
252 dir-B)))
256 ediff-last-dir-C
263 dir-C)))
265 )))
270 file-B)
274 file-C)
275 startup-hooks
278 ;;;###autoload
282 ;; Visit FILE and arrange its buffer to Ediff's liking.
283 ;; FILE is actually a variable symbol that must contain a true file name.
284 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
285 ;; which FILE is read.
286 ;; LAST-DIR is the directory variable symbol where FILE's
287 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
288 ;; be assigned the hook to be executed after `ediff-startup' is finished.
289 ;; `ediff-find-file' arranges that the temp files it might create will be
290 ;; deleted.
300 ;; some of the commands, below, require full file name
303 ;; Record the directory of the file
307 ;; Setup the buffer
313 ;;; ange-ftp-hook-function--arrange for temp file
320 ;; file processed via auto-mode-alist, a la uncompress.el
332 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
342 ;;(sit-for 0)
345 ;;(sit-for 0)
350 ;;(sit-for 0)
357 buf-B file-B
358 buf-C file-C
359 startup-hooks
361 merge-buffer-file)))
364 ;;;###autoload
367 ;;;###autoload
369 "Run Ediff on FILE and its backup file.
370 Uses the latest backup, if there are several numerical backups.
371 If this file is a backup, `ediff' it with its original."
373 ;; The code is taken from `diff-backup'.
381 ori file))
384 ;;;###autoload
386 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
393 ;; realign buffers so that two visible bufs will be
394 ;; at the top
397 t))))
401 ;;;###autoload
405 ;;;###autoload
408 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
415 ;; realign buffers so that two visible
416 ;; bufs will be at the top
419 t))
422 ;; realign buffers so that three visible
423 ;; bufs will be at the top
426 t)
427 )))
431 ;;;###autoload
436 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
444 file-A file-B file-C)
468 file-C
473 startup-hooks)
475 merge-buffer-file)))
478 ;;; Directory and file group operations
480 ;; Get appropriate default name for directory:
481 ;; If ediff-use-last-dir, use ediff-last-dir-A.
482 ;; In dired mode, use the directory that is under the point (if any);
483 ;; otherwise, use default-directory
489 f
490 default-directory)))
494 ;;;###autoload
496 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
497 the same name in both. The third argument, REGEXP, is nil or a regular
498 expression; only file names that match the regexp are considered."
502 f)
507 ediff-last-dir-B
513 default-regexp)
515 nil
516 'ediff-filtering-regexp-history
518 )))
521 ))
523 ;;;###autoload
527 ;;;###autoload
529 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
530 The second argument, REGEXP, is a regular expression that filters the file
531 names. Only the files that are under revision control are taken into account."
535 )
541 default-regexp)
543 nil
544 'ediff-filtering-regexp-history
546 )))
549 ))
551 ;;;###autoload
555 ;;;###autoload
557 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
558 have the same name in all three. The last argument, REGEXP, is nil or a
559 regular expression; only file names that match the regexp are considered."
564 f)
568 ediff-last-dir-B
573 ediff-last-dir-C
579 default-regexp)
581 nil
582 'ediff-filtering-regexp-history
584 )))
587 ))
589 ;;;###autoload
592 ;;;###autoload
594 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
595 the same name in both. The third argument, REGEXP, is nil or a regular
596 expression; only file names that match the regexp are considered."
600 f)
605 ediff-last-dir-B
611 default-regexp)
613 nil
614 'ediff-filtering-regexp-history
616 )))
619 nil merge-autostore-dir
620 ))
622 ;;;###autoload
625 ;;;###autoload
627 &optional
628 merge-autostore-dir)
629 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
630 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
631 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
632 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
633 only file names that match the regexp are considered."
637 f)
641 ediff-last-dir-B
646 ediff-last-dir-C
652 default-regexp)
654 nil
655 'ediff-filtering-regexp-history
657 )))
659 dir1 dir2 ancestor-dir regexp
661 nil merge-autostore-dir
662 ))
664 ;;;###autoload
667 "Run Ediff on a directory, DIR1, merging its files with their revisions.
668 The second argument, REGEXP, is a regular expression that filters the file
669 names. Only the files that are under revision control are taken into account."
673 )
679 default-regexp)
681 nil
682 'ediff-filtering-regexp-history
684 )))
687 nil merge-autostore-dir
688 ))
690 ;;;###autoload
693 ;;;###autoload
695 &optional
696 merge-autostore-dir)
697 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
698 The second argument, REGEXP, is a regular expression that filters the file
699 names. Only the files that are under revision control are taken into account."
703 )
705 "Directory to merge with revisions and ancestors:"
710 default-regexp)
712 nil
713 'ediff-filtering-regexp-history
715 )))
717 dir1 regexp 'ediff-merge-revisions-with-ancestor
718 'ediff-merge-directory-revisions-with-ancestor
719 nil merge-autostore-dir
720 ))
722 ;;;###autoload
724 'edir-merge-revisions-with-ancestor
727 ;;;###autoload
730 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
731 ;; on a pair of directories (three directories, in case of ancestor).
732 ;; The third argument, REGEXP, is nil or a regular expression;
733 ;; only file names that match the regexp are considered.
734 ;; JOBNAME is the symbol indicating the meta-job to be performed.
735 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
737 &optional startup-hooks
738 merge-autostore-dir)
754 jobname)))
756 ;; It is a structure where ediff-intersect-directories returns
757 ;; commonalities and differences among directories
758 dir-diff-struct
759 meta-buf)
766 ediff-last-merge-autostore-dir
768 nil
770 ;; verify we are not merging into an orig directory
786 jobname
787 regexp dir1 dir2 dir3 merge-autostore-dir))
789 ;; this sets various vars in the meta buffer inside
790 ;; ediff-prepare-meta-buffer
792 ;; tell what to do if the user clicks on a session record
794 ;; set ediff-dir-difference-list
797 startup-hooks))
799 'ediff-filegroup-action
801 "*Ediff Session Group Panel"
802 'ediff-redraw-directory-group-buffer
803 jobname
804 startup-hooks))
806 ))
808 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
809 ;; files
811 &optional startup-hooks
812 merge-autostore-dir)
818 jobname)))
826 ediff-last-merge-autostore-dir
828 nil
830 ;; verify merge-autostore-dir != dir1
840 jobname regexp dir1 merge-autostore-dir))
842 ;; this sets various vars in the meta buffer inside
843 ;; ediff-prepare-meta-buffer
845 ;; tell what to do if the user clicks on a session record
847 startup-hooks))
849 'ediff-filegroup-action
850 file-list
851 "*Ediff Session Group Panel"
852 'ediff-redraw-directory-group-buffer
853 jobname
854 startup-hooks))
856 ))
859 ;;; Compare regions and windows
861 ;;;###autoload
863 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
864 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
865 follows:
866 If WIND-A is nil, use selected window.
867 If WIND-B is nil, use window next to WIND-A."
872 ;;;###autoload
874 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
875 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
876 follows:
877 If WIND-A is nil, use selected window.
878 If WIND-B is nil, use window next to WIND-A."
883 ;; Compare WIND-A and WIND-B, which are selected by clicking.
884 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
885 ;; works as follows:
886 ;; If WIND-A is nil, use selected window.
887 ;; If WIND-B is nil, use window next to WIND-A.
897 beg-A end-A beg-B end-B)
911 buffer-B
915 buffer-A beg-A end-A buffer-B beg-B end-B
916 startup-hooks job-name word-mode nil)))
919 ;;;###autoload
921 "Run Ediff on a pair of regions in specified buffers.
922 Regions \(i.e., point and mark\) are assumed to be set in advance except
923 for the second region in the case both regions are from the same buffer.
924 In such a case the user is asked to interactively establish the second
925 region.
926 This function is effective only for relatively small regions, up to 200
927 lines. For large regions, use `ediff-regions-linewise'."
934 ;; realign buffers so that two visible bufs will be
935 ;; at the top
938 t))))
949 reg-A-beg reg-A-end reg-B-beg reg-B-end)
963 ;;;###autoload
965 "Run Ediff on a pair of regions in specified buffers.
966 Regions \(i.e., point and mark\) are assumed to be set in advance except
967 for the second region in the case both regions are from the same buffer.
968 In such a case the user is asked to interactively establish the second
969 region.
970 Each region is enlarged to contain full lines.
971 This function is effective for large regions, over 100-200
972 lines. For small regions, use `ediff-regions-wordwise'."
979 ;; realign buffers so that two visible bufs will be
980 ;; at the top
983 t))))
993 reg-A-beg reg-A-end reg-B-beg reg-B-end)
998 ;; enlarge the region to hold full lines
1010 ;; enlarge the region to hold full lines
1025 ;; compare region beg-A to end-A of buffer-A
1026 ;; to regions beg-B -- end-B in buffer-B.
1028 startup-hooks job-name word-mode
1029 setup-parameters)
1031 overl-A overl-B
1032 file-A file-B)
1034 ;; in case beg/end-A/B aren't markers--make them into markers
1042 ;; make file-A
1048 ;; make file-B
1057 buffer-B file-B
1058 nil nil ; buffer & file C
1062 startup-hooks)
1067 setup-parameters))
1068 ))
1071 ;;; Merge files and buffers
1073 ;;;###autoload
1078 ;; Can't remember why this is here, but it may cause the automatically merged
1079 ;; buffer to be lost. So, keep the buffer modified.
1080 ;;(ediff-with-current-buffer ediff-buffer-C
1081 ;; (set-buffer-modified-p nil))
1082 )
1084 ;;;###autoload
1086 ;; MERGE-BUFFER-FILE is the file to be
1087 ;; associated with the merge buffer
1089 "Merge two files without ancestor."
1092 ediff-last-dir-A
1093 default-directory))
1094 dir-B f)
1096 "File A to merge"
1097 dir-A
1103 ediff-last-dir-B
1110 dir-B)))
1112 )))
1118 file-B)
1119 nil ; file-C
1120 startup-hooks
1121 'ediff-merge-files
1122 merge-buffer-file))
1124 ;;;###autoload
1126 &optional
1127 startup-hooks
1128 ;; MERGE-BUFFER-FILE is the file
1129 ;; to be associated with the
1130 ;; merge buffer
1131 merge-buffer-file)
1132 "Merge two files with ancestor."
1135 ediff-last-dir-A
1136 default-directory))
1137 dir-B dir-ancestor f ff)
1139 "File A to merge"
1140 dir-A
1146 ediff-last-dir-B
1153 dir-B)))
1158 ediff-last-dir-ancestor
1165 dir-ancestor)))
1167 )))
1173 file-B)
1174 file-ancestor
1175 startup-hooks
1176 'ediff-merge-files-with-ancestor
1177 merge-buffer-file))
1179 ;;;###autoload
1182 ;;;###autoload
1184 &optional
1185 ;; MERGE-BUFFER-FILE is the file to be
1186 ;; associated with the merge buffer
1187 startup-hooks job-name merge-buffer-file)
1188 "Merge buffers without ancestor."
1195 ;; realign buffers so that two visible bufs will be
1196 ;; at the top
1199 t))))
1204 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1206 ;;;###autoload
1208 &optional
1209 startup-hooks
1210 job-name
1211 ;; MERGE-BUFFER-FILE is the
1212 ;; file to be associated
1213 ;; with the merge buffer
1214 merge-buffer-file)
1215 "Merge buffers with ancestor."
1222 ;; realign buffers so that two visible
1223 ;; bufs will be at the top
1226 t))
1229 ;; realign buffers so that three visible
1230 ;; bufs will be at the top
1233 t)
1234 )))
1239 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1242 ;;;###autoload
1244 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1245 "Run Ediff by merging two revisions of a file.
1246 The file is the optional FILE argument or the file visited by the current
1247 buffer."
1254 "Version 1 to merge (default %s's working version): "
1257 rev2
1260 "Version 2 to merge (default %s): "
1264 ;; ancestor-revision=nil
1267 rev1 rev2 nil startup-hooks merge-buffer-file)))
1270 ;;;###autoload
1272 file startup-hooks
1273 ;; MERGE-BUFFER-FILE is the file to
1274 ;; be associated with the merge
1275 ;; buffer
1276 merge-buffer-file)
1277 "Run Ediff by merging two revisions of a file with a common ancestor.
1278 The file is the optional FILE argument or the file visited by the current
1279 buffer."
1286 "Version 1 to merge (default %s's working version): "
1289 rev2
1292 "Version 2 to merge (default %s): "
1295 ancestor-rev
1298 "Ancestor version (default %s's base revision): "
1304 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1306 ;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
1307 ;;;###autoload
1309 "Run Ediff-merge on appropriate revisions of the selected file.
1310 First run after `M-x cvs-update'. Then place the cursor on a line describing a
1311 file and then run `run-ediff-from-cvs-buffer'."
1320 ;;; Apply patch
1322 ;;;###autoload
1324 "Run Ediff by patching SOURCE-FILENAME.
1325 If optional PATCH-BUF is given, use the patch in that buffer
1326 and don't ask the user.
1327 If prefix argument, then: if even argument, assume that the patch is in a
1328 buffer. If odd -- assume it is in a file."
1344 "File to patch (directory, if multifile patch): "
1345 ;; use an explicit initial file
1349 ;;;###autoload
1351 "Run Ediff by patching the buffer specified at prompt.
1352 Without the optional prefix ARG, asks if the patch is in some buffer and
1353 prompts for the buffer or a file, depending on the answer.
1354 With ARG=1, assumes the patch is in a file and prompts for the file.
1355 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1356 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1357 patch. If not given, the user is prompted according to the prefix argument."
1364 patch-buf
1366 "Which buffer to patch? "
1370 ;;;###autoload
1372 ;;;###autoload
1377 \f
1378 ;;; Versions Control functions
1380 ;;;###autoload
1382 "Run Ediff by comparing versions of a file.
1383 The file is an optional FILE argument or the file entered at the prompt.
1384 Default: the file visited by the current buffer.
1385 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1386 ;; if buffer is non-nil, use that buffer instead of the current buffer
1392 ediff-last-dir-A
1393 default-directory)
1406 rev2
1413 rev1 rev2 startup-hooks)
1414 ))
1417 ;;;###autoload
1421 ;; Test if version control package is loaded and load if not
1422 ;; Is SILENT is non-nil, don't report error if package is not found.
1432 ediff-version-control-package)))))
1435 ;;;###autoload
1437 "Return string describing the version of Ediff.
1438 When called interactively, displays the version."
1445 ;;;###autoload
1447 "Display Ediff's manual.
1448 With optional NODE, goes to that node."
1474 "^Hmm... I don't see an Ediff command around here...$"
1475 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1476 ": This command runs in Ediff Control Buffer only!$"
1477 ": Invalid op in ediff-check-version$"
1478 "^ediff-shrink-window-C can be used only for merging jobs$"
1479 "^Lost difference info on these directories$"
1480 "^This command is inapplicable in the present context$"
1481 "^This session group has no parent$"
1482 "^Can't hide active session, $"
1483 "^Ediff: something wrong--no multiple diffs buffer$"
1484 "^Can't make context diff for Session $"
1485 "^The patch buffer wasn't found$"
1486 "^Aborted$"
1487 "^This Ediff session is not part of a session group$"
1488 "^No active Ediff sessions or corrupted session registry$"
1489 "^No session info in this line$"
1490 "^`.*' is not an ordinary file$"
1491 "^Patch appears to have failed$"
1492 "^Recomputation of differences cancelled$"
1493 "^No fine differences in this mode$"
1494 "^Lost connection to ancestor buffer...sorry$"
1495 "^Not merging with ancestor$"
1496 "^Don't know how to toggle read-only in buffer "
1497 "Emacs is not running as a window application$"
1498 "^This command makes sense only when merging with an ancestor$"
1499 "^At end of the difference list$"
1500 "^At beginning of the difference list$"
1501 "^Nothing saved for diff .* in buffer "
1502 "^Buffer is out of sync for file "
1503 "^Buffer out of sync for file "
1504 "^Output from `diff' not found$"
1505 "^You forgot to specify a region in buffer "
1506 "^All right. Make up your mind and come back...$"
1507 "^Current buffer is not visiting any file$"
1508 "^Failed to retrieve revision: $"
1509 "^Can't determine display width.$"
1510 "^File `.*' does not exist or is not readable$"
1511 "^File `.*' is a directory$"
1512 "^Buffer .* doesn't exist$"
1513 "^Directories . and . are the same: "
1514 "^Directory merge aborted$"
1515 "^Merge of directory revisions aborted$"
1516 "^Buffer .* doesn't exist$"
1517 "^There is no file to merge$"
1529 ;;; Local Variables:
1530 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1531 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1532 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1533 ;;; End:
1535 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1536 ;;; ediff.el ends here