| blob | 6243c040e2c11424fdcdc9312acc28e73e410d8f |
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, 2009 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 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 ;;; Acknowledgements:
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
124 ;; end pacifier
130 "A comprehensive visual interface to diff & patch."
136 "If t, Ediff will use previous directory as default when reading file name."
140 ;; Last directory used by an Ediff command for file-A.
142 ;; Last directory used by an Ediff command for file-B.
144 ;; Last directory used by an Ediff command for file-C.
146 ;; Last directory used by an Ediff command for the ancestor file.
148 ;; Last directory used by an Ediff command as the output directory for merge.
152 ;; Used as a startup hook to set `_orig' patch file read-only.
157 ;; Return a plausible default for ediff's first file:
158 ;; In dired, return the file number FILENO (or 0) in the list
159 ;; (all-selected-files, filename under the cursor), where directories are
160 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
161 ;; if the buffer is visiting a file, return that file name.
168 aux-list choices result)
177 default)))
181 ))
183 ;;; Compare files/buffers
185 ;;;###autoload
187 "Run Ediff on a pair of files, FILE-A and FILE-B."
190 ediff-last-dir-A
191 default-directory))
192 dir-B f)
194 "File A to compare"
195 dir-A
201 ediff-last-dir-B
205 'file-name-history
209 dir-B)))
211 )))
216 file-B)
217 nil ; file-C
218 startup-hooks
221 ;;;###autoload
223 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
226 ediff-last-dir-A
227 default-directory))
228 dir-B dir-C f ff)
230 "File A to compare"
231 dir-A
237 ediff-last-dir-B
241 'file-name-history
245 dir-B)))
249 ediff-last-dir-C
253 'file-name-history
257 dir-C)))
259 )))
264 file-B)
268 file-C)
269 startup-hooks
272 ;;;###autoload
277 "Visit FILE and arrange its buffer to Ediff's liking.
278 FILE-VAR is actually a variable symbol whose value must contain a true
279 file name.
280 BUFFER-NAME is a variable symbol, which will get the buffer object into
281 which FILE is read.
282 LAST-DIR is the directory variable symbol where FILE's
283 directory name should be returned. HOOKS-VAR is a variable symbol that will
284 be assigned the hook to be executed after `ediff-startup' is finished.
285 `ediff-find-file' arranges that the temp files it might create will be
286 deleted."
295 ;; some of the commands, below, require full file name
298 ;; Record the directory of the file
302 ;; Setup the buffer
308 ;;; ange-ftp-hook-function--arrange for temp file
315 ;; file processed via auto-mode-alist, a la uncompress.el
327 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
337 ;;(sit-for 0)
340 ;;(sit-for 0)
345 ;;(sit-for 0)
352 buf-B file-B
353 buf-C file-C
354 startup-hooks
356 merge-buffer-file)))
360 ;;;###autoload
363 ;;;###autoload
365 "Start ediff between current buffer and its file on disk.
366 This command can be used instead of `revert-buffer'. If there is
367 nothing to revert then this command fails."
370 revert-buffer-insert-file-contents-function
377 buffer-auto-save-file-name
382 buffer-auto-save-file-name
383 buffer-file-name))
395 ;; Assume same modes:
400 ;;;###autoload
402 "Run Ediff on FILE and its backup file.
403 Uses the latest backup, if there are several numerical backups.
404 If this file is a backup, `ediff' it with its original."
406 ;; The code is taken from `diff-backup'.
414 ori file))
417 ;;;###autoload
419 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
426 ;; realign buffers so that two visible bufs will be
427 ;; at the top
430 t))))
434 ;;;###autoload
438 ;;;###autoload
441 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
448 ;; realign buffers so that two visible
449 ;; bufs will be at the top
452 t))
455 ;; realign buffers so that three visible
456 ;; bufs will be at the top
459 t)
460 )))
464 ;;;###autoload
469 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
477 file-A file-B file-C)
501 file-C
506 startup-hooks)
508 merge-buffer-file)))
511 ;;; Directory and file group operations
513 ;; Get appropriate default name for directory:
514 ;; If ediff-use-last-dir, use ediff-last-dir-A.
515 ;; In dired mode, use the directory that is under the point (if any);
516 ;; otherwise, use default-directory
522 f
523 default-directory)))
527 ;;;###autoload
529 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
530 the same name in both. The third argument, REGEXP, is nil or a regular
531 expression; only file names that match the regexp are considered."
535 f)
540 ediff-last-dir-B
546 default-regexp)
548 nil
549 'ediff-filtering-regexp-history
551 )))
554 ))
556 ;;;###autoload
560 ;;;###autoload
562 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
563 The second argument, REGEXP, is a regular expression that filters the file
564 names. Only the files that are under revision control are taken into account."
568 )
574 default-regexp)
576 nil
577 'ediff-filtering-regexp-history
579 )))
582 ))
584 ;;;###autoload
588 ;;;###autoload
590 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
591 have the same name in all three. The last argument, REGEXP, is nil or a
592 regular expression; only file names that match the regexp are considered."
597 f)
601 ediff-last-dir-B
606 ediff-last-dir-C
612 default-regexp)
614 nil
615 'ediff-filtering-regexp-history
617 )))
620 ))
622 ;;;###autoload
625 ;;;###autoload
627 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
628 the same name in both. The third argument, REGEXP, is nil or a regular
629 expression; only file names that match the regexp are considered."
633 f)
638 ediff-last-dir-B
644 default-regexp)
646 nil
647 'ediff-filtering-regexp-history
649 )))
652 nil merge-autostore-dir
653 ))
655 ;;;###autoload
658 ;;;###autoload
660 &optional
661 merge-autostore-dir)
662 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
663 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
664 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
665 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
666 only file names that match the regexp are considered."
670 f)
674 ediff-last-dir-B
679 ediff-last-dir-C
685 default-regexp)
687 nil
688 'ediff-filtering-regexp-history
690 )))
692 dir1 dir2 ancestor-dir regexp
694 nil merge-autostore-dir
695 ))
697 ;;;###autoload
700 "Run Ediff on a directory, DIR1, merging its files with their revisions.
701 The second argument, REGEXP, is a regular expression that filters the file
702 names. Only the files that are under revision control are taken into account."
706 )
712 default-regexp)
714 nil
715 'ediff-filtering-regexp-history
717 )))
720 nil merge-autostore-dir
721 ))
723 ;;;###autoload
726 ;;;###autoload
728 &optional
729 merge-autostore-dir)
730 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
731 The second argument, REGEXP, is a regular expression that filters the file
732 names. Only the files that are under revision control are taken into account."
736 )
738 "Directory to merge with revisions and ancestors:"
743 default-regexp)
745 nil
746 'ediff-filtering-regexp-history
748 )))
750 dir1 regexp 'ediff-merge-revisions-with-ancestor
751 'ediff-merge-directory-revisions-with-ancestor
752 nil merge-autostore-dir
753 ))
755 ;;;###autoload
757 'edir-merge-revisions-with-ancestor
760 ;;;###autoload
763 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
764 ;; on a pair of directories (three directories, in case of ancestor).
765 ;; The third argument, REGEXP, is nil or a regular expression;
766 ;; only file names that match the regexp are considered.
767 ;; JOBNAME is the symbol indicating the meta-job to be performed.
768 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
770 &optional startup-hooks
771 merge-autostore-dir)
787 jobname)))
789 ;; It is a structure where ediff-intersect-directories returns
790 ;; commonalities and differences among directories
791 dir-diff-struct
792 meta-buf)
799 ediff-last-merge-autostore-dir
801 nil
803 ;; verify we are not merging into an orig directory
819 jobname
820 regexp dir1 dir2 dir3 merge-autostore-dir))
822 ;; this sets various vars in the meta buffer inside
823 ;; ediff-prepare-meta-buffer
825 ;; tell what to do if the user clicks on a session record
827 ;; set ediff-dir-difference-list
830 startup-hooks))
832 'ediff-filegroup-action
834 "*Ediff Session Group Panel"
835 'ediff-redraw-directory-group-buffer
836 jobname
837 startup-hooks))
839 ))
841 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
842 ;; files
844 &optional startup-hooks
845 merge-autostore-dir)
851 jobname)))
859 ediff-last-merge-autostore-dir
861 nil
863 ;; verify merge-autostore-dir != dir1
873 jobname regexp dir1 merge-autostore-dir))
875 ;; this sets various vars in the meta buffer inside
876 ;; ediff-prepare-meta-buffer
878 ;; tell what to do if the user clicks on a session record
880 startup-hooks))
882 'ediff-filegroup-action
883 file-list
884 "*Ediff Session Group Panel"
885 'ediff-redraw-directory-group-buffer
886 jobname
887 startup-hooks))
889 ))
892 ;;; Compare regions and windows
894 ;;;###autoload
896 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
897 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
898 follows:
899 If WIND-A is nil, use selected window.
900 If WIND-B is nil, use window next to WIND-A."
905 ;;;###autoload
907 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
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 ;; Compare WIND-A and WIND-B, which are selected by clicking.
917 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
918 ;; works as follows:
919 ;; If WIND-A is nil, use selected window.
920 ;; If WIND-B is nil, use window next to WIND-A.
930 beg-A end-A beg-B end-B)
944 buffer-B
948 buffer-A beg-A end-A buffer-B beg-B end-B
949 startup-hooks job-name word-mode nil)))
952 ;;;###autoload
954 "Run Ediff on a pair of regions in specified buffers.
955 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
956 This function is effective only for relatively small regions, up to 200
957 lines. For large regions, use `ediff-regions-linewise'."
964 ;; realign buffers so that two visible bufs will be
965 ;; at the top
968 t))))
979 reg-A-beg reg-A-end reg-B-beg reg-B-end)
993 ;;;###autoload
995 "Run Ediff on a pair of regions in specified buffers.
996 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
997 Each region is enlarged to contain full lines.
998 This function is effective for large regions, over 100-200
999 lines. For small regions, use `ediff-regions-wordwise'."
1006 ;; realign buffers so that two visible bufs will be
1007 ;; at the top
1010 t))))
1020 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1025 ;; enlarge the region to hold full lines
1037 ;; enlarge the region to hold full lines
1052 ;; compare region beg-A to end-A of buffer-A
1053 ;; to regions beg-B -- end-B in buffer-B.
1055 startup-hooks job-name word-mode
1056 setup-parameters)
1058 overl-A overl-B
1059 file-A file-B)
1061 ;; in case beg/end-A/B aren't markers--make them into markers
1069 ;; make file-A
1075 ;; make file-B
1084 buffer-B file-B
1085 nil nil ; buffer & file C
1089 startup-hooks)
1094 setup-parameters))
1095 ))
1098 ;;; Merge files and buffers
1100 ;;;###autoload
1105 ;; Can't remember why this is here, but it may cause the automatically merged
1106 ;; buffer to be lost. So, keep the buffer modified.
1107 ;;(ediff-with-current-buffer ediff-buffer-C
1108 ;; (set-buffer-modified-p nil))
1109 )
1111 ;;;###autoload
1113 ;; MERGE-BUFFER-FILE is the file to be
1114 ;; associated with the merge buffer
1116 "Merge two files without ancestor."
1119 ediff-last-dir-A
1120 default-directory))
1121 dir-B f)
1123 "File A to merge"
1124 dir-A
1130 ediff-last-dir-B
1134 'file-name-history
1138 dir-B)))
1140 )))
1146 file-B)
1147 nil ; file-C
1148 startup-hooks
1149 'ediff-merge-files
1150 merge-buffer-file))
1152 ;;;###autoload
1154 &optional
1155 startup-hooks
1156 ;; MERGE-BUFFER-FILE is the file
1157 ;; to be associated with the
1158 ;; merge buffer
1159 merge-buffer-file)
1160 "Merge two files with ancestor."
1163 ediff-last-dir-A
1164 default-directory))
1165 dir-B dir-ancestor f ff)
1167 "File A to merge"
1168 dir-A
1174 ediff-last-dir-B
1178 'file-name-history
1182 dir-B)))
1187 ediff-last-dir-ancestor
1191 'file-name-history
1195 dir-ancestor)))
1197 )))
1203 file-B)
1204 file-ancestor
1205 startup-hooks
1206 'ediff-merge-files-with-ancestor
1207 merge-buffer-file))
1209 ;;;###autoload
1212 ;;;###autoload
1214 &optional
1215 ;; MERGE-BUFFER-FILE is the file to be
1216 ;; associated with the merge buffer
1217 startup-hooks job-name merge-buffer-file)
1218 "Merge buffers without ancestor."
1225 ;; realign buffers so that two visible bufs will be
1226 ;; at the top
1229 t))))
1234 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1236 ;;;###autoload
1238 &optional
1239 startup-hooks
1240 job-name
1241 ;; MERGE-BUFFER-FILE is the
1242 ;; file to be associated
1243 ;; with the merge buffer
1244 merge-buffer-file)
1245 "Merge buffers with ancestor."
1252 ;; realign buffers so that two visible
1253 ;; bufs will be at the top
1256 t))
1259 ;; realign buffers so that three visible
1260 ;; bufs will be at the top
1263 t)
1264 )))
1269 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1272 ;;;###autoload
1274 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1275 "Run Ediff by merging two revisions of a file.
1276 The file is the optional FILE argument or the file visited by the current
1277 buffer."
1284 "Version 1 to merge (default %s's working version): "
1287 rev2
1290 "Version 2 to merge (default %s): "
1294 ;; ancestor-revision=nil
1297 rev1 rev2 nil startup-hooks merge-buffer-file)))
1300 ;;;###autoload
1302 file startup-hooks
1303 ;; MERGE-BUFFER-FILE is the file to
1304 ;; be associated with the merge
1305 ;; buffer
1306 merge-buffer-file)
1307 "Run Ediff by merging two revisions of a file with a common ancestor.
1308 The file is the optional FILE argument or the file visited by the current
1309 buffer."
1316 "Version 1 to merge (default %s's working version): "
1319 rev2
1322 "Version 2 to merge (default %s): "
1325 ancestor-rev
1328 "Ancestor version (default %s's base revision): "
1334 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1336 ;;; Apply patch
1338 ;;;###autoload
1340 "Run Ediff by patching SOURCE-FILENAME.
1341 If optional PATCH-BUF is given, use the patch in that buffer
1342 and don't ask the user.
1343 If prefix argument, then: if even argument, assume that the patch is in a
1344 buffer. If odd -- assume it is in a file."
1360 "File to patch (directory, if multifile patch): "
1361 ;; use an explicit initial file
1365 ;;;###autoload
1367 "Run Ediff by patching the buffer specified at prompt.
1368 Without the optional prefix ARG, asks if the patch is in some buffer and
1369 prompts for the buffer or a file, depending on the answer.
1370 With ARG=1, assumes the patch is in a file and prompts for the file.
1371 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1372 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1373 patch. If not given, the user is prompted according to the prefix argument."
1380 patch-buf
1382 "Which buffer to patch? "
1386 ;;;###autoload
1388 ;;;###autoload
1393 \f
1394 ;;; Versions Control functions
1396 ;;;###autoload
1398 "Run Ediff by comparing versions of a file.
1399 The file is an optional FILE argument or the file entered at the prompt.
1400 Default: the file visited by the current buffer.
1401 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1402 ;; if buffer is non-nil, use that buffer instead of the current buffer
1408 ediff-last-dir-A
1409 default-directory)
1422 rev2
1429 rev1 rev2 startup-hooks)
1430 ))
1433 ;;;###autoload
1437 ;; Test if version control package is loaded and load if not
1438 ;; Is SILENT is non-nil, don't report error if package is not found.
1448 ediff-version-control-package)))))
1451 ;;;###autoload
1453 "Return string describing the version of Ediff.
1454 When called interactively, displays the version."
1460 ;; info is run first, and will autoload info.el.
1463 ;;;###autoload
1465 "Display Ediff's manual.
1466 With optional NODE, goes to that node."
1492 "^Hmm... I don't see an Ediff command around here...$"
1493 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1494 ": This command runs in Ediff Control Buffer only!$"
1495 ": Invalid op in ediff-check-version$"
1496 "^ediff-shrink-window-C can be used only for merging jobs$"
1497 "^Lost difference info on these directories$"
1498 "^This command is inapplicable in the present context$"
1499 "^This session group has no parent$"
1500 "^Can't hide active session, $"
1501 "^Ediff: something wrong--no multiple diffs buffer$"
1502 "^Can't make context diff for Session $"
1503 "^The patch buffer wasn't found$"
1504 "^Aborted$"
1505 "^This Ediff session is not part of a session group$"
1506 "^No active Ediff sessions or corrupted session registry$"
1507 "^No session info in this line$"
1508 "^`.*' is not an ordinary file$"
1509 "^Patch appears to have failed$"
1510 "^Recomputation of differences cancelled$"
1511 "^No fine differences in this mode$"
1512 "^Lost connection to ancestor buffer...sorry$"
1513 "^Not merging with ancestor$"
1514 "^Don't know how to toggle read-only in buffer "
1515 "Emacs is not running as a window application$"
1516 "^This command makes sense only when merging with an ancestor$"
1517 "^At end of the difference list$"
1518 "^At beginning of the difference list$"
1519 "^Nothing saved for diff .* in buffer "
1520 "^Buffer is out of sync for file "
1521 "^Buffer out of sync for file "
1522 "^Output from `diff' not found$"
1523 "^You forgot to specify a region in buffer "
1524 "^All right. Make up your mind and come back...$"
1525 "^Current buffer is not visiting any file$"
1526 "^Failed to retrieve revision: $"
1527 "^Can't determine display width.$"
1528 "^File `.*' does not exist or is not readable$"
1529 "^File `.*' is a directory$"
1530 "^Buffer .* doesn't exist$"
1531 "^Directories . and . are the same: "
1532 "^Directory merge aborted$"
1533 "^Merge of directory revisions aborted$"
1534 "^Buffer .* doesn't exist$"
1535 "^There is no file to merge$"
1545 ;; Local Variables:
1546 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1547 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1548 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1549 ;; End:
1551 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1552 ;;; ediff.el ends here