| blob | cd2b2c4e62888c76982000960127a2710ae929ce |
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
3 ;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, vc, tools, unix
8 ;; Version: 2.81.4
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 <https://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 Ediff 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 ;;; Acknowledgments:
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
120 ;; end pacifier
126 "Comprehensive visual interface to `diff' and `patch'."
132 "If t, Ediff will use previous directory as default when reading file name."
136 ;; Last directory used by an Ediff command for file-A.
138 ;; Last directory used by an Ediff command for file-B.
140 ;; Last directory used by an Ediff command for file-C.
142 ;; Last directory used by an Ediff command for the ancestor file.
144 ;; Last directory used by an Ediff command as the output directory for merge.
148 ;; Used as a startup hook to set `_orig' patch file read-only.
158 ;; Return a plausible default for ediff's first file:
159 ;; In dired, return the file number FILENO (or 0) in the list
160 ;; (all-selected-files, filename under the cursor), where directories are
161 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
162 ;; if the buffer is visiting a file, return that file name.
169 aux-list choices result)
178 default)))
182 ))
184 ;;; Compare files/buffers
186 ;;;###autoload
188 "Run Ediff on a pair of files, FILE-A and FILE-B.
189 STARTUP-HOOKS is a list of functions that Emacs calls without
190 arguments after setting up the Ediff buffers."
193 ediff-last-dir-A
194 default-directory))
195 dir-B f)
197 "File A to compare"
198 dir-A
204 ediff-last-dir-B
208 'file-name-history
212 dir-B)))
214 )))
219 file-B)
220 nil ; file-C
221 startup-hooks
224 ;;;###autoload
226 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C.
227 STARTUP-HOOKS is a list of functions that Emacs calls without
228 arguments after setting up the Ediff buffers."
231 ediff-last-dir-A
232 default-directory))
233 dir-B dir-C f ff)
235 "File A to compare"
236 dir-A
242 ediff-last-dir-B
246 'file-name-history
250 dir-B)))
254 ediff-last-dir-C
258 'file-name-history
262 dir-C)))
264 )))
269 file-B)
273 file-C)
274 startup-hooks
277 ;;;###autoload
282 "Visit FILE and arrange its buffer to Ediff's liking.
283 FILE-VAR is actually a variable symbol whose value must contain a true
284 file name.
285 BUFFER-NAME is a variable symbol, which will get the buffer object into
286 which FILE is read.
287 LAST-DIR is the directory variable symbol where FILE's
288 directory name should be returned. HOOKS-VAR is a variable symbol that will
289 be assigned the hook to be executed after `ediff-startup' is finished.
290 `ediff-find-file' arranges that the temp files it might create will be
291 deleted."
300 ;; some of the commands, below, require full file name
303 ;; Record the directory of the file
307 ;; Setup the buffer
313 ;;; ange-ftp-hook-function--arrange for temp file
320 ;; file processed via auto-mode-alist, a la uncompress.el
332 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
342 ;;(sit-for 0)
345 ;;(sit-for 0)
350 ;;(sit-for 0)
357 buf-B file-B
358 buf-C file-C
359 startup-hooks
361 merge-buffer-file)))
365 ;;;###autoload
368 ;;;###autoload
370 "Start ediff between current buffer and its file on disk.
371 This command can be used instead of `revert-buffer'. If there is
372 nothing to revert then this command fails."
374 ;; This duplicates code from menu-bar.el.
384 buffer-auto-save-file-name
389 buffer-auto-save-file-name
390 buffer-file-name))
402 ;; Assume same modes:
407 ;;;###autoload
409 "Run Ediff on FILE and its backup file.
410 Uses the latest backup, if there are several numerical backups.
411 If this file is a backup, `ediff' it with its original."
413 ;; The code is taken from `diff-backup'.
421 ori file))
424 ;;;###autoload
426 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B.
427 STARTUP-HOOKS is a list of functions that Emacs calls without
428 arguments after setting up the Ediff buffers. JOB-NAME is a
429 symbol describing the Ediff job type; it defaults to
430 `ediff-buffers', but can also be one of
431 `ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
432 `ediff-last-dir-C', `ediff-buffers3', `ediff-merge-buffers', or
433 `ediff-merge-buffers-with-ancestor'."
440 ;; realign buffers so that two visible bufs will be
441 ;; at the top
444 t))))
448 ;;;###autoload
452 ;;;###autoload
455 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C.
456 STARTUP-HOOKS is a list of functions that Emacs calls without
457 arguments after setting up the Ediff buffers. JOB-NAME is a
458 symbol describing the Ediff job type; it defaults to
459 `ediff-buffers3', but can also be one of
460 `ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
461 `ediff-last-dir-C', `ediff-buffers', `ediff-merge-buffers', or
462 `ediff-merge-buffers-with-ancestor'."
469 ;; realign buffers so that two visible
470 ;; bufs will be at the top
473 t))
476 ;; realign buffers so that three visible
477 ;; bufs will be at the top
480 t)
481 )))
485 ;;;###autoload
490 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
498 file-A file-B file-C)
524 file-C
529 startup-hooks)
531 merge-buffer-file))
540 ;;; Directory and file group operations
542 ;; Get appropriate default name for directory:
543 ;; If ediff-use-last-dir, use ediff-last-dir-A.
544 ;; In dired mode, use the directory that is under the point (if any);
545 ;; otherwise, use default-directory
551 f
552 default-directory)))
556 ;;;###autoload
558 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
559 the same name in both. The third argument, REGEXP, is nil or a regular
560 expression; only file names that match the regexp are considered."
564 f)
569 ediff-last-dir-B
575 default-regexp)
577 nil
578 'ediff-filtering-regexp-history
580 )))
583 ))
585 ;;;###autoload
589 ;;;###autoload
591 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
592 The second argument, REGEXP, is a regular expression that filters the file
593 names. Only the files that are under revision control are taken into account."
597 )
603 default-regexp)
605 nil
606 'ediff-filtering-regexp-history
608 )))
611 ))
613 ;;;###autoload
617 ;;;###autoload
619 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
620 have the same name in all three. The last argument, REGEXP, is nil or a
621 regular expression; only file names that match the regexp are considered."
626 f)
630 ediff-last-dir-B
635 ediff-last-dir-C
641 default-regexp)
643 nil
644 'ediff-filtering-regexp-history
646 )))
649 ))
651 ;;;###autoload
654 ;;;###autoload
656 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
657 the same name in both. The third argument, REGEXP, is nil or a regular
658 expression; only file names that match the regexp are considered.
659 MERGE-AUTOSTORE-DIR is the directory in which to store merged files."
663 f)
668 ediff-last-dir-B
674 default-regexp)
676 nil
677 'ediff-filtering-regexp-history
679 )))
682 nil merge-autostore-dir
683 ))
685 ;;;###autoload
688 ;;;###autoload
690 &optional
691 merge-autostore-dir)
692 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
693 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
694 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
695 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
696 only file names that match the regexp are considered.
697 MERGE-AUTOSTORE-DIR is the directory in which to store merged files."
701 f)
705 ediff-last-dir-B
710 ediff-last-dir-C
716 default-regexp)
718 nil
719 'ediff-filtering-regexp-history
721 )))
723 dir1 dir2 ancestor-dir regexp
725 nil merge-autostore-dir
726 ))
728 ;;;###autoload
731 "Run Ediff on a directory, DIR1, merging its files with their revisions.
732 The second argument, REGEXP, is a regular expression that filters the file
733 names. Only the files that are under revision control are taken into account.
734 MERGE-AUTOSTORE-DIR is the directory in which to store merged files."
738 )
744 default-regexp)
746 nil
747 'ediff-filtering-regexp-history
749 )))
752 nil merge-autostore-dir
753 ))
755 ;;;###autoload
758 ;;;###autoload
760 &optional
761 merge-autostore-dir)
762 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
763 The second argument, REGEXP, is a regular expression that filters the file
764 names. Only the files that are under revision control are taken into account.
765 MERGE-AUTOSTORE-DIR is the directory in which to store merged files."
769 )
771 "Directory to merge with revisions and ancestors:"
776 default-regexp)
778 nil
779 'ediff-filtering-regexp-history
781 )))
783 dir1 regexp 'ediff-merge-revisions-with-ancestor
784 'ediff-merge-directory-revisions-with-ancestor
785 nil merge-autostore-dir
786 ))
788 ;;;###autoload
790 'edir-merge-revisions-with-ancestor
793 ;;;###autoload
796 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
797 ;; on a pair of directories (three directories, in case of ancestor).
798 ;; The third argument, REGEXP, is nil or a regular expression;
799 ;; only file names that match the regexp are considered.
800 ;; JOBNAME is the symbol indicating the meta-job to be performed.
801 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
803 &optional startup-hooks
804 merge-autostore-dir)
820 jobname)))
822 ;; It is a structure where ediff-intersect-directories returns
823 ;; commonalities and differences among directories
824 dir-diff-struct
825 meta-buf)
832 ediff-last-merge-autostore-dir
834 nil
836 ;; verify we are not merging into an orig directory
852 jobname
853 regexp dir1 dir2 dir3 merge-autostore-dir))
855 ;; this sets various vars in the meta buffer inside
856 ;; ediff-prepare-meta-buffer
858 ;; tell what to do if the user clicks on a session record
860 ;; set ediff-dir-difference-list
863 startup-hooks))
865 'ediff-filegroup-action
867 "*Ediff Session Group Panel"
868 'ediff-redraw-directory-group-buffer
869 jobname
870 startup-hooks))
872 ))
874 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
875 ;; files
877 &optional startup-hooks
878 merge-autostore-dir)
884 jobname)))
892 ediff-last-merge-autostore-dir
894 nil
896 ;; verify merge-autostore-dir != dir1
906 jobname regexp dir1 merge-autostore-dir))
908 ;; this sets various vars in the meta buffer inside
909 ;; ediff-prepare-meta-buffer
911 ;; tell what to do if the user clicks on a session record
913 startup-hooks))
915 'ediff-filegroup-action
916 file-list
917 "*Ediff Session Group Panel"
918 'ediff-redraw-directory-group-buffer
919 jobname
920 startup-hooks))
922 ))
925 ;;; Compare regions and windows
927 ;;;###autoload
929 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
930 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
931 follows:
932 If WIND-A is nil, use selected window.
933 If WIND-B is nil, use window next to WIND-A.
934 STARTUP-HOOKS is a list of functions that Emacs calls without
935 arguments after setting up the Ediff buffers."
940 ;;;###autoload
942 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
943 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
944 follows:
945 If WIND-A is nil, use selected window.
946 If WIND-B is nil, use window next to WIND-A.
947 STARTUP-HOOKS is a list of functions that Emacs calls without
948 arguments after setting up the Ediff buffers."
953 ;; Compare WIND-A and WIND-B, which are selected by clicking.
954 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
955 ;; works as follows:
956 ;; If WIND-A is nil, use selected window.
957 ;; If WIND-B is nil, use window next to WIND-A.
967 beg-A end-A beg-B end-B)
981 buffer-B
985 buffer-A beg-A end-A buffer-B beg-B end-B
986 startup-hooks job-name word-mode nil)))
989 ;;;###autoload
991 "Run Ediff on a pair of regions in specified buffers.
992 BUFFER-A and BUFFER-B are the buffers to be compared.
993 Regions (i.e., point and mark) can be set in advance or marked interactively.
994 This function is effective only for relatively small regions, up to 200
995 lines. For large regions, use `ediff-regions-linewise'.
996 STARTUP-HOOKS is a list of functions that Emacs calls without
997 arguments after setting up the Ediff buffers."
1004 ;; realign buffers so that two visible bufs will be
1005 ;; at the top
1008 t))))
1019 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1032 ;;;###autoload
1034 "Run Ediff on a pair of regions in specified buffers.
1035 BUFFER-A and BUFFER-B are the buffers to be compared.
1036 Regions (i.e., point and mark) can be set in advance or marked interactively.
1037 Each region is enlarged to contain full lines.
1038 This function is effective for large regions, over 100-200
1039 lines. For small regions, use `ediff-regions-wordwise'.
1040 STARTUP-HOOKS is a list of functions that Emacs calls without
1041 arguments after setting up the Ediff buffers."
1048 ;; realign buffers so that two visible bufs will be
1049 ;; at the top
1052 t))))
1062 reg-A-beg reg-A-end reg-B-beg reg-B-end)
1066 ;; enlarge the region to hold full lines
1078 ;; enlarge the region to hold full lines
1093 ;; compare region beg-A to end-A of buffer-A
1094 ;; to regions beg-B -- end-B in buffer-B.
1096 startup-hooks job-name word-mode
1097 setup-parameters)
1099 overl-A overl-B
1100 file-A file-B)
1103 ;; in case beg/end-A/B aren't markers--make them into markers
1111 ;; make file-A
1117 ;; make file-B
1126 buffer-B file-B
1127 nil nil ; buffer & file C
1131 startup-hooks)
1136 setup-parameters)))
1141 ))
1144 ;;; Merge files and buffers
1146 ;;;###autoload
1151 ;; Can't remember why this is here, but it may cause the automatically merged
1152 ;; buffer to be lost. So, keep the buffer modified.
1153 ;;(ediff-with-current-buffer ediff-buffer-C
1154 ;; (set-buffer-modified-p nil))
1155 )
1157 ;;;###autoload
1159 ;; MERGE-BUFFER-FILE is the file to be
1160 ;; associated with the merge buffer
1162 "Merge two files without ancestor.
1163 FILE-A and FILE-B are the names of the files to be merged.
1164 STARTUP-HOOKS is a list of functions that Emacs calls without
1165 arguments after setting up the Ediff buffers. MERGE-BUFFER-FILE
1166 is the name of the file to be associated with the merge buffer.."
1169 ediff-last-dir-A
1170 default-directory))
1171 dir-B f)
1173 "File A to merge"
1174 dir-A
1180 ediff-last-dir-B
1184 'file-name-history
1188 dir-B)))
1190 )))
1196 file-B)
1197 nil ; file-C
1198 startup-hooks
1199 'ediff-merge-files
1200 merge-buffer-file))
1202 ;;;###autoload
1204 &optional
1205 startup-hooks
1206 ;; MERGE-BUFFER-FILE is the file
1207 ;; to be associated with the
1208 ;; merge buffer
1209 merge-buffer-file)
1210 "Merge two files with ancestor.
1211 FILE-A and FILE-B are the names of the files to be merged, and
1212 FILE-ANCESTOR is the name of the ancestor file. STARTUP-HOOKS is
1213 a list of functions that Emacs calls without arguments after
1214 setting up the Ediff buffers. MERGE-BUFFER-FILE is the name of
1215 the file to be associated with the merge buffer."
1218 ediff-last-dir-A
1219 default-directory))
1220 dir-B dir-ancestor f ff)
1222 "File A to merge"
1223 dir-A
1229 ediff-last-dir-B
1233 'file-name-history
1237 dir-B)))
1242 ediff-last-dir-ancestor
1246 'file-name-history
1250 dir-ancestor)))
1252 )))
1258 file-B)
1259 file-ancestor
1260 startup-hooks
1261 'ediff-merge-files-with-ancestor
1262 merge-buffer-file))
1264 ;;;###autoload
1267 ;;;###autoload
1269 &optional
1270 ;; MERGE-BUFFER-FILE is the file to be
1271 ;; associated with the merge buffer
1272 startup-hooks job-name merge-buffer-file)
1273 "Merge buffers without ancestor.
1274 BUFFER-A and BUFFER-B are the buffers to be merged.
1275 STARTUP-HOOKS is a list of functions that Emacs calls without
1276 arguments after setting up the Ediff buffers. JOB-NAME is a
1277 symbol describing the Ediff job type; it defaults to
1278 `ediff-merge-buffers', but can also be one of
1279 `ediff-merge-files-with-ancestor', `ediff-last-dir-ancestor',
1280 `ediff-last-dir-C', `ediff-buffers', `ediff-buffers3', or
1281 `ediff-merge-buffers-with-ancestor'. MERGE-BUFFER-FILE is the
1282 name of the file to be associated with the merge buffer."
1289 ;; realign buffers so that two visible bufs will be
1290 ;; at the top
1293 t))))
1298 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1300 ;;;###autoload
1302 &optional
1303 startup-hooks
1304 job-name
1305 ;; MERGE-BUFFER-FILE is the
1306 ;; file to be associated
1307 ;; with the merge buffer
1308 merge-buffer-file)
1309 "Merge buffers with ancestor.
1310 BUFFER-A and BUFFER-B are the buffers to be merged, and
1311 BUFFER-ANCESTOR is their ancestor. STARTUP-HOOKS is a list of
1312 functions that Emacs calls without arguments after setting up the
1313 Ediff buffers. JOB-NAME is a symbol describing the Ediff job
1314 type; it defaults to `ediff-merge-buffers-with-ancestor', but can
1315 also be one of `ediff-merge-files-with-ancestor',
1316 `ediff-last-dir-ancestor', `ediff-last-dir-C', `ediff-buffers',
1317 `ediff-buffers3', or `ediff-merge-buffers'. MERGE-BUFFER-FILE is
1318 the name of the file to be associated with the merge buffer."
1325 ;; realign buffers so that two visible
1326 ;; bufs will be at the top
1329 t))
1332 ;; realign buffers so that three visible
1333 ;; bufs will be at the top
1336 t)
1337 )))
1342 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1345 ;;;###autoload
1347 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1348 "Run Ediff by merging two revisions of a file.
1349 The file is the optional FILE argument or the file visited by the
1350 current buffer. STARTUP-HOOKS is a list of functions that Emacs
1351 calls without arguments after setting up the Ediff buffers.
1352 MERGE-BUFFER-FILE is the name of the file to be associated with
1353 the merge buffer."
1360 "Version 1 to merge (default %s's working version): "
1363 rev2
1366 "Version 2 to merge (default %s): "
1370 ;; ancestor-revision=nil
1373 rev1 rev2 nil startup-hooks merge-buffer-file)))
1376 ;;;###autoload
1378 file startup-hooks
1379 ;; MERGE-BUFFER-FILE is the file to
1380 ;; be associated with the merge
1381 ;; buffer
1382 merge-buffer-file)
1383 "Run Ediff by merging two revisions of a file with a common ancestor.
1384 The file is the optional FILE argument or the file visited by the
1385 current buffer. STARTUP-HOOKS is a list of functions that Emacs
1386 calls without arguments after setting up the Ediff buffers.
1387 MERGE-BUFFER-FILE is the name of the file to be associated with
1388 the merge buffer."
1395 "Version 1 to merge (default %s's working version): "
1398 rev2
1401 "Version 2 to merge (default %s): "
1404 ancestor-rev
1407 "Ancestor version (default %s's base revision): "
1413 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1415 ;;; Apply patch
1423 ;;;###autoload
1425 "Query for a file name, and then run Ediff by patching that file.
1426 If optional PATCH-BUF is given, use the patch in that buffer
1427 and don't ask the user.
1428 If prefix argument ARG, then: if even argument, assume that the
1429 patch is in a buffer. If odd -- assume it is in a file."
1446 "File to patch (directory, if multifile patch): "
1447 ;; use an explicit initial file
1454 ;;;###autoload
1456 "Run Ediff by patching the buffer specified at prompt.
1457 Without the optional prefix ARG, asks if the patch is in some buffer and
1458 prompts for the buffer or a file, depending on the answer.
1459 With ARG=1, assumes the patch is in a file and prompts for the file.
1460 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1461 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1462 patch. If not given, the user is prompted according to the prefix argument."
1469 patch-buf
1474 ;;;###autoload
1476 ;;;###autoload
1481 \f
1482 ;;; Versions Control functions
1484 ;;;###autoload
1486 "Run Ediff by comparing versions of a file.
1487 The file is an optional FILE argument or the file entered at the prompt.
1488 Default: the file visited by the current buffer.
1489 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'.
1490 STARTUP-HOOKS is a list of functions that Emacs calls without
1491 arguments after setting up the Ediff buffers."
1492 ;; if buffer is non-nil, use that buffer instead of the current buffer
1498 ediff-last-dir-A
1499 default-directory)
1512 rev2
1519 rev1 rev2 startup-hooks)
1520 ))
1523 ;;;###autoload
1527 ;; Test if version control package is loaded and load if not
1528 ;; Is SILENT is non-nil, don't report error if package is not found.
1538 ediff-version-control-package)))))
1541 ;;;###autoload
1543 "Return string describing the version of Ediff.
1544 When called interactively, displays the version."
1552 ;; info is run first, and will autoload info.el.
1555 ;;;###autoload
1557 "Display Ediff's manual.
1558 With optional NODE, goes to that node."
1582 \f
1583 ;;; Command line interface
1585 ;;;###autoload
1587 "Call `ediff-files' with the next two command line arguments."
1593 ;;;###autoload
1595 "Call `ediff3-files' with the next three command line arguments."
1602 ;;;###autoload
1604 "Call `ediff-merge-files' with the next two command line arguments."
1610 ;;;###autoload
1612 "Call `ediff-merge-files-with-ancestor' with the next three command line arguments."
1619 ;;;###autoload
1621 "Call `ediff-directories' with the next three command line arguments."
1628 ;;;###autoload
1630 "Call `ediff-directories3' with the next four command line arguments."
1638 ;;;###autoload
1640 "Call `ediff-merge-directories' with the next three command line arguments."
1647 ;;;###autoload
1649 "Call `ediff-merge-directories-with-ancestor' with the next four command line arguments."
1664 ;; Local Variables:
1665 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1666 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1667 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1668 ;; End:
1670 ;;; ediff.el ends here