| blob | 69717ca13ad8e5ca26b727f650a97f7619a0d3fe |
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 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
214 'file-name-history
218 dir-B)))
220 )))
225 file-B)
226 nil ; file-C
227 startup-hooks
230 ;;;###autoload
232 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
235 ediff-last-dir-A
236 default-directory))
237 dir-B dir-C f ff)
239 "File A to compare"
240 dir-A
246 ediff-last-dir-B
250 'file-name-history
254 dir-B)))
258 ediff-last-dir-C
262 'file-name-history
266 dir-C)))
268 )))
273 file-B)
277 file-C)
278 startup-hooks
281 ;;;###autoload
285 ;; Visit FILE and arrange its buffer to Ediff's liking.
286 ;; FILE is actually a variable symbol that must contain a true file name.
287 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
288 ;; which FILE is read.
289 ;; LAST-DIR is the directory variable symbol where FILE's
290 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
291 ;; be assigned the hook to be executed after `ediff-startup' is finished.
292 ;; `ediff-find-file' arranges that the temp files it might create will be
293 ;; deleted.
303 ;; some of the commands, below, require full file name
306 ;; Record the directory of the file
310 ;; Setup the buffer
316 ;;; ange-ftp-hook-function--arrange for temp file
323 ;; file processed via auto-mode-alist, a la uncompress.el
335 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
345 ;;(sit-for 0)
348 ;;(sit-for 0)
353 ;;(sit-for 0)
360 buf-B file-B
361 buf-C file-C
362 startup-hooks
364 merge-buffer-file)))
367 ;;;###autoload
370 ;;;###autoload
372 "Run Ediff on FILE and its backup file.
373 Uses the latest backup, if there are several numerical backups.
374 If this file is a backup, `ediff' it with its original."
376 ;; The code is taken from `diff-backup'.
384 ori file))
387 ;;;###autoload
389 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
396 ;; realign buffers so that two visible bufs will be
397 ;; at the top
400 t))))
404 ;;;###autoload
408 ;;;###autoload
411 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
418 ;; realign buffers so that two visible
419 ;; bufs will be at the top
422 t))
425 ;; realign buffers so that three visible
426 ;; bufs will be at the top
429 t)
430 )))
434 ;;;###autoload
439 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
447 file-A file-B file-C)
471 file-C
476 startup-hooks)
478 merge-buffer-file)))
481 ;;; Directory and file group operations
483 ;; Get appropriate default name for directory:
484 ;; If ediff-use-last-dir, use ediff-last-dir-A.
485 ;; In dired mode, use the directory that is under the point (if any);
486 ;; otherwise, use default-directory
492 f
493 default-directory)))
497 ;;;###autoload
499 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
500 the same name in both. The third argument, REGEXP, is nil or a regular
501 expression; only file names that match the regexp are considered."
505 f)
510 ediff-last-dir-B
516 default-regexp)
518 nil
519 'ediff-filtering-regexp-history
521 )))
524 ))
526 ;;;###autoload
530 ;;;###autoload
532 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
533 The second argument, REGEXP, is a regular expression that filters the file
534 names. Only the files that are under revision control are taken into account."
538 )
544 default-regexp)
546 nil
547 'ediff-filtering-regexp-history
549 )))
552 ))
554 ;;;###autoload
558 ;;;###autoload
560 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
561 have the same name in all three. The last argument, REGEXP, is nil or a
562 regular expression; only file names that match the regexp are considered."
567 f)
571 ediff-last-dir-B
576 ediff-last-dir-C
582 default-regexp)
584 nil
585 'ediff-filtering-regexp-history
587 )))
590 ))
592 ;;;###autoload
595 ;;;###autoload
597 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
598 the same name in both. The third argument, REGEXP, is nil or a regular
599 expression; only file names that match the regexp are considered."
603 f)
608 ediff-last-dir-B
614 default-regexp)
616 nil
617 'ediff-filtering-regexp-history
619 )))
622 nil merge-autostore-dir
623 ))
625 ;;;###autoload
628 ;;;###autoload
630 &optional
631 merge-autostore-dir)
632 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
633 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
634 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
635 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
636 only file names that match the regexp are considered."
640 f)
644 ediff-last-dir-B
649 ediff-last-dir-C
655 default-regexp)
657 nil
658 'ediff-filtering-regexp-history
660 )))
662 dir1 dir2 ancestor-dir regexp
664 nil merge-autostore-dir
665 ))
667 ;;;###autoload
670 "Run Ediff on a directory, DIR1, merging its files with their revisions.
671 The second argument, REGEXP, is a regular expression that filters the file
672 names. Only the files that are under revision control are taken into account."
676 )
682 default-regexp)
684 nil
685 'ediff-filtering-regexp-history
687 )))
690 nil merge-autostore-dir
691 ))
693 ;;;###autoload
696 ;;;###autoload
698 &optional
699 merge-autostore-dir)
700 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
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 )
708 "Directory to merge with revisions and ancestors:"
713 default-regexp)
715 nil
716 'ediff-filtering-regexp-history
718 )))
720 dir1 regexp 'ediff-merge-revisions-with-ancestor
721 'ediff-merge-directory-revisions-with-ancestor
722 nil merge-autostore-dir
723 ))
725 ;;;###autoload
727 'edir-merge-revisions-with-ancestor
730 ;;;###autoload
733 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
734 ;; on a pair of directories (three directories, in case of ancestor).
735 ;; The third argument, REGEXP, is nil or a regular expression;
736 ;; only file names that match the regexp are considered.
737 ;; JOBNAME is the symbol indicating the meta-job to be performed.
738 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
740 &optional startup-hooks
741 merge-autostore-dir)
757 jobname)))
759 ;; It is a structure where ediff-intersect-directories returns
760 ;; commonalities and differences among directories
761 dir-diff-struct
762 meta-buf)
769 ediff-last-merge-autostore-dir
771 nil
773 ;; verify we are not merging into an orig directory
789 jobname
790 regexp dir1 dir2 dir3 merge-autostore-dir))
792 ;; this sets various vars in the meta buffer inside
793 ;; ediff-prepare-meta-buffer
795 ;; tell what to do if the user clicks on a session record
797 ;; set ediff-dir-difference-list
800 startup-hooks))
802 'ediff-filegroup-action
804 "*Ediff Session Group Panel"
805 'ediff-redraw-directory-group-buffer
806 jobname
807 startup-hooks))
809 ))
811 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
812 ;; files
814 &optional startup-hooks
815 merge-autostore-dir)
821 jobname)))
829 ediff-last-merge-autostore-dir
831 nil
833 ;; verify merge-autostore-dir != dir1
843 jobname regexp dir1 merge-autostore-dir))
845 ;; this sets various vars in the meta buffer inside
846 ;; ediff-prepare-meta-buffer
848 ;; tell what to do if the user clicks on a session record
850 startup-hooks))
852 'ediff-filegroup-action
853 file-list
854 "*Ediff Session Group Panel"
855 'ediff-redraw-directory-group-buffer
856 jobname
857 startup-hooks))
859 ))
862 ;;; Compare regions and windows
864 ;;;###autoload
866 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
867 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
868 follows:
869 If WIND-A is nil, use selected window.
870 If WIND-B is nil, use window next to WIND-A."
875 ;;;###autoload
877 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
878 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
879 follows:
880 If WIND-A is nil, use selected window.
881 If WIND-B is nil, use window next to WIND-A."
886 ;; Compare WIND-A and WIND-B, which are selected by clicking.
887 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
888 ;; works as follows:
889 ;; If WIND-A is nil, use selected window.
890 ;; If WIND-B is nil, use window next to WIND-A.
900 beg-A end-A beg-B end-B)
914 buffer-B
918 buffer-A beg-A end-A buffer-B beg-B end-B
919 startup-hooks job-name word-mode nil)))
922 ;;;###autoload
924 "Run Ediff on a pair of regions in specified buffers.
925 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
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\) can be set in advance or marked interactively.
967 Each region is enlarged to contain full lines.
968 This function is effective for large regions, over 100-200
969 lines. For small regions, use `ediff-regions-wordwise'."
976 ;; realign buffers so that two visible bufs will be
977 ;; at the top
980 t))))
990 reg-A-beg reg-A-end reg-B-beg reg-B-end)
995 ;; enlarge the region to hold full lines
1007 ;; enlarge the region to hold full lines
1022 ;; compare region beg-A to end-A of buffer-A
1023 ;; to regions beg-B -- end-B in buffer-B.
1025 startup-hooks job-name word-mode
1026 setup-parameters)
1028 overl-A overl-B
1029 file-A file-B)
1031 ;; in case beg/end-A/B aren't markers--make them into markers
1039 ;; make file-A
1045 ;; make file-B
1054 buffer-B file-B
1055 nil nil ; buffer & file C
1059 startup-hooks)
1064 setup-parameters))
1065 ))
1068 ;;; Merge files and buffers
1070 ;;;###autoload
1075 ;; Can't remember why this is here, but it may cause the automatically merged
1076 ;; buffer to be lost. So, keep the buffer modified.
1077 ;;(ediff-with-current-buffer ediff-buffer-C
1078 ;; (set-buffer-modified-p nil))
1079 )
1081 ;;;###autoload
1083 ;; MERGE-BUFFER-FILE is the file to be
1084 ;; associated with the merge buffer
1086 "Merge two files without ancestor."
1089 ediff-last-dir-A
1090 default-directory))
1091 dir-B f)
1093 "File A to merge"
1094 dir-A
1100 ediff-last-dir-B
1104 'file-name-history
1108 dir-B)))
1110 )))
1116 file-B)
1117 nil ; file-C
1118 startup-hooks
1119 'ediff-merge-files
1120 merge-buffer-file))
1122 ;;;###autoload
1124 &optional
1125 startup-hooks
1126 ;; MERGE-BUFFER-FILE is the file
1127 ;; to be associated with the
1128 ;; merge buffer
1129 merge-buffer-file)
1130 "Merge two files with ancestor."
1133 ediff-last-dir-A
1134 default-directory))
1135 dir-B dir-ancestor f ff)
1137 "File A to merge"
1138 dir-A
1144 ediff-last-dir-B
1148 'file-name-history
1152 dir-B)))
1157 ediff-last-dir-ancestor
1161 'file-name-history
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