| blob | bb6cfc6b72eb4d31c8f9b3d304ba65d2d3b32512 |
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix
14 ;; This file is part of GNU Emacs.
16 ;; GNU Emacs is free software; you can redistribute it and/or modify
17 ;; it under the terms of the GNU General Public License as published by
18 ;; the Free Software Foundation; either version 2, or (at your option)
19 ;; any later version.
21 ;; GNU Emacs is distributed in the hope that it will be useful,
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 ;; GNU General Public License for more details.
26 ;; You should have received a copy of the GNU General Public License
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the
28 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
29 ;; Boston, MA 02110-1301, USA.
31 ;;; Commentary:
33 ;; Never read that diff output again!
34 ;; Apply patch interactively!
35 ;; Merge with ease!
37 ;; This package provides a convenient way of simultaneous browsing through
38 ;; the differences between a pair (or a triple) of files or buffers. The
39 ;; files being compared, file-A, file-B, and file-C (if applicable) are
40 ;; shown in separate windows (side by side, one above the another, or in
41 ;; separate frames), and the differences are highlighted as you step
42 ;; through them. You can also copy difference regions from one buffer to
43 ;; another (and recover old differences if you change your mind).
45 ;; Ediff also supports merging operations on files and buffers, including
46 ;; merging using ancestor versions. Both comparison and merging operations can
47 ;; be performed on directories, i.e., by pairwise comparison of files in those
48 ;; directories.
50 ;; In addition, Ediff can apply a patch to a file and then let you step
51 ;; though both files, the patched and the original one, simultaneously,
52 ;; difference-by-difference. You can even apply a patch right out of a
53 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
54 ;; Since Ediff lets you copy differences between buffers, you can, in
55 ;; effect, apply patches selectively (i.e., you can copy a difference
56 ;; region from file_orig to file, thereby undoing any particular patch that
57 ;; you don't like).
59 ;; Ediff is aware of version control, which lets the user compare
60 ;; files with their older versions. Ediff can also work with remote and
61 ;; compressed files. Details are given below.
63 ;; Finally, Ediff supports directory-level comparison, merging and patching.
64 ;; See the on-line manual for details.
66 ;; This package builds upon the ideas borrowed from emerge.el and several
67 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
68 ;; Ediff provides is also influenced by emerge.el.
70 ;; The present version of Ediff supersedes Emerge. It provides a superior user
71 ;; interface and has numerous major features not found in Emerge. In
72 ;; particular, it can do patching, and 2-way and 3-way file comparison,
73 ;; merging, and directory operations.
77 ;;; Bugs:
79 ;; 1. The undo command doesn't restore deleted regions well. That is, if
80 ;; you delete all characters in a difference region and then invoke
81 ;; `undo', the reinstated text will most likely be inserted outside of
82 ;; what Ediff thinks is the current difference region. (This problem
83 ;; doesn't seem to exist with XEmacs.)
84 ;;
85 ;; If at any point you feel that difference regions are no longer correct,
86 ;; you can hit '!' to recompute the differences.
88 ;; 2. On a monochrome display, the repertoire of faces with which to
89 ;; highlight fine differences is limited. By default, Ediff is using
90 ;; underlining. However, if the region is already underlined by some other
91 ;; overlays, there is no simple way to temporarily remove that residual
92 ;; underlining. This problem occurs when a buffer is highlighted with
93 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
94 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
95 ;; provide commands for unhighlighting buffers. You can either place these
96 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
97 ;; buffer used by Ediff) or you can execute them interactively, at any time
98 ;; and on any buffer.
101 ;;; Acknowledgements:
103 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
104 ;; Ediff would not have been possible without the help and encouragement of
105 ;; its many users. See Ediff on-line Info for the full list of those who
106 ;; helped. Improved defaults in Ediff file-name reading commands.
108 ;;; Code:
111 ;; Compiler pacifier
132 ))
133 ;; end pacifier
139 "A comprehensive visual interface to diff & patch."
145 "*If t, Ediff will use previous directory as default when reading file name."
149 ;; Last directory used by an Ediff command for file-A.
151 ;; Last directory used by an Ediff command for file-B.
153 ;; Last directory used by an Ediff command for file-C.
155 ;; Last directory used by an Ediff command for the ancestor file.
157 ;; Last directory used by an Ediff command as the output directory for merge.
161 ;; Used as a startup hook to set `_orig' patch file read-only.
166 ;; Return a plausible default for ediff's first file:
167 ;; In dired, return the file number FILENO (or 0) in the list
168 ;; (all-selected-files, filename under the cursor), where directories are
169 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
170 ;; if the buffer is visiting a file, return that file name.
177 aux-list choices result)
186 default)))
190 ))
192 ;;; Compare files/buffers
194 ;;;###autoload
196 "Run Ediff on a pair of files, FILE-A and FILE-B."
199 ediff-last-dir-A
200 default-directory))
201 dir-B f)
203 "File A to compare"
204 dir-A
210 ediff-last-dir-B
217 dir-B))
218 file-name-history))
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
254 dir-B))
255 file-name-history))
259 ediff-last-dir-C
266 dir-C))
267 file-name-history))
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)))
368 ;;;###autoload
371 ;;;###autoload
373 "Run Ediff on FILE and its backup file.
374 Uses the latest backup, if there are several numerical backups.
375 If this file is a backup, `ediff' it with its original."
377 ;; The code is taken from `diff-backup'.
385 ori file))
388 ;;;###autoload
390 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
397 ;; realign buffers so that two visible bufs will be
398 ;; at the top
401 t))))
405 ;;;###autoload
409 ;;;###autoload
412 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
419 ;; realign buffers so that two visible
420 ;; bufs will be at the top
423 t))
426 ;; realign buffers so that three visible
427 ;; bufs will be at the top
430 t)
431 )))
435 ;;;###autoload
440 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
448 file-A file-B file-C)
472 file-C
477 startup-hooks)
479 merge-buffer-file)))
482 ;;; Directory and file group operations
484 ;; Get appropriate default name for directory:
485 ;; If ediff-use-last-dir, use ediff-last-dir-A.
486 ;; In dired mode, use the directory that is under the point (if any);
487 ;; otherwise, use default-directory
493 f
494 default-directory)))
498 ;;;###autoload
500 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
501 the same name in both. The third argument, REGEXP, is nil or a regular
502 expression; only file names that match the regexp are considered."
506 f)
510 ediff-last-dir-B
512 nil)
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
573 nil))
576 ediff-last-dir-C
578 nil)
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)
607 ediff-last-dir-B
609 nil)
613 default-regexp)
615 nil
616 'ediff-filtering-regexp-history
618 )))
621 nil merge-autostore-dir
622 ))
624 ;;;###autoload
627 ;;;###autoload
629 &optional
630 merge-autostore-dir)
631 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
632 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
633 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
634 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
635 only file names that match the regexp are considered."
639 f)
643 ediff-last-dir-B
645 nil))
648 ediff-last-dir-C
650 nil)
654 default-regexp)
656 nil
657 'ediff-filtering-regexp-history
659 )))
661 dir1 dir2 ancestor-dir regexp
663 nil merge-autostore-dir
664 ))
666 ;;;###autoload
669 "Run Ediff on a directory, DIR1, merging its files with their revisions.
670 The second argument, REGEXP, is a regular expression that filters the file
671 names. Only the files that are under revision control are taken into account."
675 )
681 default-regexp)
683 nil
684 'ediff-filtering-regexp-history
686 )))
689 nil merge-autostore-dir
690 ))
692 ;;;###autoload
695 ;;;###autoload
697 &optional
698 merge-autostore-dir)
699 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
700 The second argument, REGEXP, is a regular expression that filters the file
701 names. Only the files that are under revision control are taken into account."
705 )
711 default-regexp)
713 nil
714 'ediff-filtering-regexp-history
716 )))
718 dir1 regexp 'ediff-merge-revisions-with-ancestor
719 'ediff-merge-directory-revisions-with-ancestor
720 nil merge-autostore-dir
721 ))
723 ;;;###autoload
725 'edir-merge-revisions-with-ancestor
728 ;;;###autoload
731 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
732 ;; on a pair of directories (three directories, in case of ancestor).
733 ;; The third argument, REGEXP, is nil or a regular expression;
734 ;; only file names that match the regexp are considered.
735 ;; JOBNAME is the symbol indicating the meta-job to be performed.
736 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
738 &optional startup-hooks
739 merge-autostore-dir)
740 ;; ediff-read-file-name is set to attach a previously entered file name if
741 ;; the currently entered file is a directory. This code takes care of that.
760 jobname)))
762 ;; It is a structure where ediff-intersect-directories returns
763 ;; commonalities and differences among directories
764 dir-diff-struct
765 meta-buf)
772 ediff-last-merge-autostore-dir
774 nil
776 ;; verify we are not merging into an orig directory
792 jobname
793 regexp dir1 dir2 dir3 merge-autostore-dir))
795 ;; this sets various vars in the meta buffer inside
796 ;; ediff-prepare-meta-buffer
798 ;; tell what to do if the user clicks on a session record
800 ;; set ediff-dir-difference-list
803 startup-hooks))
805 'ediff-filegroup-action
807 "*Ediff Session Group Panel"
808 'ediff-redraw-directory-group-buffer
809 jobname
810 startup-hooks))
812 ))
814 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
815 ;; files
817 &optional startup-hooks
818 merge-autostore-dir)
824 jobname)))
832 ediff-last-merge-autostore-dir
834 nil
836 ;; verify merge-autostore-dir != dir1
846 jobname regexp dir1 merge-autostore-dir))
848 ;; this sets various vars in the meta buffer inside
849 ;; ediff-prepare-meta-buffer
851 ;; tell what to do if the user clicks on a session record
853 startup-hooks))
855 'ediff-filegroup-action
856 file-list
857 "*Ediff Session Group Panel"
858 'ediff-redraw-directory-group-buffer
859 jobname
860 startup-hooks))
862 ))
865 ;;; Compare regions and windows
867 ;;;###autoload
869 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
870 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
871 follows:
872 If WIND-A is nil, use selected window.
873 If WIND-B is nil, use window next to WIND-A."
878 ;;;###autoload
880 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
881 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
882 follows:
883 If WIND-A is nil, use selected window.
884 If WIND-B is nil, use window next to WIND-A."
889 ;; Compare WIND-A and WIND-B, which are selected by clicking.
890 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
891 ;; works as follows:
892 ;; If WIND-A is nil, use selected window.
893 ;; If WIND-B is nil, use window next to WIND-A.
903 beg-A end-A beg-B end-B)
917 buffer-B
921 buffer-A beg-A end-A buffer-B beg-B end-B
922 startup-hooks job-name word-mode nil)))
925 ;;;###autoload
927 "Run Ediff on a pair of regions in specified buffers.
928 Regions \(i.e., point and mark\) are assumed to be set in advance except
929 for the second region in the case both regions are from the same buffer.
930 In such a case the user is asked to interactively establish the second
931 region.
932 This function is effective only for relatively small regions, up to 200
933 lines. For large regions, use `ediff-regions-linewise'."
940 ;; realign buffers so that two visible bufs will be
941 ;; at the top
944 t))))
955 reg-A-beg reg-A-end reg-B-beg reg-B-end)
969 ;;;###autoload
971 "Run Ediff on a pair of regions in specified buffers.
972 Regions \(i.e., point and mark\) are assumed to be set in advance except
973 for the second region in the case both regions are from the same buffer.
974 In such a case the user is asked to interactively establish the second
975 region.
976 Each region is enlarged to contain full lines.
977 This function is effective for large regions, over 100-200
978 lines. For small regions, use `ediff-regions-wordwise'."
985 ;; realign buffers so that two visible bufs will be
986 ;; at the top
989 t))))
999 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1004 ;; enlarge the region to hold full lines
1016 ;; enlarge the region to hold full lines
1031 ;; compare region beg-A to end-A of buffer-A
1032 ;; to regions beg-B -- end-B in buffer-B.
1034 startup-hooks job-name word-mode
1035 setup-parameters)
1037 overl-A overl-B
1038 file-A file-B)
1040 ;; in case beg/end-A/B aren't markers--make them into markers
1048 ;; make file-A
1054 ;; make file-B
1063 buffer-B file-B
1064 nil nil ; buffer & file C
1068 startup-hooks)
1073 setup-parameters))
1074 ))
1077 ;;; Merge files and buffers
1079 ;;;###autoload
1084 ;; Can't remember why this is here, but it may cause the automatically merged
1085 ;; buffer to be lost. So, keep the buffer modified.
1086 ;;(ediff-with-current-buffer ediff-buffer-C
1087 ;; (set-buffer-modified-p nil))
1088 )
1090 ;;;###autoload
1092 ;; MERGE-BUFFER-FILE is the file to be
1093 ;; associated with the merge buffer
1095 "Merge two files without ancestor."
1098 ediff-last-dir-A
1099 default-directory))
1100 dir-B f)
1102 "File A to merge"
1103 dir-A
1109 ediff-last-dir-B
1116 dir-B))
1117 file-name-history))
1119 )))
1125 file-B)
1126 nil ; file-C
1127 startup-hooks
1128 'ediff-merge-files
1129 merge-buffer-file))
1131 ;;;###autoload
1133 &optional
1134 startup-hooks
1135 ;; MERGE-BUFFER-FILE is the file
1136 ;; to be associated with the
1137 ;; merge buffer
1138 merge-buffer-file)
1139 "Merge two files with ancestor."
1142 ediff-last-dir-A
1143 default-directory))
1144 dir-B dir-ancestor f ff)
1146 "File A to merge"
1147 dir-A
1153 ediff-last-dir-B
1161 dir-B))
1162 file-name-history))
1167 ediff-last-dir-ancestor
1174 dir-ancestor))
1175 file-name-history))
1177 )))
1183 file-B)
1184 file-ancestor
1185 startup-hooks
1186 'ediff-merge-files-with-ancestor
1187 merge-buffer-file))
1189 ;;;###autoload
1192 ;;;###autoload
1194 &optional
1195 ;; MERGE-BUFFER-FILE is the file to be
1196 ;; associated with the merge buffer
1197 startup-hooks job-name merge-buffer-file)
1198 "Merge buffers without ancestor."
1205 ;; realign buffers so that two visible bufs will be
1206 ;; at the top
1209 t))))
1214 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1216 ;;;###autoload
1218 &optional
1219 startup-hooks
1220 job-name
1221 ;; MERGE-BUFFER-FILE is the
1222 ;; file to be associated
1223 ;; with the merge buffer
1224 merge-buffer-file)
1225 "Merge buffers with ancestor."
1232 ;; realign buffers so that two visible
1233 ;; bufs will be at the top
1236 t))
1239 ;; realign buffers so that three visible
1240 ;; bufs will be at the top
1243 t)
1244 )))
1249 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1252 ;;;###autoload
1254 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1255 "Run Ediff by merging two revisions of a file.
1256 The file is the optional FILE argument or the file visited by the current
1257 buffer."
1264 "Version 1 to merge (default %s's working version): "
1267 rev2
1270 "Version 2 to merge (default %s): "
1274 ;; ancestor-revision=nil
1277 rev1 rev2 nil startup-hooks merge-buffer-file)))
1280 ;;;###autoload
1282 file startup-hooks
1283 ;; MERGE-BUFFER-FILE is the file to
1284 ;; be associated with the merge
1285 ;; buffer
1286 merge-buffer-file)
1287 "Run Ediff by merging two revisions of a file with a common ancestor.
1288 The file is the optional FILE argument or the file visited by the current
1289 buffer."
1296 "Version 1 to merge (default %s's working version): "
1299 rev2
1302 "Version 2 to merge (default %s): "
1305 ancestor-rev
1308 "Ancestor version (default %s's base revision): "
1314 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1316 ;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
1317 ;;;###autoload
1319 "Run Ediff-merge on appropriate revisions of the selected file.
1320 First run after `M-x cvs-update'. Then place the cursor on a line describing a
1321 file and then run `run-ediff-from-cvs-buffer'."
1330 ;;; Apply patch
1332 ;;;###autoload
1334 "Run Ediff by patching SOURCE-FILENAME.
1335 If optional PATCH-BUF is given, use the patch in that buffer
1336 and don't ask the user.
1337 If prefix argument, then: if even argument, assume that the patch is in a
1338 buffer. If odd -- assume it is in a file."
1354 "File to patch (directory, if multifile patch): "
1355 ;; use an explicit initial file
1359 ;;;###autoload
1361 "Run Ediff by patching the buffer specified at prompt.
1362 Without the optional prefix ARG, asks if the patch is in some buffer and
1363 prompts for the buffer or a file, depending on the answer.
1364 With ARG=1, assumes the patch is in a file and prompts for the file.
1365 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1366 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1367 patch. If not given, the user is prompted according to the prefix argument."
1374 patch-buf
1376 "Which buffer to patch? "
1380 ;;;###autoload
1382 ;;;###autoload
1387 \f
1388 ;;; Versions Control functions
1390 ;;;###autoload
1392 "Run Ediff by comparing versions of a file.
1393 The file is an optional FILE argument or the file entered at the prompt.
1394 Default: the file visited by the current buffer.
1395 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1396 ;; if buffer is non-nil, use that buffer instead of the current buffer
1402 ediff-last-dir-A
1403 default-directory)
1416 rev2
1423 rev1 rev2 startup-hooks)
1424 ))
1427 ;;;###autoload
1431 ;; Test if version control package is loaded and load if not
1432 ;; Is SILENT is non-nil, don't report error if package is not found.
1442 ediff-version-control-package)))))
1445 ;;;###autoload
1447 "Return string describing the version of Ediff.
1448 When called interactively, displays the version."
1455 ;;;###autoload
1457 "Display Ediff's manual.
1458 With optional NODE, goes to that node."
1484 "^Hmm... I don't see an Ediff command around here...$"
1485 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1486 ": This command runs in Ediff Control Buffer only!$"
1487 ": Invalid op in ediff-check-version$"
1488 "^ediff-shrink-window-C can be used only for merging jobs$"
1489 "^Lost difference info on these directories$"
1490 "^This command is inapplicable in the present context$"
1491 "^This session group has no parent$"
1492 "^Can't hide active session, $"
1493 "^Ediff: something wrong--no multiple diffs buffer$"
1494 "^Can't make context diff for Session $"
1495 "^The patch buffer wasn't found$"
1496 "^Aborted$"
1497 "^This Ediff session is not part of a session group$"
1498 "^No active Ediff sessions or corrupted session registry$"
1499 "^No session info in this line$"
1500 "^`.*' is not an ordinary file$"
1501 "^Patch appears to have failed$"
1502 "^Recomputation of differences cancelled$"
1503 "^No fine differences in this mode$"
1504 "^Lost connection to ancestor buffer...sorry$"
1505 "^Not merging with ancestor$"
1506 "^Don't know how to toggle read-only in buffer "
1507 "Emacs is not running as a window application$"
1508 "^This command makes sense only when merging with an ancestor$"
1509 "^At end of the difference list$"
1510 "^At beginning of the difference list$"
1511 "^Nothing saved for diff .* in buffer "
1512 "^Buffer is out of sync for file "
1513 "^Buffer out of sync for file "
1514 "^Output from `diff' not found$"
1515 "^You forgot to specify a region in buffer "
1516 "^All right. Make up your mind and come back...$"
1517 "^Current buffer is not visiting any file$"
1518 "^Failed to retrieve revision: $"
1519 "^Can't determine display width.$"
1520 "^File `.*' does not exist or is not readable$"
1521 "^File `.*' is a directory$"
1522 "^Buffer .* doesn't exist$"
1523 "^Directories . and . are the same: "
1524 "^Directory merge aborted$"
1525 "^Merge of directory revisions aborted$"
1526 "^Buffer .* doesn't exist$"
1527 "^There is no file to merge$"
1539 ;;; Local Variables:
1540 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1541 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1542 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1543 ;;; End:
1545 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1546 ;;; ediff.el ends here