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