| blob | 6abcb242c752c7f25b03ecada1afc47c2e9733fc |
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
138 )
139 ;; end pacifier
145 "A comprehensive visual interface to diff & patch."
151 "*If t, Ediff will use previous directory as default when reading file name."
155 ;; Last directory used by an Ediff command for file-A.
157 ;; Last directory used by an Ediff command for file-B.
159 ;; Last directory used by an Ediff command for file-C.
161 ;; Last directory used by an Ediff command for the ancestor file.
163 ;; Last directory used by an Ediff command as the output directory for merge.
167 ;; Used as a startup hook to set `_orig' patch file read-only.
172 ;; Return a plausible default for ediff's first file:
173 ;; In dired, return the file number FILENO (or 0) in the list
174 ;; (all-selected-files, filename under the cursor), where directories are
175 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
176 ;; if the buffer is visiting a file, return that file name.
183 aux-list choices result)
192 default)))
196 ))
198 ;;; Compare files/buffers
200 ;;;###autoload
202 "Run Ediff on a pair of files, FILE-A and FILE-B."
205 ediff-last-dir-A
206 default-directory))
207 dir-B f)
209 "File A to compare"
210 dir-A
216 ediff-last-dir-B
220 'file-name-history
224 dir-B)))
226 )))
231 file-B)
232 nil ; file-C
233 startup-hooks
236 ;;;###autoload
238 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
241 ediff-last-dir-A
242 default-directory))
243 dir-B dir-C f ff)
245 "File A to compare"
246 dir-A
252 ediff-last-dir-B
256 'file-name-history
260 dir-B)))
264 ediff-last-dir-C
268 'file-name-history
272 dir-C)))
274 )))
279 file-B)
283 file-C)
284 startup-hooks
287 ;;;###autoload
291 ;; Visit FILE and arrange its buffer to Ediff's liking.
292 ;; FILE is actually a variable symbol that must contain a true file name.
293 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
294 ;; which FILE is read.
295 ;; LAST-DIR is the directory variable symbol where FILE's
296 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
297 ;; be assigned the hook to be executed after `ediff-startup' is finished.
298 ;; `ediff-find-file' arranges that the temp files it might create will be
299 ;; deleted.
309 ;; some of the commands, below, require full file name
312 ;; Record the directory of the file
316 ;; Setup the buffer
322 ;;; ange-ftp-hook-function--arrange for temp file
329 ;; file processed via auto-mode-alist, a la uncompress.el
341 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
351 ;;(sit-for 0)
354 ;;(sit-for 0)
359 ;;(sit-for 0)
366 buf-B file-B
367 buf-C file-C
368 startup-hooks
370 merge-buffer-file)))
374 ;;;###autoload
377 ;;;###autoload
379 "Run Ediff on FILE and its backup file.
380 Uses the latest backup, if there are several numerical backups.
381 If this file is a backup, `ediff' it with its original."
383 ;; The code is taken from `diff-backup'.
391 ori file))
394 ;;;###autoload
396 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
403 ;; realign buffers so that two visible bufs will be
404 ;; at the top
407 t))))
411 ;;;###autoload
415 ;;;###autoload
418 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
425 ;; realign buffers so that two visible
426 ;; bufs will be at the top
429 t))
432 ;; realign buffers so that three visible
433 ;; bufs will be at the top
436 t)
437 )))
441 ;;;###autoload
446 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
454 file-A file-B file-C)
478 file-C
483 startup-hooks)
485 merge-buffer-file)))
488 ;;; Directory and file group operations
490 ;; Get appropriate default name for directory:
491 ;; If ediff-use-last-dir, use ediff-last-dir-A.
492 ;; In dired mode, use the directory that is under the point (if any);
493 ;; otherwise, use default-directory
499 f
500 default-directory)))
504 ;;;###autoload
506 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
507 the same name in both. The third argument, REGEXP, is nil or a regular
508 expression; only file names that match the regexp are considered."
512 f)
517 ediff-last-dir-B
523 default-regexp)
525 nil
526 'ediff-filtering-regexp-history
528 )))
531 ))
533 ;;;###autoload
537 ;;;###autoload
539 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
540 The second argument, REGEXP, is a regular expression that filters the file
541 names. Only the files that are under revision control are taken into account."
545 )
551 default-regexp)
553 nil
554 'ediff-filtering-regexp-history
556 )))
559 ))
561 ;;;###autoload
565 ;;;###autoload
567 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
568 have the same name in all three. The last argument, REGEXP, is nil or a
569 regular expression; only file names that match the regexp are considered."
574 f)
578 ediff-last-dir-B
583 ediff-last-dir-C
589 default-regexp)
591 nil
592 'ediff-filtering-regexp-history
594 )))
597 ))
599 ;;;###autoload
602 ;;;###autoload
604 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
605 the same name in both. The third argument, REGEXP, is nil or a regular
606 expression; only file names that match the regexp are considered."
610 f)
615 ediff-last-dir-B
621 default-regexp)
623 nil
624 'ediff-filtering-regexp-history
626 )))
629 nil merge-autostore-dir
630 ))
632 ;;;###autoload
635 ;;;###autoload
637 &optional
638 merge-autostore-dir)
639 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
640 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
641 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
642 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
643 only file names that match the regexp are considered."
647 f)
651 ediff-last-dir-B
656 ediff-last-dir-C
662 default-regexp)
664 nil
665 'ediff-filtering-regexp-history
667 )))
669 dir1 dir2 ancestor-dir regexp
671 nil merge-autostore-dir
672 ))
674 ;;;###autoload
677 "Run Ediff on a directory, DIR1, merging its files with their revisions.
678 The second argument, REGEXP, is a regular expression that filters the file
679 names. Only the files that are under revision control are taken into account."
683 )
689 default-regexp)
691 nil
692 'ediff-filtering-regexp-history
694 )))
697 nil merge-autostore-dir
698 ))
700 ;;;###autoload
703 ;;;###autoload
705 &optional
706 merge-autostore-dir)
707 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
708 The second argument, REGEXP, is a regular expression that filters the file
709 names. Only the files that are under revision control are taken into account."
713 )
715 "Directory to merge with revisions and ancestors:"
720 default-regexp)
722 nil
723 'ediff-filtering-regexp-history
725 )))
727 dir1 regexp 'ediff-merge-revisions-with-ancestor
728 'ediff-merge-directory-revisions-with-ancestor
729 nil merge-autostore-dir
730 ))
732 ;;;###autoload
734 'edir-merge-revisions-with-ancestor
737 ;;;###autoload
740 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
741 ;; on a pair of directories (three directories, in case of ancestor).
742 ;; The third argument, REGEXP, is nil or a regular expression;
743 ;; only file names that match the regexp are considered.
744 ;; JOBNAME is the symbol indicating the meta-job to be performed.
745 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
747 &optional startup-hooks
748 merge-autostore-dir)
764 jobname)))
766 ;; It is a structure where ediff-intersect-directories returns
767 ;; commonalities and differences among directories
768 dir-diff-struct
769 meta-buf)
776 ediff-last-merge-autostore-dir
778 nil
780 ;; verify we are not merging into an orig directory
796 jobname
797 regexp dir1 dir2 dir3 merge-autostore-dir))
799 ;; this sets various vars in the meta buffer inside
800 ;; ediff-prepare-meta-buffer
802 ;; tell what to do if the user clicks on a session record
804 ;; set ediff-dir-difference-list
807 startup-hooks))
809 'ediff-filegroup-action
811 "*Ediff Session Group Panel"
812 'ediff-redraw-directory-group-buffer
813 jobname
814 startup-hooks))
816 ))
818 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
819 ;; files
821 &optional startup-hooks
822 merge-autostore-dir)
828 jobname)))
836 ediff-last-merge-autostore-dir
838 nil
840 ;; verify merge-autostore-dir != dir1
850 jobname regexp dir1 merge-autostore-dir))
852 ;; this sets various vars in the meta buffer inside
853 ;; ediff-prepare-meta-buffer
855 ;; tell what to do if the user clicks on a session record
857 startup-hooks))
859 'ediff-filegroup-action
860 file-list
861 "*Ediff Session Group Panel"
862 'ediff-redraw-directory-group-buffer
863 jobname
864 startup-hooks))
866 ))
869 ;;; Compare regions and windows
871 ;;;###autoload
873 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
874 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
875 follows:
876 If WIND-A is nil, use selected window.
877 If WIND-B is nil, use window next to WIND-A."
882 ;;;###autoload
884 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
885 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
886 follows:
887 If WIND-A is nil, use selected window.
888 If WIND-B is nil, use window next to WIND-A."
893 ;; Compare WIND-A and WIND-B, which are selected by clicking.
894 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
895 ;; works as follows:
896 ;; If WIND-A is nil, use selected window.
897 ;; If WIND-B is nil, use window next to WIND-A.
907 beg-A end-A beg-B end-B)
921 buffer-B
925 buffer-A beg-A end-A buffer-B beg-B end-B
926 startup-hooks job-name word-mode nil)))
929 ;;;###autoload
931 "Run Ediff on a pair of regions in specified buffers.
932 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
933 This function is effective only for relatively small regions, up to 200
934 lines. For large regions, use `ediff-regions-linewise'."
941 ;; realign buffers so that two visible bufs will be
942 ;; at the top
945 t))))
956 reg-A-beg reg-A-end reg-B-beg reg-B-end)
970 ;;;###autoload
972 "Run Ediff on a pair of regions in specified buffers.
973 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
974 Each region is enlarged to contain full lines.
975 This function is effective for large regions, over 100-200
976 lines. For small regions, use `ediff-regions-wordwise'."
983 ;; realign buffers so that two visible bufs will be
984 ;; at the top
987 t))))
997 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1002 ;; enlarge the region to hold full lines
1014 ;; enlarge the region to hold full lines
1029 ;; compare region beg-A to end-A of buffer-A
1030 ;; to regions beg-B -- end-B in buffer-B.
1032 startup-hooks job-name word-mode
1033 setup-parameters)
1035 overl-A overl-B
1036 file-A file-B)
1038 ;; in case beg/end-A/B aren't markers--make them into markers
1046 ;; make file-A
1052 ;; make file-B
1061 buffer-B file-B
1062 nil nil ; buffer & file C
1066 startup-hooks)
1071 setup-parameters))
1072 ))
1075 ;;; Merge files and buffers
1077 ;;;###autoload
1082 ;; Can't remember why this is here, but it may cause the automatically merged
1083 ;; buffer to be lost. So, keep the buffer modified.
1084 ;;(ediff-with-current-buffer ediff-buffer-C
1085 ;; (set-buffer-modified-p nil))
1086 )
1088 ;;;###autoload
1090 ;; MERGE-BUFFER-FILE is the file to be
1091 ;; associated with the merge buffer
1093 "Merge two files without ancestor."
1096 ediff-last-dir-A
1097 default-directory))
1098 dir-B f)
1100 "File A to merge"
1101 dir-A
1107 ediff-last-dir-B
1111 'file-name-history
1115 dir-B)))
1117 )))
1123 file-B)
1124 nil ; file-C
1125 startup-hooks
1126 'ediff-merge-files
1127 merge-buffer-file))
1129 ;;;###autoload
1131 &optional
1132 startup-hooks
1133 ;; MERGE-BUFFER-FILE is the file
1134 ;; to be associated with the
1135 ;; merge buffer
1136 merge-buffer-file)
1137 "Merge two files with ancestor."
1140 ediff-last-dir-A
1141 default-directory))
1142 dir-B dir-ancestor f ff)
1144 "File A to merge"
1145 dir-A
1151 ediff-last-dir-B
1155 'file-name-history
1159 dir-B)))
1164 ediff-last-dir-ancestor
1168 'file-name-history
1172 dir-ancestor)))
1174 )))
1180 file-B)
1181 file-ancestor
1182 startup-hooks
1183 'ediff-merge-files-with-ancestor
1184 merge-buffer-file))
1186 ;;;###autoload
1189 ;;;###autoload
1191 &optional
1192 ;; MERGE-BUFFER-FILE is the file to be
1193 ;; associated with the merge buffer
1194 startup-hooks job-name merge-buffer-file)
1195 "Merge buffers without ancestor."
1202 ;; realign buffers so that two visible bufs will be
1203 ;; at the top
1206 t))))
1211 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1213 ;;;###autoload
1215 &optional
1216 startup-hooks
1217 job-name
1218 ;; MERGE-BUFFER-FILE is the
1219 ;; file to be associated
1220 ;; with the merge buffer
1221 merge-buffer-file)
1222 "Merge buffers with ancestor."
1229 ;; realign buffers so that two visible
1230 ;; bufs will be at the top
1233 t))
1236 ;; realign buffers so that three visible
1237 ;; bufs will be at the top
1240 t)
1241 )))
1246 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1249 ;;;###autoload
1251 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1252 "Run Ediff by merging two revisions of a file.
1253 The file is the optional FILE argument or the file visited by the current
1254 buffer."
1261 "Version 1 to merge (default %s's working version): "
1264 rev2
1267 "Version 2 to merge (default %s): "
1271 ;; ancestor-revision=nil
1274 rev1 rev2 nil startup-hooks merge-buffer-file)))
1277 ;;;###autoload
1279 file startup-hooks
1280 ;; MERGE-BUFFER-FILE is the file to
1281 ;; be associated with the merge
1282 ;; buffer
1283 merge-buffer-file)
1284 "Run Ediff by merging two revisions of a file with a common ancestor.
1285 The file is the optional FILE argument or the file visited by the current
1286 buffer."
1293 "Version 1 to merge (default %s's working version): "
1296 rev2
1299 "Version 2 to merge (default %s): "
1302 ancestor-rev
1305 "Ancestor version (default %s's base revision): "
1311 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1313 ;;; Apply patch
1315 ;;;###autoload
1317 "Run Ediff by patching SOURCE-FILENAME.
1318 If optional PATCH-BUF is given, use the patch in that buffer
1319 and don't ask the user.
1320 If prefix argument, then: if even argument, assume that the patch is in a
1321 buffer. If odd -- assume it is in a file."
1337 "File to patch (directory, if multifile patch): "
1338 ;; use an explicit initial file
1342 ;;;###autoload
1344 "Run Ediff by patching the buffer specified at prompt.
1345 Without the optional prefix ARG, asks if the patch is in some buffer and
1346 prompts for the buffer or a file, depending on the answer.
1347 With ARG=1, assumes the patch is in a file and prompts for the file.
1348 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1349 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1350 patch. If not given, the user is prompted according to the prefix argument."
1357 patch-buf
1359 "Which buffer to patch? "
1363 ;;;###autoload
1365 ;;;###autoload
1370 \f
1371 ;;; Versions Control functions
1373 ;;;###autoload
1375 "Run Ediff by comparing versions of a file.
1376 The file is an optional FILE argument or the file entered at the prompt.
1377 Default: the file visited by the current buffer.
1378 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1379 ;; if buffer is non-nil, use that buffer instead of the current buffer
1385 ediff-last-dir-A
1386 default-directory)
1399 rev2
1406 rev1 rev2 startup-hooks)
1407 ))
1410 ;;;###autoload
1414 ;; Test if version control package is loaded and load if not
1415 ;; Is SILENT is non-nil, don't report error if package is not found.
1425 ediff-version-control-package)))))
1428 ;;;###autoload
1430 "Return string describing the version of Ediff.
1431 When called interactively, displays the version."
1437 ;; info is run first, and will autoload info.el.
1440 ;;;###autoload
1442 "Display Ediff's manual.
1443 With optional NODE, goes to that node."
1469 "^Hmm... I don't see an Ediff command around here...$"
1470 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1471 ": This command runs in Ediff Control Buffer only!$"
1472 ": Invalid op in ediff-check-version$"
1473 "^ediff-shrink-window-C can be used only for merging jobs$"
1474 "^Lost difference info on these directories$"
1475 "^This command is inapplicable in the present context$"
1476 "^This session group has no parent$"
1477 "^Can't hide active session, $"
1478 "^Ediff: something wrong--no multiple diffs buffer$"
1479 "^Can't make context diff for Session $"
1480 "^The patch buffer wasn't found$"
1481 "^Aborted$"
1482 "^This Ediff session is not part of a session group$"
1483 "^No active Ediff sessions or corrupted session registry$"
1484 "^No session info in this line$"
1485 "^`.*' is not an ordinary file$"
1486 "^Patch appears to have failed$"
1487 "^Recomputation of differences cancelled$"
1488 "^No fine differences in this mode$"
1489 "^Lost connection to ancestor buffer...sorry$"
1490 "^Not merging with ancestor$"
1491 "^Don't know how to toggle read-only in buffer "
1492 "Emacs is not running as a window application$"
1493 "^This command makes sense only when merging with an ancestor$"
1494 "^At end of the difference list$"
1495 "^At beginning of the difference list$"
1496 "^Nothing saved for diff .* in buffer "
1497 "^Buffer is out of sync for file "
1498 "^Buffer out of sync for file "
1499 "^Output from `diff' not found$"
1500 "^You forgot to specify a region in buffer "
1501 "^All right. Make up your mind and come back...$"
1502 "^Current buffer is not visiting any file$"
1503 "^Failed to retrieve revision: $"
1504 "^Can't determine display width.$"
1505 "^File `.*' does not exist or is not readable$"
1506 "^File `.*' is a directory$"
1507 "^Buffer .* doesn't exist$"
1508 "^Directories . and . are the same: "
1509 "^Directory merge aborted$"
1510 "^Merge of directory revisions aborted$"
1511 "^Buffer .* doesn't exist$"
1512 "^There is no file to merge$"
1522 ;;; Local Variables:
1523 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1524 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1525 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1526 ;;; End:
1528 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1529 ;;; ediff.el ends here