|
163
|
1 ;;; DO NOT MODIFY THIS FILE
|
|
183
|
2 (if (featurep 'ediff-autoloads) (error "Already loaded"))
|
|
163
|
3
|
|
|
4 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff/ediff-mult.el")
|
|
|
5
|
|
|
6 (autoload 'ediff-show-registry "ediff-mult" "\
|
|
|
7 Display Ediff's registry." t nil)
|
|
|
8
|
|
|
9 (defalias 'eregistry 'ediff-show-registry)
|
|
|
10
|
|
|
11 ;;;***
|
|
|
12
|
|
|
13 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) "ediff-util" "ediff/ediff-util.el")
|
|
|
14
|
|
|
15 (autoload 'ediff-toggle-multiframe "ediff-util" "\
|
|
|
16 Switch from multiframe display to single-frame display and back.
|
|
|
17 To change the default, set the variable `ediff-window-setup-function',
|
|
|
18 which see." t nil)
|
|
|
19
|
|
|
20 (autoload 'ediff-toggle-use-toolbar "ediff-util" "\
|
|
|
21 Enable or disable Ediff toolbar.
|
|
|
22 Works only in versions of Emacs that support toolbars.
|
|
|
23 To change the default, set the variable `ediff-use-toolbar-p', which see." t nil)
|
|
|
24
|
|
|
25 ;;;***
|
|
|
26
|
|
|
27 ;;;### (autoloads (ediff-documentation ediff-version ediff-revision ediff-patch-buffer ediff-patch-file run-ediff-from-cvs-buffer ediff-merge-revisions-with-ancestor ediff-merge-revisions ediff-merge-buffers-with-ancestor ediff-merge-buffers ediff-merge-files-with-ancestor ediff-merge-files ediff-regions-linewise ediff-regions-wordwise ediff-windows-linewise ediff-windows-wordwise ediff-merge-directory-revisions-with-ancestor ediff-merge-directory-revisions ediff-merge-directories-with-ancestor ediff-merge-directories ediff-directories3 ediff-directory-revisions ediff-directories ediff-buffers3 ediff-buffers ediff-files3 ediff-files) "ediff" "ediff/ediff.el")
|
|
|
28
|
|
|
29 (autoload 'ediff-files "ediff" "\
|
|
|
30 Run Ediff on a pair of files, FILE-A and FILE-B." t nil)
|
|
|
31
|
|
|
32 (autoload 'ediff-files3 "ediff" "\
|
|
|
33 Run Ediff on three files, FILE-A, FILE-B, and FILE-C." t nil)
|
|
|
34
|
|
|
35 (defalias 'ediff3 'ediff-files3)
|
|
|
36
|
|
|
37 (defalias 'ediff 'ediff-files)
|
|
|
38
|
|
|
39 (autoload 'ediff-buffers "ediff" "\
|
|
|
40 Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." t nil)
|
|
|
41
|
|
|
42 (defalias 'ebuffers 'ediff-buffers)
|
|
|
43
|
|
|
44 (autoload 'ediff-buffers3 "ediff" "\
|
|
|
45 Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C." t nil)
|
|
|
46
|
|
|
47 (defalias 'ebuffers3 'ediff-buffers3)
|
|
|
48
|
|
|
49 (autoload 'ediff-directories "ediff" "\
|
|
|
50 Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
|
|
|
51 the same name in both. The third argument, REGEXP, is a regular expression that
|
|
|
52 can be used to filter out certain file names." t nil)
|
|
|
53
|
|
|
54 (defalias 'edirs 'ediff-directories)
|
|
|
55
|
|
|
56 (autoload 'ediff-directory-revisions "ediff" "\
|
|
|
57 Run Ediff on a directory, DIR1, comparing its files with their revisions.
|
|
|
58 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
59 names. Only the files that are under revision control are taken into account." t nil)
|
|
|
60
|
|
|
61 (defalias 'edir-revisions 'ediff-directory-revisions)
|
|
|
62
|
|
|
63 (autoload 'ediff-directories3 "ediff" "\
|
|
|
64 Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
|
|
|
65 have the same name in all three. The last argument, REGEXP, is a regular
|
|
|
66 expression that can be used to filter out certain file names." t nil)
|
|
|
67
|
|
|
68 (defalias 'edirs3 'ediff-directories3)
|
|
|
69
|
|
|
70 (autoload 'ediff-merge-directories "ediff" "\
|
|
|
71 Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
|
|
|
72 the same name in both. The third argument, REGEXP, is a regular expression that
|
|
|
73 can be used to filter out certain file names." t nil)
|
|
|
74
|
|
|
75 (defalias 'edirs-merge 'ediff-merge-directories)
|
|
|
76
|
|
|
77 (autoload 'ediff-merge-directories-with-ancestor "ediff" "\
|
|
|
78 Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
|
|
|
79 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
|
|
|
80 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
|
|
|
81 without ancestor. The fourth argument, REGEXP, is a regular expression that
|
|
|
82 can be used to filter out certain file names." t nil)
|
|
|
83
|
|
|
84 (autoload 'ediff-merge-directory-revisions "ediff" "\
|
|
|
85 Run Ediff on a directory, DIR1, merging its files with their revisions.
|
|
|
86 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
87 names. Only the files that are under revision control are taken into account." t nil)
|
|
|
88
|
|
|
89 (defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
|
|
|
90
|
|
|
91 (autoload 'ediff-merge-directory-revisions-with-ancestor "ediff" "\
|
|
|
92 Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
|
|
|
93 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
94 names. Only the files that are under revision control are taken into account." t nil)
|
|
|
95
|
|
|
96 (defalias 'edir-merge-revisions-with-ancestor 'ediff-merge-directory-revisions-with-ancestor)
|
|
|
97
|
|
|
98 (defalias 'edirs-merge-with-ancestor 'ediff-merge-directories-with-ancestor)
|
|
|
99
|
|
|
100 (autoload 'ediff-windows-wordwise "ediff" "\
|
|
|
101 Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
|
|
|
102 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
|
|
|
103 follows:
|
|
|
104 If WIND-A is nil, use selected window.
|
|
|
105 If WIND-B is nil, use window next to WIND-A." t nil)
|
|
|
106
|
|
|
107 (autoload 'ediff-windows-linewise "ediff" "\
|
|
|
108 Compare WIND-A and WIND-B, which are selected by clicking, linewise.
|
|
|
109 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
|
|
|
110 follows:
|
|
|
111 If WIND-A is nil, use selected window.
|
|
|
112 If WIND-B is nil, use window next to WIND-A." t nil)
|
|
|
113
|
|
|
114 (autoload 'ediff-regions-wordwise "ediff" "\
|
|
|
115 Run Ediff on a pair of regions in two different buffers.
|
|
|
116 Regions (i.e., point and mark) are assumed to be set in advance.
|
|
|
117 This function is effective only for relatively small regions, up to 200
|
|
|
118 lines. For large regions, use `ediff-regions-linewise'." t nil)
|
|
|
119
|
|
|
120 (autoload 'ediff-regions-linewise "ediff" "\
|
|
|
121 Run Ediff on a pair of regions in two different buffers.
|
|
|
122 Regions (i.e., point and mark) are assumed to be set in advance.
|
|
|
123 Each region is enlarged to contain full lines.
|
|
|
124 This function is effective for large regions, over 100-200
|
|
|
125 lines. For small regions, use `ediff-regions-wordwise'." t nil)
|
|
|
126
|
|
|
127 (defalias 'ediff-merge 'ediff-merge-files)
|
|
|
128
|
|
|
129 (autoload 'ediff-merge-files "ediff" "\
|
|
|
130 Merge two files without ancestor." t nil)
|
|
|
131
|
|
|
132 (autoload 'ediff-merge-files-with-ancestor "ediff" "\
|
|
|
133 Merge two files with ancestor." t nil)
|
|
|
134
|
|
|
135 (defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
|
|
|
136
|
|
|
137 (autoload 'ediff-merge-buffers "ediff" "\
|
|
|
138 Merge buffers without ancestor." t nil)
|
|
|
139
|
|
|
140 (autoload 'ediff-merge-buffers-with-ancestor "ediff" "\
|
|
|
141 Merge buffers with ancestor." t nil)
|
|
|
142
|
|
|
143 (autoload 'ediff-merge-revisions "ediff" "\
|
|
|
144 Run Ediff by merging two revisions of a file.
|
|
|
145 The file is the optional FILE argument or the file visited by the current
|
|
|
146 buffer." t nil)
|
|
|
147
|
|
|
148 (autoload 'ediff-merge-revisions-with-ancestor "ediff" "\
|
|
|
149 Run Ediff by merging two revisions of a file with a common ancestor.
|
|
|
150 The file is the the optional FILE argument or the file visited by the current
|
|
|
151 buffer." t nil)
|
|
|
152
|
|
|
153 (autoload 'run-ediff-from-cvs-buffer "ediff" "\
|
|
|
154 Run Ediff-merge on appropriate revisions of the selected file.
|
|
|
155 First run after `M-x cvs-update'. Then place the cursor on a line describing a
|
|
|
156 file and then run `run-ediff-from-cvs-buffer'." t nil)
|
|
|
157
|
|
|
158 (autoload 'ediff-patch-file "ediff" "\
|
|
|
159 Run Ediff by patching SOURCE-FILENAME." t nil)
|
|
|
160
|
|
|
161 (autoload 'ediff-patch-buffer "ediff" "\
|
|
|
162 Run Ediff by patching BUFFER-NAME." t nil)
|
|
|
163
|
|
|
164 (defalias 'epatch 'ediff-patch-file)
|
|
|
165
|
|
|
166 (defalias 'epatch-buffer 'ediff-patch-buffer)
|
|
|
167
|
|
|
168 (autoload 'ediff-revision "ediff" "\
|
|
|
169 Run Ediff by comparing versions of a file.
|
|
|
170 The file is an optional FILE argument or the file visited by the current
|
|
|
171 buffer. Use `vc.el' or `rcs.el' depending on `ediff-version-control-package'." t nil)
|
|
|
172
|
|
175
|
173 (defalias 'erevision 'ediff-revision)
|
|
|
174
|
|
163
|
175 (autoload 'ediff-version "ediff" "\
|
|
|
176 Return string describing the version of Ediff.
|
|
|
177 When called interactively, displays the version." t nil)
|
|
|
178
|
|
|
179 (autoload 'ediff-documentation "ediff" "\
|
|
|
180 Display Ediff's manual.
|
|
|
181 With optional NODE, goes to that node." t nil)
|
|
|
182
|
|
|
183 ;;;***
|
|
|
184
|
|
|
185 (provide 'ediff-autoloads)
|
