| blob | cdfb66d9c0037790bddfc3a9a9a662d076afaef5 |
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
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 3, 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
133 ))
134 ;; end pacifier
140 "A comprehensive visual interface to diff & patch."
146 "*If t, Ediff will use previous directory as default when reading file name."
150 ;; Last directory used by an Ediff command for file-A.
152 ;; Last directory used by an Ediff command for file-B.
154 ;; Last directory used by an Ediff command for file-C.
156 ;; Last directory used by an Ediff command for the ancestor file.
158 ;; Last directory used by an Ediff command as the output directory for merge.
162 ;; Used as a startup hook to set `_orig' patch file read-only.
167 ;; Return a plausible default for ediff's first file:
168 ;; In dired, return the file number FILENO (or 0) in the list
169 ;; (all-selected-files, filename under the cursor), where directories are
170 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
171 ;; if the buffer is visiting a file, return that file name.
178 aux-list choices result)
187 default)))
191 ))
193 ;;; Compare files/buffers
195 ;;;###autoload
197 "Run Ediff on a pair of files, FILE-A and FILE-B."
200 ediff-last-dir-A
201 default-directory))
202 dir-B f)
204 "File A to compare"
205 dir-A
211 ediff-last-dir-B
215 'file-name-history
219 dir-B)))
221 )))
226 file-B)
227 nil ; file-C
228 startup-hooks
231 ;;;###autoload
233 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
236 ediff-last-dir-A
237 default-directory))
238 dir-B dir-C f ff)
240 "File A to compare"
241 dir-A
247 ediff-last-dir-B
251 'file-name-history
255 dir-B)))
259 ediff-last-dir-C
263 'file-name-history
267 dir-C)))
269 )))
274 file-B)
278 file-C)
279 startup-hooks
282 ;;;###autoload
286 ;; Visit FILE and arrange its buffer to Ediff's liking.
287 ;; FILE is actually a variable symbol that must contain a true file name.
288 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
289 ;; which FILE is read.
290 ;; LAST-DIR is the directory variable symbol where FILE's
291 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
292 ;; be assigned the hook to be executed after `ediff-startup' is finished.
293 ;; `ediff-find-file' arranges that the temp files it might create will be
294 ;; deleted.
304 ;; some of the commands, below, require full file name
307 ;; Record the directory of the file
311 ;; Setup the buffer
317 ;;; ange-ftp-hook-function--arrange for temp file
324 ;; file processed via auto-mode-alist, a la uncompress.el
336 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
346 ;;(sit-for 0)
349 ;;(sit-for 0)
354 ;;(sit-for 0)
361 buf-B file-B
362 buf-C file-C
363 startup-hooks
365 merge-buffer-file)))
369 ;;;###autoload
372 ;;;###autoload
374 "Run Ediff on FILE and its backup file.
375 Uses the latest backup, if there are several numerical backups.
376 If this file is a backup, `ediff' it with its original."
378 ;; The code is taken from `diff-backup'.
386 ori file))
389 ;;;###autoload
391 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
398 ;; realign buffers so that two visible bufs will be
399 ;; at the top
402 t))))
406 ;;;###autoload
410 ;;;###autoload
413 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
420 ;; realign buffers so that two visible
421 ;; bufs will be at the top
424 t))
427 ;; realign buffers so that three visible
428 ;; bufs will be at the top
431 t)
432 )))
436 ;;;###autoload
441 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
449 file-A file-B file-C)
473 file-C
478 startup-hooks)
480 merge-buffer-file)))
483 ;;; Directory and file group operations
485 ;; Get appropriate default name for directory:
486 ;; If ediff-use-last-dir, use ediff-last-dir-A.
487 ;; In dired mode, use the directory that is under the point (if any);
488 ;; otherwise, use default-directory
494 f
495 default-directory)))
499 ;;;###autoload
501 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
502 the same name in both. The third argument, REGEXP, is nil or a regular
503 expression; only file names that match the regexp are considered."
507 f)
512 ediff-last-dir-B
518 default-regexp)
520 nil
521 'ediff-filtering-regexp-history
523 )))
526 ))
528 ;;;###autoload
532 ;;;###autoload
534 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
535 The second argument, REGEXP, is a regular expression that filters the file
536 names. Only the files that are under revision control are taken into account."
540 )
546 default-regexp)
548 nil
549 'ediff-filtering-regexp-history
551 )))
554 ))
556 ;;;###autoload
560 ;;;###autoload
562 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
563 have the same name in all three. The last argument, REGEXP, is nil or a
564 regular expression; only file names that match the regexp are considered."
569 f)
573 ediff-last-dir-B
578 ediff-last-dir-C
584 default-regexp)
586 nil
587 'ediff-filtering-regexp-history
589 )))
592 ))
594 ;;;###autoload
597 ;;;###autoload
599 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
600 the same name in both. The third argument, REGEXP, is nil or a regular
601 expression; only file names that match the regexp are considered."
605 f)
610 ediff-last-dir-B
616 default-regexp)
618 nil
619 'ediff-filtering-regexp-history
621 )))
624 nil merge-autostore-dir
625 ))
627 ;;;###autoload
630 ;;;###autoload
632 &optional
633 merge-autostore-dir)
634 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
635 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
636 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
637 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
638 only file names that match the regexp are considered."
642 f)
646 ediff-last-dir-B
651 ediff-last-dir-C
657 default-regexp)
659 nil
660 'ediff-filtering-regexp-history
662 )))
664 dir1 dir2 ancestor-dir regexp
666 nil merge-autostore-dir
667 ))
669 ;;;###autoload
672 "Run Ediff on a directory, DIR1, merging its files with their revisions.
673 The second argument, REGEXP, is a regular expression that filters the file
674 names. Only the files that are under revision control are taken into account."
678 )
684 default-regexp)
686 nil
687 'ediff-filtering-regexp-history
689 )))
692 nil merge-autostore-dir
693 ))
695 ;;;###autoload
698 ;;;###autoload
700 &optional
701 merge-autostore-dir)
702 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
703 The second argument, REGEXP, is a regular expression that filters the file
704 names. Only the files that are under revision control are taken into account."
708 )
710 "Directory to merge with revisions and ancestors:"
715 default-regexp)
717 nil
718 'ediff-filtering-regexp-history
720 )))
722 dir1 regexp 'ediff-merge-revisions-with-ancestor
723 'ediff-merge-directory-revisions-with-ancestor
724 nil merge-autostore-dir
725 ))
727 ;;;###autoload
729 'edir-merge-revisions-with-ancestor
732 ;;;###autoload
735 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
736 ;; on a pair of directories (three directories, in case of ancestor).
737 ;; The third argument, REGEXP, is nil or a regular expression;
738 ;; only file names that match the regexp are considered.
739 ;; JOBNAME is the symbol indicating the meta-job to be performed.
740 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
742 &optional startup-hooks
743 merge-autostore-dir)
759 jobname)))
761 ;; It is a structure where ediff-intersect-directories returns
762 ;; commonalities and differences among directories
763 dir-diff-struct
764 meta-buf)
771 ediff-last-merge-autostore-dir
773 nil
775 ;; verify we are not merging into an orig directory
791 jobname
792 regexp dir1 dir2 dir3 merge-autostore-dir))
794 ;; this sets various vars in the meta buffer inside
795 ;; ediff-prepare-meta-buffer
797 ;; tell what to do if the user clicks on a session record
799 ;; set ediff-dir-difference-list
802 startup-hooks))
804 'ediff-filegroup-action
806 "*Ediff Session Group Panel"
807 'ediff-redraw-directory-group-buffer
808 jobname
809 startup-hooks))
811 ))
813 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
814 ;; files
816 &optional startup-hooks
817 merge-autostore-dir)
823 jobname)))
831 ediff-last-merge-autostore-dir
833 nil
835 ;; verify merge-autostore-dir != dir1
845 jobname regexp dir1 merge-autostore-dir))
847 ;; this sets various vars in the meta buffer inside
848 ;; ediff-prepare-meta-buffer
850 ;; tell what to do if the user clicks on a session record
852 startup-hooks))
854 'ediff-filegroup-action
855 file-list
856 "*Ediff Session Group Panel"
857 'ediff-redraw-directory-group-buffer
858 jobname
859 startup-hooks))
861 ))
864 ;;; Compare regions and windows
866 ;;;###autoload
868 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
869 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
870 follows:
871 If WIND-A is nil, use selected window.
872 If WIND-B is nil, use window next to WIND-A."
877 ;;;###autoload
879 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
880 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
881 follows:
882 If WIND-A is nil, use selected window.
883 If WIND-B is nil, use window next to WIND-A."
888 ;; Compare WIND-A and WIND-B, which are selected by clicking.
889 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
890 ;; works as follows:
891 ;; If WIND-A is nil, use selected window.
892 ;; If WIND-B is nil, use window next to WIND-A.
902 beg-A end-A beg-B end-B)
916 buffer-B
920 buffer-A beg-A end-A buffer-B beg-B end-B
921 startup-hooks job-name word-mode nil)))
924 ;;;###autoload
926 "Run Ediff on a pair of regions in specified buffers.
927 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
928 This function is effective only for relatively small regions, up to 200
929 lines. For large regions, use `ediff-regions-linewise'."
936 ;; realign buffers so that two visible bufs will be
937 ;; at the top
940 t))))
951 reg-A-beg reg-A-end reg-B-beg reg-B-end)
965 ;;;###autoload
967 "Run Ediff on a pair of regions in specified buffers.
968 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
969 Each region is enlarged to contain full lines.
970 This function is effective for large regions, over 100-200
971 lines. For small regions, use `ediff-regions-wordwise'."
978 ;; realign buffers so that two visible bufs will be
979 ;; at the top
982 t))))
992 reg-A-beg reg-A-end reg-B-beg reg-B-end)
997 ;; enlarge the region to hold full lines
1009 ;; enlarge the region to hold full lines
1024 ;; compare region beg-A to end-A of buffer-A
1025 ;; to regions beg-B -- end-B in buffer-B.
1027 startup-hooks job-name word-mode
1028 setup-parameters)
1030 overl-A overl-B
1031 file-A file-B)
1033 ;; in case beg/end-A/B aren't markers--make them into markers
1041 ;; make file-A
1047 ;; make file-B
1056 buffer-B file-B
1057 nil nil ; buffer & file C
1061 startup-hooks)
1066 setup-parameters))
1067 ))
1070 ;;; Merge files and buffers
1072 ;;;###autoload
1077 ;; Can't remember why this is here, but it may cause the automatically merged
1078 ;; buffer to be lost. So, keep the buffer modified.
1079 ;;(ediff-with-current-buffer ediff-buffer-C
1080 ;; (set-buffer-modified-p nil))
1081 )
1083 ;;;###autoload
1085 ;; MERGE-BUFFER-FILE is the file to be
1086 ;; associated with the merge buffer
1088 "Merge two files without ancestor."
1091 ediff-last-dir-A
1092 default-directory))
1093 dir-B f)
1095 "File A to merge"
1096 dir-A
1102 ediff-last-dir-B
1106 'file-name-history
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
1150 'file-name-history
1154 dir-B)))
1159 ediff-last-dir-ancestor
1163 'file-name-history
1167 dir-ancestor)))
1169 )))
1175 file-B)
1176 file-ancestor
1177 startup-hooks
1178 'ediff-merge-files-with-ancestor
1179 merge-buffer-file))
1181 ;;;###autoload
1184 ;;;###autoload
1186 &optional
1187 ;; MERGE-BUFFER-FILE is the file to be
1188 ;; associated with the merge buffer
1189 startup-hooks job-name merge-buffer-file)
1190 "Merge buffers without ancestor."
1197 ;; realign buffers so that two visible bufs will be
1198 ;; at the top
1201 t))))
1206 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1208 ;;;###autoload
1210 &optional
1211 startup-hooks
1212 job-name
1213 ;; MERGE-BUFFER-FILE is the
1214 ;; file to be associated
1215 ;; with the merge buffer
1216 merge-buffer-file)
1217 "Merge buffers with ancestor."
1224 ;; realign buffers so that two visible
1225 ;; bufs will be at the top
1228 t))
1231 ;; realign buffers so that three visible
1232 ;; bufs will be at the top
1235 t)
1236 )))
1241 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1244 ;;;###autoload
1246 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1247 "Run Ediff by merging two revisions of a file.
1248 The file is the optional FILE argument or the file visited by the current
1249 buffer."
1256 "Version 1 to merge (default %s's working version): "
1259 rev2
1262 "Version 2 to merge (default %s): "
1266 ;; ancestor-revision=nil
1269 rev1 rev2 nil startup-hooks merge-buffer-file)))
1272 ;;;###autoload
1274 file startup-hooks
1275 ;; MERGE-BUFFER-FILE is the file to
1276 ;; be associated with the merge
1277 ;; buffer
1278 merge-buffer-file)
1279 "Run Ediff by merging two revisions of a file with a common ancestor.
1280 The file is the optional FILE argument or the file visited by the current
1281 buffer."
1288 "Version 1 to merge (default %s's working version): "
1291 rev2
1294 "Version 2 to merge (default %s): "
1297 ancestor-rev
1300 "Ancestor version (default %s's base revision): "
1306 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1308 ;;; Apply patch
1310 ;;;###autoload
1312 "Run Ediff by patching SOURCE-FILENAME.
1313 If optional PATCH-BUF is given, use the patch in that buffer
1314 and don't ask the user.
1315 If prefix argument, then: if even argument, assume that the patch is in a
1316 buffer. If odd -- assume it is in a file."
1332 "File to patch (directory, if multifile patch): "
1333 ;; use an explicit initial file
1337 ;;;###autoload
1339 "Run Ediff by patching the buffer specified at prompt.
1340 Without the optional prefix ARG, asks if the patch is in some buffer and
1341 prompts for the buffer or a file, depending on the answer.
1342 With ARG=1, assumes the patch is in a file and prompts for the file.
1343 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1344 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1345 patch. If not given, the user is prompted according to the prefix argument."
1352 patch-buf
1354 "Which buffer to patch? "
1358 ;;;###autoload
1360 ;;;###autoload
1365 \f
1366 ;;; Versions Control functions
1368 ;;;###autoload
1370 "Run Ediff by comparing versions of a file.
1371 The file is an optional FILE argument or the file entered at the prompt.
1372 Default: the file visited by the current buffer.
1373 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1374 ;; if buffer is non-nil, use that buffer instead of the current buffer
1380 ediff-last-dir-A
1381 default-directory)
1394 rev2
1401 rev1 rev2 startup-hooks)
1402 ))
1405 ;;;###autoload
1409 ;; Test if version control package is loaded and load if not
1410 ;; Is SILENT is non-nil, don't report error if package is not found.
1420 ediff-version-control-package)))))
1423 ;;;###autoload
1425 "Return string describing the version of Ediff.
1426 When called interactively, displays the version."
1432 ;; info is run first, and will autoload info.el.
1435 ;;;###autoload
1437 "Display Ediff's manual.
1438 With optional NODE, goes to that node."
1464 "^Hmm... I don't see an Ediff command around here...$"
1465 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1466 ": This command runs in Ediff Control Buffer only!$"
1467 ": Invalid op in ediff-check-version$"
1468 "^ediff-shrink-window-C can be used only for merging jobs$"
1469 "^Lost difference info on these directories$"
1470 "^This command is inapplicable in the present context$"
1471 "^This session group has no parent$"
1472 "^Can't hide active session, $"
1473 "^Ediff: something wrong--no multiple diffs buffer$"
1474 "^Can't make context diff for Session $"
1475 "^The patch buffer wasn't found$"
1476 "^Aborted$"
1477 "^This Ediff session is not part of a session group$"
1478 "^No active Ediff sessions or corrupted session registry$"
1479 "^No session info in this line$"
1480 "^`.*' is not an ordinary file$"
1481 "^Patch appears to have failed$"
1482 "^Recomputation of differences cancelled$"
1483 "^No fine differences in this mode$"
1484 "^Lost connection to ancestor buffer...sorry$"
1485 "^Not merging with ancestor$"
1486 "^Don't know how to toggle read-only in buffer "
1487 "Emacs is not running as a window application$"
1488 "^This command makes sense only when merging with an ancestor$"
1489 "^At end of the difference list$"
1490 "^At beginning of the difference list$"
1491 "^Nothing saved for diff .* in buffer "
1492 "^Buffer is out of sync for file "
1493 "^Buffer out of sync for file "
1494 "^Output from `diff' not found$"
1495 "^You forgot to specify a region in buffer "
1496 "^All right. Make up your mind and come back...$"
1497 "^Current buffer is not visiting any file$"
1498 "^Failed to retrieve revision: $"
1499 "^Can't determine display width.$"
1500 "^File `.*' does not exist or is not readable$"
1501 "^File `.*' is a directory$"
1502 "^Buffer .* doesn't exist$"
1503 "^Directories . and . are the same: "
1504 "^Directory merge aborted$"
1505 "^Merge of directory revisions aborted$"
1506 "^Buffer .* doesn't exist$"
1507 "^There is no file to merge$"
1519 ;;; Local Variables:
1520 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1521 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1522 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1523 ;;; End:
1525 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1526 ;;; ediff.el ends here