commit | author | age
|
434b46
|
1 |
;; Object semanticdb-project-database-file |
C |
2 |
;; SEMANTICDB Tags save file |
|
3 |
(semanticdb-project-database-file "semanticdb-project-database-file" |
|
4 |
:tables |
|
5 |
(list |
|
6 |
(semanticdb-table "semanticdb-table" |
|
7 |
:major-mode emacs-lisp-mode |
|
8 |
:tags |
|
9 |
'( ("ediff-mult" package nil nil [5246 5267]) |
|
10 |
("ediff-mult" customgroup (:user-visible-flag t) nil [5269 5382]) |
|
11 |
("ediff-init" include nil nil [5384 5405]) |
|
12 |
("ediff-diff" include nil nil [5406 5427]) |
|
13 |
("ediff-wind" include nil nil [5428 5449]) |
|
14 |
("ediff-util" include nil nil [5450 5471]) |
|
15 |
("ediff-defvar-local" code nil nil [5489 5534]) |
|
16 |
("ediff-defvar-local" code nil nil [5535 5587]) |
|
17 |
("ediff-registry-buffer" variable nil nil [5611 5645]) |
|
18 |
("ediff-meta-buffer-brief-message" variable |
|
19 |
(:constant-flag t |
|
20 |
:default-value "Ediff Session Group Panel: %s |
|
21 |
|
|
22 |
Type ? to show useful commands in this buffer |
|
23 |
|
|
24 |
") |
|
25 |
nil [5647 5775]) |
|
26 |
("ediff-meta-buffer-verbose-message" variable |
|
27 |
(:constant-flag t |
|
28 |
:default-value "Ediff Session Group Panel: %s |
|
29 |
|
|
30 |
Useful commands (type ? to hide them and free up screen): |
|
31 |
button2, v, or RET over session record: start that Ediff session |
|
32 |
M: in sessions invoked from here, brings back this group panel |
|
33 |
R: display the registry of active Ediff sessions |
|
34 |
h: mark session for hiding (toggle) |
|
35 |
x: hide marked sessions; with prefix arg: unhide |
|
36 |
m: mark session for a non-hiding operation (toggle) |
|
37 |
uh/um: unmark all sessions marked for hiding/operation |
|
38 |
n,SPC: next session |
|
39 |
p,DEL: previous session |
|
40 |
E: browse Ediff manual |
|
41 |
T: toggle truncation of long file names |
|
42 |
q: quit this session group |
|
43 |
") |
|
44 |
nil [5777 6477]) |
|
45 |
("ediff-defvar-local" code nil nil [6479 6561]) |
|
46 |
("ediff-dir-diffs-buffer-map" variable (:default-value (make-sparse-keymap)) nil [6562 6704]) |
|
47 |
("ediff-defvar-local" code nil nil [6863 6917]) |
|
48 |
("ediff-defvar-local" code nil nil [6969 7023]) |
|
49 |
("ediff-defvar-local" code nil nil [7144 7201]) |
|
50 |
("ediff-defvar-local" code nil nil [7203 7249]) |
|
51 |
("ediff-defvar-local" code nil nil [7328 7378]) |
|
52 |
("ediff-defvar-local" code nil nil [7457 7516]) |
|
53 |
("ediff-filtering-regexp-history" variable nil nil [7570 7616]) |
|
54 |
("ediff-default-filtering-regexp" variable nil nil [7618 7932]) |
|
55 |
("ediff-defvar-local" code nil nil [8461 8504]) |
|
56 |
("ediff-defvar-local" code nil nil [8506 8559]) |
|
57 |
("ediff-defvar-local" code nil nil [8634 8687]) |
|
58 |
("ediff-defvar-local" code nil nil [8688 8738]) |
|
59 |
("ediff-session-registry" variable nil nil [8803 8838]) |
|
60 |
("ediff-meta-truncate-filenames" variable (:default-value t) nil [8840 9053]) |
|
61 |
("ediff-meta-mode-hook" variable nil nil [9055 9173]) |
|
62 |
("ediff-registry-setup-hook" variable nil nil [9175 9314]) |
|
63 |
("ediff-before-session-group-setup-hooks" variable nil nil [9316 9748]) |
|
64 |
("ediff-after-session-group-setup-hook" variable nil nil [9749 9939]) |
|
65 |
("ediff-quit-session-group-hook" variable nil nil [9940 10071]) |
|
66 |
("ediff-show-registry-hook" variable nil nil [10072 10202]) |
|
67 |
("ediff-show-session-group-hook" variable (:default-value (quote (delete-other-windows))) nil [10203 10361]) |
|
68 |
("ediff-meta-buffer-keymap-setup-hook" variable nil nil [10362 10675]) |
|
69 |
("ediff-defvar-local" code nil nil [10743 10792]) |
|
70 |
("ediff-get-group-buffer" function (:arguments ("meta-list")) nil [11474 11545]) |
|
71 |
("ediff-get-group-regexp" function (:arguments ("meta-list")) nil [11547 11618]) |
|
72 |
("ediff-get-group-objA" function (:arguments ("meta-list")) nil [11636 11705]) |
|
73 |
("ediff-get-group-objB" function (:arguments ("meta-list")) nil [11706 11775]) |
|
74 |
("ediff-get-group-objC" function (:arguments ("meta-list")) nil [11776 11845]) |
|
75 |
("ediff-get-group-merge-autostore-dir" function (:arguments ("meta-list")) nil [11846 11930]) |
|
76 |
("ediff-get-group-comparison-func" function (:arguments ("meta-list")) nil [11931 12011]) |
|
77 |
("ediff-get-session-buffer" function (:arguments ("elt")) nil [12456 12511]) |
|
78 |
("ediff-get-session-status" function (:arguments ("elt")) nil [12512 12567]) |
|
79 |
("ediff-set-session-status" function (:arguments ("session-info" "new-status")) nil [12568 12670]) |
|
80 |
("ediff-get-session-objA" function (:arguments ("elt")) nil [12690 12743]) |
|
81 |
("ediff-get-session-objB" function (:arguments ("elt")) nil [12744 12797]) |
|
82 |
("ediff-get-session-objC" function (:arguments ("elt")) nil [12798 12851]) |
|
83 |
("ediff-get-session-objA-name" function (:arguments ("elt")) nil [12964 13028]) |
|
84 |
("ediff-get-session-objB-name" function (:arguments ("elt")) nil [13029 13093]) |
|
85 |
("ediff-get-session-objC-name" function (:arguments ("elt")) nil [13094 13158]) |
|
86 |
("ediff-get-file-eqstatus" function (:arguments ("elt")) nil [13182 13236]) |
|
87 |
("ediff-set-file-eqstatus" function (:arguments ("elt" "value")) nil [13237 13310]) |
|
88 |
("ediff-make-new-meta-list-element" function (:arguments ("obj1" "obj2" "obj3")) nil [13864 13986]) |
|
89 |
("ediff-make-new-meta-list-header" function (:arguments ("regexp" "objA" "objB" "objC" "merge-auto-store-dir" "comparison-func")) nil [14195 14378]) |
|
90 |
("ediff-get-session-activity-marker" function (:arguments ("session")) nil [14603 14834]) |
|
91 |
("ediff-meta-session-p" function (:arguments ("session-info")) nil [14879 15314]) |
|
92 |
("ediff-defvar-local" code nil nil [15317 15496]) |
|
93 |
("ediff-toggle-verbose-help-meta-buffer" function (:user-visible-flag t) nil [15599 15850]) |
|
94 |
("ediff-setup-meta-map" function nil nil [15892 18871]) |
|
95 |
("ediff-meta-mode" function nil nil [18874 19626]) |
|
96 |
("suppress-keymap" code nil nil [19688 19732]) |
|
97 |
("define-key" code nil nil [19733 19805]) |
|
98 |
("define-key" code nil nil [19806 19860]) |
|
99 |
("define-key" code nil nil [19861 19915]) |
|
100 |
("define-key" code nil nil [19916 19977]) |
|
101 |
("define-key" code nil nil [19978 20036]) |
|
102 |
("define-key" code nil nil [20037 20106]) |
|
103 |
("if" code nil nil [20107 20287]) |
|
104 |
("define-key" code nil nil [20288 20351]) |
|
105 |
("define-key" code nil nil [20352 20418]) |
|
106 |
("ediff-next-meta-item" function |
|
107 |
(:user-visible-flag t |
|
108 |
:arguments ("count")) |
|
109 |
nil [20420 20978]) |
|
110 |
("ediff-next-meta-item1" function nil nil [21010 21398]) |
|
111 |
("ediff-previous-meta-item" function |
|
112 |
(:user-visible-flag t |
|
113 |
:arguments ("count")) |
|
114 |
nil [21401 21975]) |
|
115 |
("ediff-previous-meta-item1" function nil nil [21977 22561]) |
|
116 |
("ediff-add-slash-if-directory" function (:arguments ("dir" "file")) nil [22563 22702]) |
|
117 |
("ediff-toggle-filename-truncation" function (:user-visible-flag t) nil [22704 23053]) |
|
118 |
("ediff-membership-code1" variable (:default-value 2) nil [23218 23251]) |
|
119 |
("ediff-membership-code2" variable (:default-value 3) nil [23252 23285]) |
|
120 |
("ediff-membership-code3" variable (:default-value 5) nil [23286 23319]) |
|
121 |
("ediff-product-of-memcodes" variable (:default-value (* ediff-membership-code1 ediff-membership-code2 ediff-membership-code3)) nil [23320 23445]) |
|
122 |
("ediff-intersect-directories" function (:arguments ("jobname" "regexp" "dir1" "dir2" "dir3" "merge-autostore-dir" "comparison-func")) nil [24921 29038]) |
|
123 |
("ediff-get-directory-files-under-revision" function (:arguments ("jobname" "regexp" "dir1" "merge-autostore-dir")) nil [29288 30984]) |
|
124 |
("ediff-prepare-meta-buffer" function (:arguments ("action-func" "meta-list" "meta-buffer-name" "redraw-function" "jobname" "startup-hooks")) nil [32208 37361]) |
|
125 |
("ediff-insert-session-activity-marker-in-meta-buffer" function (:arguments ("session")) nil [37633 37799]) |
|
126 |
("ediff-insert-session-status-in-meta-buffer" function (:arguments ("session")) nil [38054 38256]) |
|
127 |
("ediff-replace-session-activity-marker-in-meta-buffer" function (:arguments ("point" "new-marker")) nil [38376 38960]) |
|
128 |
("ediff-replace-session-status-in-meta-buffer" function (:arguments ("point" "new-status")) nil [39078 39693]) |
|
129 |
("ediff-insert-session-info-in-meta-buffer" function (:arguments ("session-info" "sessionNum")) nil [39754 40508]) |
|
130 |
("ediff-redraw-directory-group-buffer" function (:arguments ("meta-list")) nil [40588 43492]) |
|
131 |
("ediff-update-markers-in-dir-meta-buffer" function (:arguments ("meta-list")) nil [43494 44657]) |
|
132 |
("ediff-update-session-marker-in-dir-meta-buffer" function (:arguments ("session-num")) nil [44659 46059]) |
|
133 |
("ediff-problematic-session-p" function (:arguments ("session")) nil [46384 46856]) |
|
134 |
("ediff-meta-insert-file-info1" function (:arguments ("fileinfo")) nil [46858 48131]) |
|
135 |
("ediff-months" variable |
|
136 |
(:constant-flag t |
|
137 |
:default-value (quote ((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr") (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug") (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec")))) |
|
138 |
nil [48133 48343]) |
|
139 |
("ediff-fill-leading-zero" function (:arguments ("num")) nil [48369 48479]) |
|
140 |
("ediff-format-date" function (:arguments ("time")) nil [48523 48833]) |
|
141 |
("ediff-insert-dirs-in-meta-buffer" function (:arguments ("meta-list")) nil [48859 49368]) |
|
142 |
("ediff-draw-dir-diffs" function (:arguments ("diff-list" "buf-name")) nil [49370 53115]) |
|
143 |
("ediff-bury-dir-diffs-buffer" function (:user-visible-flag t) nil [53117 53593]) |
|
144 |
("ediff-show-dir-diffs" function (:user-visible-flag t) nil [53662 54133]) |
|
145 |
("ediff-dir-diff-copy-file" function (:user-visible-flag t) nil [54245 56720]) |
|
146 |
("ediff-up-meta-hierarchy" function (:user-visible-flag t) nil [56722 57010]) |
|
147 |
("ediff-redraw-registry-buffer" function (:arguments ("_ignore")) nil [57036 60434]) |
|
148 |
("ediff-set-meta-overlay" function (:arguments ("b" "e" "prop" "session-number" "hidden")) nil [60789 61290]) |
|
149 |
("ediff-mark-for-hiding-at-pos" function |
|
150 |
(:user-visible-flag t |
|
151 |
:arguments ("unmark")) |
|
152 |
nil [61292 61854]) |
|
153 |
("ediff-mark-session-for-hiding" function (:arguments ("info" "unmark")) nil [61906 62455]) |
|
154 |
("ediff-mark-for-operation-at-pos" function |
|
155 |
(:user-visible-flag t |
|
156 |
:arguments ("unmark")) |
|
157 |
nil [62458 63037]) |
|
158 |
("ediff-mark-session-for-operation" function (:arguments ("info" "unmark")) nil [63114 63497]) |
|
159 |
("ediff-hide-marked-sessions" function |
|
160 |
(:user-visible-flag t |
|
161 |
:arguments ("unhide")) |
|
162 |
nil [63500 64478]) |
|
163 |
("ediff-operate-on-marked-sessions" function (:arguments ("operation")) nil [64707 65820]) |
|
164 |
("ediff-append-custom-diff" function (:arguments ("session" "sessionNum")) nil [65822 67830]) |
|
165 |
("ediff-collect-custom-diffs" function (:user-visible-flag t) nil [67832 68987]) |
|
166 |
("ediff-meta-show-patch" function (:user-visible-flag t) nil [68989 69812]) |
|
167 |
("declare-function" code nil nil [69814 69957]) |
|
168 |
("declare-function" code nil nil [69959 70100]) |
|
169 |
("ediff-filegroup-action" function (:user-visible-flag t) nil [70177 77743]) |
|
170 |
("ediff-registry-action" function (:user-visible-flag t) nil [77745 78643]) |
|
171 |
("ediff-show-meta-buffer" function |
|
172 |
(:user-visible-flag t |
|
173 |
:arguments ("meta-buf" "session-number")) |
|
174 |
nil [78704 80874]) |
|
175 |
("ediff-show-current-session-meta-buffer" function nil nil [80876 80998]) |
|
176 |
("ediff-show-meta-buff-from-registry" function (:user-visible-flag t) nil [81000 81399]) |
|
177 |
("ediff-show-registry" function (:user-visible-flag t) nil [81416 83030]) |
|
178 |
("defalias" code nil nil [83047 83089]) |
|
179 |
("ediff-update-meta-buffer" function (:arguments ("meta-buf" "must-redraw" "session-number")) nil [83497 84293]) |
|
180 |
("ediff-update-registry" function nil nil [84295 84643]) |
|
181 |
("ediff-cleanup-meta-buffer" function (:arguments ("meta-buffer")) nil [84732 85052]) |
|
182 |
("ediff-safe-to-quit" function (:arguments ("meta-buffer")) nil [85088 85548]) |
|
183 |
("ediff-quit-meta-buffer" function (:user-visible-flag t) nil [85550 86876]) |
|
184 |
("ediff-dispose-of-meta-buffer" function (:arguments ("buf")) nil [86878 87132]) |
|
185 |
("ediff-get-meta-info" function (:arguments ("buf" "point" "noerror")) nil [87381 88073]) |
|
186 |
("ediff-get-meta-overlay-at-pos" function (:arguments ("point")) nil [88076 88428]) |
|
187 |
("ediff-get-session-number-at-pos" function (:arguments ("point" "meta-buffer")) nil [88430 88735]) |
|
188 |
("ediff-next-meta-overlay-start" function (:arguments ("point")) nil [88794 89308]) |
|
189 |
("ediff-previous-meta-overlay-start" function (:arguments ("point")) nil [89311 90218]) |
|
190 |
("ediff-patch-file-internal" function (:prototype-flag t) nil [90220 90270]) |
|
191 |
("ediff-patch-file-form-meta" function (:arguments ("file" "startup-hooks")) nil [90357 91407]) |
|
192 |
("ediff-unmark-all-for-operation" function (:user-visible-flag t) nil [91410 91732]) |
|
193 |
("ediff-unmark-all-for-hiding" function (:user-visible-flag t) nil [91734 92047]) |
|
194 |
("ediff-meta-mark-equal-files" function |
|
195 |
(:user-visible-flag t |
|
196 |
:arguments ("action")) |
|
197 |
nil [92159 93771]) |
|
198 |
("ediff-mark-if-equal" function (:arguments ("fileinfo1" "fileinfo2")) nil [93856 94127])) |
|
199 |
:file "ediff-mult.el" |
|
200 |
:pointmax 94383 |
|
201 |
:fsize 94382 |
|
202 |
:lastmodtime '(23525 29614 0 0) |
|
203 |
:unmatched-syntax nil) |
|
204 |
(semanticdb-table "semanticdb-table" |
|
205 |
:major-mode emacs-lisp-mode |
|
206 |
:tags |
|
207 |
'( ("cl-lib" include nil nil [899 916]) |
|
208 |
("ediff-metajob-name" variable nil nil [945 972]) |
|
209 |
("ediff-meta-buffer" variable nil nil [973 999]) |
|
210 |
("ediff-grab-mouse" variable nil nil [1000 1025]) |
|
211 |
("ediff-mouse-pixel-position" variable nil nil [1026 1061]) |
|
212 |
("ediff-mouse-pixel-threshold" variable nil nil [1062 1098]) |
|
213 |
("ediff-whitespace" variable nil nil [1099 1124]) |
|
214 |
("ediff-multiframe" variable nil nil [1125 1150]) |
|
215 |
("ediff-use-toolbar-p" variable nil nil [1151 1179]) |
|
216 |
("mswindowsx-bitmap-file-path" variable nil nil [1180 1216]) |
|
217 |
("ediff-force-faces" variable nil nil [1234 1449]) |
|
218 |
("ediff-device-type" function nil nil [1506 1619]) |
|
219 |
("ediff-window-display-p" function nil nil [1682 1793]) |
|
220 |
("ediff-has-face-support-p" function nil nil [1821 2055]) |
|
221 |
("ediff-has-toolbar-support-p" function nil nil [2119 2243]) |
|
222 |
("ediff-has-gutter-support-p" function nil nil [2246 2368]) |
|
223 |
("ediff-use-toolbar-p" function nil nil [2370 2518]) |
|
224 |
("ediff-defvar-local" function (:arguments ("var" "value" "doc")) nil [2899 3126]) |
|
225 |
("ediff-defvar-local" code nil nil [3273 3315]) |
|
226 |
("ediff-defvar-local" code nil nil [3364 3406]) |
|
227 |
("ediff-defvar-local" code nil nil [3487 3529]) |
|
228 |
("ediff-defvar-local" code nil nil [3549 3598]) |
|
229 |
("ediff-defvar-local" code nil nil [3627 3675]) |
|
230 |
("ediff-defvar-local" code nil nil [3677 3829]) |
|
231 |
("ediff-buffer-alist" variable |
|
232 |
(:constant-flag t |
|
233 |
:default-value (quote ((65 . ediff-buffer-A) (66 . ediff-buffer-B) (67 . ediff-buffer-C)))) |
|
234 |
nil [3884 3992]) |
|
235 |
("ediff-buffer-live-p" function (:arguments ("buf")) nil [4005 4101]) |
|
236 |
("ediff-get-buffer" function (:arguments ("arg")) nil [4103 4289]) |
|
237 |
("ediff-get-value-according-to-buffer-type" function (:arguments ("buf-type" "list")) nil [4291 4477]) |
|
238 |
("ediff-char-to-buftype" function (:arguments ("arg")) nil [4479 4612]) |
|
239 |
("ediff-get-symbol-from-alist" function (:arguments ("buf-type" "alist")) nil [4880 4966]) |
|
240 |
("ediff-defvar-local" code nil nil [5792 5845]) |
|
241 |
("ediff-defvar-local" code nil nil [5846 5899]) |
|
242 |
("ediff-defvar-local" code nil nil [5900 5953]) |
|
243 |
("ediff-defvar-local" code nil nil [5954 6014]) |
|
244 |
("ediff-difference-vector-alist" variable |
|
245 |
(:constant-flag t |
|
246 |
:default-value (quote ((A . ediff-difference-vector-A) (B . ediff-difference-vector-B) (C . ediff-difference-vector-C) (Ancestor . ediff-difference-vector-Ancestor)))) |
|
247 |
nil [6075 6274]) |
|
248 |
("ediff-get-difference" function (:arguments ("n" "buf-type")) nil [6276 6437]) |
|
249 |
("ediff-no-fine-diffs-p" function (:arguments ("n")) nil [7453 7530]) |
|
250 |
("ediff-get-diff-overlay-from-diff-record" function (:arguments ("diff-rec")) nil [7532 7615]) |
|
251 |
("ediff-get-diff-overlay" function (:arguments ("n" "buf-type")) nil [7617 7748]) |
|
252 |
("ediff-get-fine-diff-vector-from-diff-record" function (:arguments ("diff-rec")) nil [7750 7837]) |
|
253 |
("ediff-set-fine-diff-vector" function (:arguments ("n" "buf-type" "fine-vec")) nil [7839 7956]) |
|
254 |
("ediff-get-state-of-diff" function (:arguments ("n" "buf-type")) nil [7958 8102]) |
|
255 |
("ediff-set-state-of-diff" function (:arguments ("n" "buf-type" "val")) nil [8103 8207]) |
|
256 |
("ediff-get-state-of-merge" function (:arguments ("n")) nil [8209 8324]) |
|
257 |
("ediff-set-state-of-merge" function (:arguments ("n" "val")) nil [8325 8449]) |
|
258 |
("ediff-get-state-of-ancestor" function (:arguments ("n")) nil [8451 8569]) |
|
259 |
("ediff-mark-diff-as-space-only" function (:arguments ("n" "flag")) nil [8794 8890]) |
|
260 |
("ediff-get-fine-diff-vector" function (:arguments ("n" "buf-type")) nil [8892 9031]) |
|
261 |
("ediff-with-current-buffer" function (:arguments ("buffer" "body")) nil [9214 9524]) |
|
262 |
("ediff-multiframe-setup-p" function nil nil [9527 9615]) |
|
263 |
("ediff-narrow-control-frame-p" function nil nil [9617 9750]) |
|
264 |
("ediff-3way-comparison-job" function nil nil [9752 9855]) |
|
265 |
("ediff-defvar-local" code nil nil [9856 9909]) |
|
266 |
("ediff-merge-job" function nil nil [9911 10168]) |
|
267 |
("ediff-defvar-local" code nil nil [10169 10212]) |
|
268 |
("ediff-patch-job" function nil nil [10214 10274]) |
|
269 |
("ediff-merge-with-ancestor-job" function nil nil [10276 10469]) |
|
270 |
("ediff-defvar-local" code nil nil [10470 10527]) |
|
271 |
("ediff-3way-job" function nil nil [10529 10607]) |
|
272 |
("ediff-defvar-local" code nil nil [10608 10650]) |
|
273 |
("ediff-diff3-job" function nil nil [10740 10840]) |
|
274 |
("ediff-defvar-local" code nil nil [10841 10884]) |
|
275 |
("ediff-windows-job" function nil nil [10886 10991]) |
|
276 |
("ediff-defvar-local" code nil nil [10992 11037]) |
|
277 |
("ediff-word-mode-job" function nil nil [11039 11146]) |
|
278 |
("ediff-defvar-local" code nil nil [11147 11194]) |
|
279 |
("ediff-narrow-job" function nil nil [11196 11361]) |
|
280 |
("ediff-defvar-local" code nil nil [11362 11406]) |
|
281 |
("ediff-ancestor-metajob" function (:arguments ("metajob")) nil [11535 11711]) |
|
282 |
("ediff-revision-metajob" function (:arguments ("metajob")) nil [11712 11920]) |
|
283 |
("ediff-patch-metajob" function (:arguments ("metajob")) nil [11921 12038]) |
|
284 |
("ediff-one-filegroup-metajob" function (:arguments ("metajob")) nil [12130 12294]) |
|
285 |
("ediff-collect-diffs-metajob" function (:arguments ("metajob")) nil [12373 12699]) |
|
286 |
("ediff-merge-metajob" function (:arguments ("metajob")) nil [12700 13008]) |
|
287 |
("ediff-metajob3" function (:arguments ("metajob")) nil [13010 13221]) |
|
288 |
("ediff-comparison-metajob3" function (:arguments ("metajob")) nil [13222 13360]) |
|
289 |
("ediff-in-control-buffer-p" function (:arguments ("meta-buf-p")) nil [13480 13663]) |
|
290 |
("ediff-barf-if-not-control-buffer" function (:arguments ("meta-buf-p")) nil [13665 13867]) |
|
291 |
("ediff-highlighting" customgroup (:user-visible-flag t) nil [13869 13986]) |
|
292 |
("ediff-merge" customgroup (:user-visible-flag t) nil [13988 14072]) |
|
293 |
("ediff-hook" customgroup (:user-visible-flag t) nil [14074 14158]) |
|
294 |
("ediff-before-setup-hook" variable nil nil [14179 14433]) |
|
295 |
("ediff-before-setup-windows-hook" variable nil nil [14434 14720]) |
|
296 |
("ediff-after-setup-windows-hook" variable nil nil [14721 14932]) |
|
297 |
("ediff-before-setup-control-frame-hook" variable nil nil [14933 15180]) |
|
298 |
("ediff-after-setup-control-frame-hook" variable nil nil [15181 15392]) |
|
299 |
("ediff-startup-hook" variable nil nil [15393 15555]) |
|
300 |
("ediff-select-hook" variable nil nil [15556 15679]) |
|
301 |
("ediff-unselect-hook" variable nil nil [15680 15807]) |
|
302 |
("ediff-prepare-buffer-hook" variable nil nil [15808 16003]) |
|
303 |
("ediff-load-hook" variable nil nil [16004 16139]) |
|
304 |
("ediff-mode-hook" variable nil nil [16141 16412]) |
|
305 |
("ediff-keymap-setup-hook" variable nil nil [16413 16560]) |
|
306 |
("ediff-display-help-hook" variable nil nil [16562 16684]) |
|
307 |
("ediff-suspend-hook" variable nil nil [16686 16825]) |
|
308 |
("ediff-quit-hook" variable nil nil [16826 16960]) |
|
309 |
("ediff-cleanup-hook" variable nil nil [16961 17116]) |
|
310 |
("ediff-KILLED-VITAL-BUFFER" variable |
|
311 |
(:constant-flag t |
|
312 |
:default-value "You have killed a vital Ediff buffer---you must leave Ediff now!") |
|
313 |
nil [17136 17241]) |
|
314 |
("ediff-NO-DIFFERENCES" variable |
|
315 |
(:constant-flag t |
|
316 |
:default-value "Sorry, comparison of identical variants is not what I am made for...") |
|
317 |
nil [17242 17346]) |
|
318 |
("ediff-BAD-DIFF-NUMBER" variable |
|
319 |
(:constant-flag t |
|
320 |
:default-value "%S: Bad diff region number, %d. Valid numbers are 1 to %d") |
|
321 |
nil [17347 17507]) |
|
322 |
("ediff-BAD-INFO" variable |
|
323 |
(:constant-flag t |
|
324 |
:default-value (format " |
|
325 |
*** The Info file for Ediff, a part of the standard distribution |
|
326 |
*** of %sEmacs, does not seem to be properly installed. |
|
327 |
*** |
|
328 |
*** Please contact your system administrator. " (if (featurep (quote xemacs)) "X" ""))) |
|
329 |
nil [17508 17753]) |
|
330 |
("ediff-defvar-local" code nil nil [17778 18136]) |
|
331 |
("ediff-defvar-local" code nil nil [18138 18353]) |
|
332 |
("ediff-defvar-local" code nil nil [18354 18585]) |
|
333 |
("ediff-defvar-local" code nil nil [18661 18708]) |
|
334 |
("ediff-defvar-local" code nil nil [18783 18830]) |
|
335 |
("ediff-defvar-local" code nil nil [18905 18952]) |
|
336 |
("ediff-defvar-local" code nil nil [19049 19107]) |
|
337 |
("ediff-defvar-local" code nil nil [19181 19227]) |
|
338 |
("ediff-defvar-local" code nil nil [19300 19346]) |
|
339 |
("ediff-defvar-local" code nil nil [19419 19465]) |
|
340 |
("ediff-defvar-local" code nil nil [19561 19618]) |
|
341 |
("ediff-defvar-local" code nil nil [19924 19976]) |
|
342 |
("ediff-defvar-local" code nil nil [20167 20213]) |
|
343 |
("ediff-before-flag-bol" variable (:default-value (if (featurep (quote xemacs)) (make-glyph "->>") "->>")) nil [20232 20495]) |
|
344 |
("ediff-after-flag-eol" variable (:default-value (if (featurep (quote xemacs)) (make-glyph "<<-") "<<-")) nil [20497 20744]) |
|
345 |
("ediff-before-flag-mol" variable (:default-value (if (featurep (quote xemacs)) (make-glyph "->>") "->>")) nil [20746 20999]) |
|
346 |
("ediff-after-flag-mol" variable (:default-value (if (featurep (quote xemacs)) (make-glyph "<<-") "<<-")) nil [21000 21249]) |
|
347 |
("ediff-use-faces" variable (:default-value t) nil [21252 21578]) |
|
348 |
("make-variable-buffer-local" code nil nil [21579 21624]) |
|
349 |
("put" code nil nil [21625 21666]) |
|
350 |
("ediff-defvar-local" code nil nil [21817 21860]) |
|
351 |
("ediff-defvar-local" code nil nil [21915 21957]) |
|
352 |
("ediff-defvar-local" code nil nil [22164 22211]) |
|
353 |
("ediff-defvar-local" code nil nil [22315 22360]) |
|
354 |
("ediff-defvar-local" code nil nil [22573 22621]) |
|
355 |
("ediff-defvar-local" code nil nil [22623 22744]) |
|
356 |
("ediff-defvar-local" code nil nil [22745 22920]) |
|
357 |
("ediff-keep-variants" variable (:default-value t) nil [22922 23163]) |
|
358 |
("ediff-highlight-all-diffs" variable (:default-value t) nil [23165 23413]) |
|
359 |
("make-variable-buffer-local" code nil nil [23414 23469]) |
|
360 |
("put" code nil nil [23470 23521]) |
|
361 |
("ediff-defvar-local" code nil nil [23566 23621]) |
|
362 |
("ediff-defvar-local" code nil nil [23716 23771]) |
|
363 |
("ediff-defvar-local" code nil nil [23839 23893]) |
|
364 |
("ediff-defvar-local" code nil nil [23959 24013]) |
|
365 |
("ediff-defvar-local" code nil nil [24079 24133]) |
|
366 |
("ediff-defvar-local" code nil nil [24206 24267]) |
|
367 |
("ediff-buffer-values-orig-alist" variable |
|
368 |
(:constant-flag t |
|
369 |
:default-value (quote ((A . ediff-buffer-values-orig-A) (B . ediff-buffer-values-orig-B) (C . ediff-buffer-values-orig-C) (Ancestor . ediff-buffer-values-orig-Ancestor)))) |
|
370 |
nil [24333 24537]) |
|
371 |
("ediff-protected-variables" variable |
|
372 |
(:constant-flag t |
|
373 |
:default-value (quote (mode-line-format))) |
|
374 |
nil [24613 24709]) |
|
375 |
("ediff-defvar-local" code nil nil [25009 25057]) |
|
376 |
("ediff-defvar-local" code nil nil [25105 25156]) |
|
377 |
("ediff-defvar-local" code nil nil [25189 25244]) |
|
378 |
("ediff-defvar-local" code nil nil [25336 25381]) |
|
379 |
("ediff-defvar-local" code nil nil [25513 25565]) |
|
380 |
("ediff-defvar-local" code nil nil [25630 25680]) |
|
381 |
("ediff-tmp-buffer" variable |
|
382 |
(:constant-flag t |
|
383 |
:default-value " *ediff-tmp*") |
|
384 |
nil [25738 25783]) |
|
385 |
("ediff-msg-buffer" variable |
|
386 |
(:constant-flag t |
|
387 |
:default-value " *ediff-message*") |
|
388 |
nil [25812 25861]) |
|
389 |
("ediff-defvar-local" code nil nil [25928 25974]) |
|
390 |
("ediff-defvar-local" code nil nil [26007 26065]) |
|
391 |
("ediff-defvar-local" code nil nil [26198 26259]) |
|
392 |
("ediff-disturbed-overlays" variable nil nil [26365 26405]) |
|
393 |
("ediff-version-control-package" variable (:default-value (quote vc)) nil [26407 26820]) |
|
394 |
("ediff-coding-system-for-read" variable (:default-value (quote raw-text)) nil [26822 27294]) |
|
395 |
("ediff-coding-system-for-write" variable (:default-value (if (featurep (quote xemacs)) (quote escape-quoted) (quote emacs-internal))) nil [27296 27593]) |
|
396 |
("defalias" code nil nil [27596 27682]) |
|
397 |
("defalias" code nil nil [27684 27755]) |
|
398 |
("defalias" code nil nil [27757 27840]) |
|
399 |
("defalias" code nil nil [27842 27931]) |
|
400 |
("ediff-check-version" function (:arguments ("op" "major" "minor" "type-of-emacs")) nil [28006 28824]) |
|
401 |
("ediff-color-display-p" function nil nil [28826 29021]) |
|
402 |
("ediff-defvar-local" code nil nil [29196 29315]) |
|
403 |
("if" code nil nil [29318 29607]) |
|
404 |
("ediff-current-diff-overlay-alist" variable |
|
405 |
(:constant-flag t |
|
406 |
:default-value (quote ((A . ediff-current-diff-overlay-A) (B . ediff-current-diff-overlay-B) (C . ediff-current-diff-overlay-C) (Ancestor . ediff-current-diff-overlay-Ancestor)))) |
|
407 |
nil [29677 29891]) |
|
408 |
("ediff-current-diff-face-alist" variable |
|
409 |
(:constant-flag t |
|
410 |
:default-value (quote ((A . ediff-current-diff-A) (B . ediff-current-diff-B) (C . ediff-current-diff-C) (Ancestor . ediff-current-diff-Ancestor)))) |
|
411 |
nil [29960 30139]) |
|
412 |
("ediff-set-overlay-face" function (:arguments ("extent" "face")) nil [30142 30300]) |
|
413 |
("ediff-region-help-echo" function (:arguments ("extent-or-window" "overlay" "_point")) nil [30302 31054]) |
|
414 |
("ediff-set-face-pixmap" function (:arguments ("face" "pixmap")) nil [31057 31373]) |
|
415 |
("ediff-hide-face" function (:arguments ("face")) nil [31375 31559]) |
|
416 |
("ediff-current-diff-A" variable |
|
417 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#ffdddd") (((class color) (min-colors 88) (background dark)) :background "#553333") (((class color) (min-colors 16)) (:foreground "firebrick" :background "pale green")) (((class color)) (:foreground "blue3" :background "yellow3")) (t (:inverse-video t)))) (quote ((((type tty)) (:foreground "blue3" :background "yellow3")) (((class color)) (:foreground "firebrick" :background "pale green")) (t (:inverse-video t))))) |
|
418 |
:type "face") |
|
419 |
nil [31563 32240]) |
|
420 |
("ediff-current-diff-face-A" variable (:default-value (quote ediff-current-diff-A)) nil [32389 32661]) |
|
421 |
("ediff-hide-face" code nil nil [32662 32705]) |
|
422 |
("and" code nil nil [32840 32984]) |
|
423 |
("ediff-current-diff-B" variable |
|
424 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#ddffdd") (((class color) (min-colors 88) (background dark)) :background "#335533") (((class color) (min-colors 16)) (:foreground "DarkOrchid" :background "Yellow")) (((class color)) (:foreground "magenta3" :background "yellow3" :weight bold)) (t (:inverse-video t)))) (quote ((((type tty)) (:foreground "magenta3" :background "yellow3" :weight bold)) (((class color)) (:foreground "DarkOrchid" :background "Yellow")) (t (:inverse-video t))))) |
|
425 |
:type "face") |
|
426 |
nil [32988 33707]) |
|
427 |
("ediff-current-diff-face-B" variable (:default-value (quote ediff-current-diff-B)) nil [33856 34108]) |
|
428 |
("ediff-hide-face" code nil nil [34109 34152]) |
|
429 |
("and" code nil nil [34287 34431]) |
|
430 |
("ediff-current-diff-C" variable |
|
431 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#ffffaa") (((class color) (min-colors 88) (background dark)) :background "#888833") (((class color) (min-colors 16)) (:foreground "Navy" :background "Pink")) (((class color)) (:foreground "cyan3" :background "yellow3" :weight bold)) (t (:inverse-video t)))) (quote ((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold)) (((class color)) (:foreground "Navy" :background "Pink")) (t (:inverse-video t))))) |
|
432 |
:type "face") |
|
433 |
nil [34434 35115]) |
|
434 |
("ediff-current-diff-face-C" variable (:default-value (quote ediff-current-diff-C)) nil [35264 35536]) |
|
435 |
("ediff-hide-face" code nil nil [35537 35580]) |
|
436 |
("and" code nil nil [35715 35859]) |
|
437 |
("ediff-current-diff-Ancestor" variable |
|
438 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#cfdeee") (((class color) (min-colors 88) (background dark)) :background "#004151") (((class color) (min-colors 16) (background light)) :background "#cfdeee") (((class color) (min-colors 16) (background dark)) :background "#004151") (((class color)) (:foreground "black" :background "magenta3")) (t (:inverse-video t)))) (quote ((((type tty)) (:foreground "black" :background "magenta3")) (((class color)) (:foreground "Black" :background "VioletRed")) (t (:inverse-video t))))) |
|
439 |
:type "face") |
|
440 |
nil [35862 36670]) |
|
441 |
("ediff-current-diff-face-Ancestor" variable (:default-value (quote ediff-current-diff-Ancestor)) nil [36819 37119]) |
|
442 |
("ediff-hide-face" code nil nil [37120 37170]) |
|
443 |
("and" code nil nil [37305 37456]) |
|
444 |
("ediff-fine-diff-A" variable |
|
445 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#ffbbbb") (((class color) (min-colors 88) (background dark)) :background "#aa2222") (((class color) (min-colors 16)) (:foreground "Navy" :background "sky blue")) (((class color)) (:foreground "white" :background "sky blue" :weight bold)) (t (:underline t :stipple "gray3")))) (quote ((((type tty)) (:foreground "white" :background "sky blue" :weight bold)) (((class color)) (:foreground "Navy" :background "sky blue")) (t (:underline t :stipple "gray3"))))) |
|
446 |
:type "face") |
|
447 |
nil [37459 38168]) |
|
448 |
("ediff-fine-diff-face-A" variable (:default-value (quote ediff-fine-diff-A)) nil [38317 38577]) |
|
449 |
("ediff-hide-face" code nil nil [38578 38618]) |
|
450 |
("ediff-fine-diff-B" variable |
|
451 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#aaffaa") (((class color) (min-colors 88) (background dark)) :background "#22aa22") (((class color) (min-colors 16)) (:foreground "Black" :background "cyan")) (((class color)) (:foreground "magenta3" :background "cyan3")) (t (:underline t :stipple "gray3")))) (quote ((((type tty)) (:foreground "magenta3" :background "cyan3")) (((class color)) (:foreground "Black" :background "cyan")) (t (:underline t :stipple "gray3"))))) |
|
452 |
:type "face") |
|
453 |
nil [38620 39314]) |
|
454 |
("ediff-fine-diff-face-B" variable (:default-value (quote ediff-fine-diff-B)) nil [39463 39723]) |
|
455 |
("ediff-hide-face" code nil nil [39724 39764]) |
|
456 |
("ediff-fine-diff-C" variable |
|
457 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#ffff55") (((class color) (min-colors 88) (background dark)) :background "#aaaa22") (((type pc)) (:foreground "white" :background "Turquoise")) (((class color) (min-colors 16)) (:foreground "Black" :background "Turquoise")) (((class color)) (:foreground "yellow3" :background "Turquoise" :weight bold)) (t (:underline t :stipple "gray3")))) (quote ((((type tty)) (:foreground "yellow3" :background "Turquoise" :weight bold)) (((type pc)) (:foreground "white" :background "Turquoise")) (((class color)) (:foreground "Black" :background "Turquoise")) (t (:underline t :stipple "gray3"))))) |
|
458 |
:type "face") |
|
459 |
nil [39766 40634]) |
|
460 |
("ediff-fine-diff-face-C" variable (:default-value (quote ediff-fine-diff-C)) nil [40783 41043]) |
|
461 |
("ediff-hide-face" code nil nil [41044 41084]) |
|
462 |
("ediff-fine-diff-Ancestor" variable |
|
463 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88) (background light)) :background "#00c5c0") (((class color) (min-colors 88) (background dark)) :background "#009591") (((class color) (min-colors 16) (background light)) :background "#00c5c0") (((class color) (min-colors 16) (background dark)) :background "#009591") (((class color)) (:foreground "red3" :background "green")) (t (:underline t :stipple "gray3")))) (quote ((((type tty)) (:foreground "red3" :background "green")) (((class color)) (:foreground "Black" :background "Green")) (t (:underline t :stipple "gray3"))))) |
|
464 |
:type "face") |
|
465 |
nil [41086 42034]) |
|
466 |
("ediff-fine-diff-face-Ancestor" variable (:default-value (quote ediff-fine-diff-Ancestor)) nil [42183 42471]) |
|
467 |
("ediff-hide-face" code nil nil [42472 42519]) |
|
468 |
("stipple-pixmap" variable (:default-value (cond ((not (ediff-has-face-support-p)) nil) ((and (boundp (quote x-bitmap-file-path)) (locate-library "stipple" t x-bitmap-file-path)) "stipple") ((and (boundp (quote mswindowsx-bitmap-file-path)) (locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple") (t "Stipple"))) nil [42591 42901]) |
|
469 |
("ediff-even-diff-A" variable |
|
470 |
(:default-value (if (featurep (quote emacs)) (\` ((((type pc)) (:foreground "green3" :background "light grey")) (((class color) (min-colors 88)) (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "red3" :background "light grey" :weight bold)) (t (:italic t :stipple (\, stipple-pixmap))))) (\` ((((type tty)) (:foreground "red3" :background "light grey" :weight bold)) (((type pc)) (:foreground "green3" :background "light grey")) (((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple (\, stipple-pixmap)))))) |
|
471 |
:type "face") |
|
472 |
nil [42903 43711]) |
|
473 |
("ediff-even-diff-face-A" variable (:default-value (quote ediff-even-diff-A)) nil [43860 44137]) |
|
474 |
("ediff-hide-face" code nil nil [44138 44178]) |
|
475 |
("ediff-even-diff-B" variable |
|
476 |
(:default-value (if (featurep (quote emacs)) (\` ((((class color) (min-colors 88)) (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "blue3" :background "Grey" :weight bold)) (t (:italic t :stipple (\, stipple-pixmap))))) (\` ((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple (\, stipple-pixmap)))))) |
|
477 |
:type "face") |
|
478 |
nil [44180 44807]) |
|
479 |
("ediff-even-diff-face-B" variable (:default-value (quote ediff-even-diff-B)) nil [44956 45233]) |
|
480 |
("ediff-hide-face" code nil nil [45234 45274]) |
|
481 |
("ediff-even-diff-C" variable |
|
482 |
(:default-value (if (featurep (quote emacs)) (\` ((((type pc)) (:foreground "yellow3" :background "light grey")) (((class color) (min-colors 88)) (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "yellow3" :background "light grey" :weight bold)) (t (:italic t :stipple (\, stipple-pixmap))))) (\` ((((type tty)) (:foreground "yellow3" :background "light grey" :weight bold)) (((type pc)) (:foreground "yellow3" :background "light grey")) (((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple (\, stipple-pixmap)))))) |
|
483 |
:type "face") |
|
484 |
nil [45276 46092]) |
|
485 |
("ediff-even-diff-face-C" variable (:default-value (quote ediff-even-diff-C)) nil [46241 46518]) |
|
486 |
("ediff-hide-face" code nil nil [46519 46559]) |
|
487 |
("ediff-even-diff-Ancestor" variable |
|
488 |
(:default-value (if (featurep (quote emacs)) (\` ((((type pc)) (:foreground "cyan3" :background "light grey")) (((class color) (min-colors 88)) (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "cyan3" :background "light grey" :weight bold)) (t (:italic t :stipple (\, stipple-pixmap))))) (\` ((((type tty)) (:foreground "cyan3" :background "light grey" :weight bold)) (((type pc)) (:foreground "cyan3" :background "light grey")) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple (\, stipple-pixmap)))))) |
|
489 |
:type "face") |
|
490 |
nil [46561 47352]) |
|
491 |
("ediff-even-diff-face-Ancestor" variable (:default-value (quote ediff-even-diff-Ancestor)) nil [47501 47806]) |
|
492 |
("ediff-hide-face" code nil nil [47807 47854]) |
|
493 |
("ediff-even-diff-face-alist" variable |
|
494 |
(:constant-flag t |
|
495 |
:default-value (quote ((A . ediff-even-diff-A) (B . ediff-even-diff-B) (C . ediff-even-diff-C) (Ancestor . ediff-even-diff-Ancestor)))) |
|
496 |
nil [47919 48083]) |
|
497 |
("ediff-odd-diff-A" variable |
|
498 |
(:default-value (if (featurep (quote emacs)) (quote ((((type pc)) (:foreground "green3" :background "gray40")) (((class color) (min-colors 88)) (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "red3" :background "black" :weight bold)) (t (:italic t :stipple "gray1")))) (quote ((((type tty)) (:foreground "red3" :background "black" :weight bold)) (((type pc)) (:foreground "green3" :background "gray40")) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))))) |
|
499 |
:type "face") |
|
500 |
nil [48085 48823]) |
|
501 |
("ediff-odd-diff-face-A" variable (:default-value (quote ediff-odd-diff-A)) nil [48972 49245]) |
|
502 |
("ediff-hide-face" code nil nil [49246 49285]) |
|
503 |
("ediff-odd-diff-B" variable |
|
504 |
(:default-value (if (featurep (quote emacs)) (quote ((((type pc)) (:foreground "White" :background "gray40")) (((class color) (min-colors 88)) (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) (:foreground "cyan3" :background "black" :weight bold)) (t (:italic t :stipple "gray1")))) (quote ((((type tty)) (:foreground "cyan3" :background "black" :weight bold)) (((type pc)) (:foreground "White" :background "gray40")) (((class color)) (:foreground "Black" :background "light grey")) (t (:italic t :stipple "gray1"))))) |
|
505 |
:type "face") |
|
506 |
nil [49288 50044]) |
|
507 |
("ediff-odd-diff-face-B" variable (:default-value (quote ediff-odd-diff-B)) nil [50193 50466]) |
|
508 |
("ediff-hide-face" code nil nil [50467 50506]) |
|
509 |
("ediff-odd-diff-C" variable |
|
510 |
(:default-value (if (featurep (quote emacs)) (quote ((((type pc)) (:foreground "yellow3" :background "gray40")) (((class color) (min-colors 88)) (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "yellow3" :background "black" :weight bold)) (t (:italic t :stipple "gray1")))) (quote ((((type tty)) (:foreground "yellow3" :background "black" :weight bold)) (((type pc)) (:foreground "yellow3" :background "gray40")) (((class color)) (:foreground "White" :background "Grey")) (t (:italic t :stipple "gray1"))))) |
|
511 |
:type "face") |
|
512 |
nil [50508 51254]) |
|
513 |
("ediff-odd-diff-face-C" variable (:default-value (quote ediff-odd-diff-C)) nil [51403 51676]) |
|
514 |
("ediff-hide-face" code nil nil [51677 51716]) |
|
515 |
("ediff-odd-diff-Ancestor" variable |
|
516 |
(:default-value (if (featurep (quote emacs)) (quote ((((class color) (min-colors 88)) (:background "gray40")) (((class color) (min-colors 16)) (:foreground "cyan3" :background "gray40")) (((class color)) (:foreground "green3" :background "black" :weight bold)) (t (:italic t :stipple "gray1")))) (quote ((((type tty)) (:foreground "green3" :background "black" :weight bold)) (((class color)) (:foreground "cyan3" :background "gray40")) (t (:italic t :stipple "gray1"))))) |
|
517 |
:type "face") |
|
518 |
nil [51718 52355]) |
|
519 |
("ediff-odd-diff-face-Ancestor" variable (:default-value (quote ediff-odd-diff-Ancestor)) nil [52504 52805]) |
|
520 |
("ediff-hide-face" code nil nil [52806 52852]) |
|
521 |
("ediff-odd-diff-face-alist" variable |
|
522 |
(:constant-flag t |
|
523 |
:default-value (quote ((A . ediff-odd-diff-A) (B . ediff-odd-diff-B) (C . ediff-odd-diff-C) (Ancestor . ediff-odd-diff-Ancestor)))) |
|
524 |
nil [52916 53075]) |
|
525 |
("ediff-fine-diff-face-alist" variable |
|
526 |
(:constant-flag t |
|
527 |
:default-value (quote ((A . ediff-fine-diff-A) (B . ediff-fine-diff-B) (C . ediff-fine-diff-C) (Ancestor . ediff-fine-diff-Ancestor)))) |
|
528 |
nil [53142 53306]) |
|
529 |
("put" code nil nil [53321 53421]) |
|
530 |
("put" code nil nil [53422 53522]) |
|
531 |
("put" code nil nil [53523 53623]) |
|
532 |
("put" code nil nil [53624 53731]) |
|
533 |
("add-hook" code nil nil [53733 53780]) |
|
534 |
("add-hook" code nil nil [53781 53843]) |
|
535 |
("ediff-defvar-local" code nil nil [53860 53972]) |
|
536 |
("ediff-defvar-local" code nil nil [53973 54085]) |
|
537 |
("ediff-defvar-local" code nil nil [54086 54198]) |
|
538 |
("ediff-defvar-local" code nil nil [54199 54329]) |
|
539 |
("ediff-toggle-read-only-function" variable (:default-value (quote read-only-mode)) nil [54331 54509]) |
|
540 |
("ediff-make-buffers-readonly-at-startup" variable nil nil [54511 54703]) |
|
541 |
("ediff-verbose-p" variable (:default-value t) nil [54755 54781]) |
|
542 |
("ediff-show-ancestor" variable (:default-value t) nil [54783 54938]) |
|
543 |
("ediff-defvar-local" code nil nil [55058 55111]) |
|
544 |
("ediff-autostore-merges" variable (:default-value (quote group-jobs-only)) nil [55113 55531]) |
|
545 |
("make-variable-buffer-local" code nil nil [55532 55584]) |
|
546 |
("ediff-defvar-local" code nil nil [55657 55707]) |
|
547 |
("ediff-merge-filename-prefix" variable (:default-value "merge_") nil [55709 55845]) |
|
548 |
("ediff-no-emacs-help-in-control-buffer" variable nil nil [55847 56051]) |
|
549 |
("ediff-temp-file-prefix" variable (:default-value (file-name-as-directory (cond ((boundp (quote temporary-file-directory)) temporary-file-directory) ((fboundp (quote temp-directory)) (temp-directory)) (t "/tmp/")))) nil [56181 56727]) |
|
550 |
("ediff-temp-file-mode" variable (:default-value 384) nil [56729 56846]) |
|
551 |
("ediff-metachars" variable (:default-value "[ |
|
552 |
!\"#$&'()*;<=>?[\\^`{|~]") nil [56947 57169]) |
|
553 |
("ediff-H-glyph" variable (:default-value (if (featurep (quote xemacs)) (make-glyph "H"))) nil [57221 57284]) |
|
554 |
("ediff-defvar-local" code nil nil [57355 57400]) |
|
555 |
("ediff-defvar-local" code nil nil [57469 57514]) |
|
556 |
("ediff-defvar-local" code nil nil [57583 57628]) |
|
557 |
("ediff-file-remote-p" function (:arguments ("file-name")) nil [57631 57698]) |
|
558 |
("ediff-listable-file" function (:arguments ("file-name")) nil [57762 57928]) |
|
559 |
("ediff-frame-unsplittable-p" function (:arguments ("frame")) nil [57931 58030]) |
|
560 |
("ediff-get-next-window" function (:arguments ("wind" "prev-wind")) nil [58032 58175]) |
|
561 |
("ediff-kill-buffer-carefully" function (:arguments ("buf")) nil [58178 58326]) |
|
562 |
("ediff-background-face" function (:arguments ("buf-type" "dif-num")) nil [58328 58631]) |
|
563 |
("ediff-paint-background-regions-in-one-buffer" function (:arguments ("buf-type" "unhighlight")) nil [58678 59241]) |
|
564 |
("ediff-paint-background-regions" function (:arguments ("unhighlight")) nil [59293 59630]) |
|
565 |
("ediff-clear-fine-diff-vector" function (:arguments ("diff-record")) nil [59726 59896]) |
|
566 |
("ediff-clear-fine-differences-in-one-buffer" function (:arguments ("n" "buf-type")) nil [59898 60077]) |
|
567 |
("ediff-clear-fine-differences" function (:arguments ("n")) nil [60079 60304]) |
|
568 |
("ediff-mouse-event-p" function (:arguments ("event")) nil [60307 60466]) |
|
569 |
("ediff-key-press-event-p" function (:arguments ("event")) nil [60469 60619]) |
|
570 |
("ediff-event-point" function (:arguments ("event")) nil [60621 60848]) |
|
571 |
("ediff-event-buffer" function (:arguments ("event")) nil [60850 61105]) |
|
572 |
("ediff-event-key" function (:arguments ("event-or-key")) nil [61107 61345]) |
|
573 |
("ediff-last-command-char" function nil nil [61347 61420]) |
|
574 |
("ediff-frame-iconified-p" function (:arguments ("frame")) nil [61423 61617]) |
|
575 |
("ediff-window-visible-p" function (:arguments ("wind")) nil [61619 61832]) |
|
576 |
("ediff-frame-char-width" function (:arguments ("frame")) nil [61835 61987]) |
|
577 |
("ediff-reset-mouse" function (:arguments ("frame" "do-not-grab-mouse")) nil [61989 62845]) |
|
578 |
("ediff-spy-after-mouse" function nil nil [62847 62941]) |
|
579 |
("ediff-user-grabbed-mouse" function nil nil [63160 63792]) |
|
580 |
("ediff-frame-char-height" function (:arguments ("frame")) nil [63794 63957]) |
|
581 |
("ediff-overlay-start" function (:arguments ("overl")) nil [63986 64140]) |
|
582 |
("ediff-overlay-end" function (:arguments ("overl")) nil [64142 64291]) |
|
583 |
("ediff-empty-overlay-p" function (:arguments ("overl")) nil [64293 64393]) |
|
584 |
("ediff-overlay-buffer" function (:arguments ("overl")) nil [64515 64660]) |
|
585 |
("ediff-overlay-get" function (:arguments ("overl" "property")) nil [64775 64943]) |
|
586 |
("ediff-move-overlay" function (:arguments ("overlay" "beg" "end" "buffer")) nil [65051 65532]) |
|
587 |
("ediff-overlay-put" function (:arguments ("overlay" "prop" "value")) nil [65534 65895]) |
|
588 |
("ediff-abbreviate-file-name" function (:arguments ("file" "dir")) nil [65985 66291]) |
|
589 |
("ediff-strip-last-dir" function (:arguments ("dir")) nil [66439 66831]) |
|
590 |
("ediff-truncate-string-left" function (:arguments ("str" "newlen")) nil [66833 67114]) |
|
591 |
("ediff-nonempty-string-p" function (:arguments ("string")) nil [67116 67210]) |
|
592 |
("unless" code nil nil [67212 67661]) |
|
593 |
("unless" code nil nil [67663 67734]) |
|
594 |
("ediff-abbrev-jobname" function (:arguments ("jobname")) nil [67736 68546]) |
|
595 |
("ediff-strip-mode-line-format" function nil nil [68604 68820]) |
|
596 |
("ediff-valid-difference-p" function (:arguments ("n")) nil [68868 69011]) |
|
597 |
("ediff-show-all-diffs" function (:arguments ("_n")) nil [69013 69090]) |
|
598 |
("ediff-message-if-verbose" function (:arguments ("string" "args")) nil [69092 69205]) |
|
599 |
("ediff-file-attributes" function (:arguments ("filename" "attr-number")) nil [69207 69358]) |
|
600 |
("ediff-file-size" function (:arguments ("filename")) nil [69360 69434]) |
|
601 |
("ediff-file-modtime" function (:arguments ("filename")) nil [69435 69512]) |
|
602 |
("ediff-convert-standard-filename" function (:arguments ("fname")) nil [69515 69656]) |
|
603 |
("if" code nil nil [69658 70294]) |
|
604 |
("ediff-init" package nil nil [70297 70318])) |
|
605 |
:file "ediff-init.el" |
|
606 |
:pointmax 70574 |
|
607 |
:fsize 70573 |
|
608 |
:lastmodtime '(23525 29613 0 0) |
|
609 |
:unmatched-syntax nil) |
|
610 |
(semanticdb-table "semanticdb-table" |
|
611 |
:file "ediff-diff.el" |
|
612 |
:fsize 53276 |
|
613 |
:lastmodtime '(23525 29613 0 0)) |
|
614 |
(semanticdb-table "semanticdb-table" |
|
615 |
:major-mode emacs-lisp-mode |
|
616 |
:tags |
|
617 |
'( ("icon-title-format" variable nil nil [915 941]) |
|
618 |
("top-toolbar-height" variable nil nil [942 969]) |
|
619 |
("bottom-toolbar-height" variable nil nil [970 1000]) |
|
620 |
("left-toolbar-height" variable nil nil [1001 1029]) |
|
621 |
("right-toolbar-height" variable nil nil [1030 1059]) |
|
622 |
("left-toolbar-width" variable nil nil [1060 1087]) |
|
623 |
("right-toolbar-width" variable nil nil [1088 1116]) |
|
624 |
("default-menubar" variable nil nil [1117 1141]) |
|
625 |
("top-gutter" variable nil nil [1142 1161]) |
|
626 |
("frame-icon-title-format" variable nil nil [1162 1194]) |
|
627 |
("ediff-diff-status" variable nil nil [1195 1221]) |
|
628 |
("unless" code nil nil [1288 1364]) |
|
629 |
("ediff-init" include nil nil [1367 1388]) |
|
630 |
("ediff-help" include nil nil [1389 1410]) |
|
631 |
("if" code nil nil [1479 1575]) |
|
632 |
("ediff-window" customgroup (:user-visible-flag t) nil [1578 1688]) |
|
633 |
("ediff-choose-window-setup-function-automatically" function nil nil [1771 1989]) |
|
634 |
("ediff-window-setup-function" variable (:default-value (quote ediff-setup-windows-default)) nil [1991 3607]) |
|
635 |
("ediff-defvar-local" code nil nil [3654 3698]) |
|
636 |
("ediff-defvar-local" code nil nil [3762 3815]) |
|
637 |
("ediff-defvar-local" code nil nil [3840 3888]) |
|
638 |
("ediff-defvar-local" code nil nil [3921 3963]) |
|
639 |
("ediff-defvar-local" code nil nil [3996 4038]) |
|
640 |
("ediff-defvar-local" code nil nil [4071 4113]) |
|
641 |
("ediff-defvar-local" code nil nil [4153 4202]) |
|
642 |
("ediff-defvar-local" code nil nil [4287 4339]) |
|
643 |
("ediff-window-alist" variable |
|
644 |
(:constant-flag t |
|
645 |
:default-value (quote ((A . ediff-window-A) (65 . ediff-window-A) (B . ediff-window-B) (66 . ediff-window-B) (C . ediff-window-C) (67 . ediff-window-C) (Ancestor . ediff-window-Ancestor)))) |
|
646 |
nil [4393 4615]) |
|
647 |
("ediff-split-window-function" variable (:default-value (quote split-window-vertically)) nil [4618 5266]) |
|
648 |
("ediff-merge-split-window-function" variable (:default-value (quote split-window-horizontally)) nil [5268 5924]) |
|
649 |
("declare-function" code nil nil [5986 6043]) |
|
650 |
("declare-function" code nil nil [6044 6102]) |
|
651 |
("ediff-control-frame-parameters" variable |
|
652 |
(:constant-flag t |
|
653 |
:default-value (list (quote (name . "Ediff")) (quote (minibuffer)) (quote (user-position . t)) (quote (vertical-scroll-bars)) (quote (scrollbar-width . 0)) (quote (scrollbar-height . 0)) (quote (menu-bar-lines . 0)) (quote (tool-bar-lines . 0)) (quote (left-fringe . 0)) (quote (right-fringe . 0)) (quote (auto-lower)) (quote (auto-raise . t)) (quote (visibility)) (quote (width . 1)) (quote (height . 1)) (quote (fullscreen)) (cons (quote top) (if (fboundp (quote ediff-display-pixel-height)) (1+ (ediff-display-pixel-height)) 3000)) (cons (quote left) (if (fboundp (quote ediff-display-pixel-width)) (1+ (ediff-display-pixel-width)) 3000)))) |
|
654 |
nil [6104 7323]) |
|
655 |
("ediff-defvar-local" code nil nil [7410 7464]) |
|
656 |
("ediff-mouse-pixel-threshold" variable (:default-value 30) nil [7486 7625]) |
|
657 |
("ediff-grab-mouse" variable (:default-value t) nil [7627 7932]) |
|
658 |
("ediff-control-frame-position-function" variable (:default-value (quote ediff-make-frame-position)) nil [7934 8313]) |
|
659 |
("ediff-control-frame-upward-shift" variable (:default-value 42) nil [8315 8679]) |
|
660 |
("ediff-narrow-control-frame-leftward-shift" variable (:default-value (if (featurep (quote xemacs)) 7 3)) nil [8681 9136]) |
|
661 |
("ediff-wide-control-frame-rightward-shift" variable (:default-value 7) nil [9138 9565]) |
|
662 |
("ediff-defvar-local" code nil nil [9630 9678]) |
|
663 |
("ediff-defvar-local" code nil nil [9727 9874]) |
|
664 |
("ediff-defvar-local" code nil nil [9875 9963]) |
|
665 |
("ediff-defvar-local" code nil nil [9964 10418]) |
|
666 |
("ediff-defvar-local" code nil nil [10479 10526]) |
|
667 |
("ediff-prefer-iconified-control-frame" variable nil nil [10528 11057]) |
|
668 |
("ediff-get-window-by-clicking" function (:arguments ("_wind" "_prev-wind" "wind-number")) nil [11074 11596]) |
|
669 |
("ediff-select-lowest-window" function nil nil [11641 12347]) |
|
670 |
("ediff-setup-windows" function (:arguments ("buffer-A" "buffer-B" "buffer-C" "control-buffer")) nil [12607 13274]) |
|
671 |
("ediff-setup-windows-default" function (:arguments ("buffer-A" "buffer-B" "buffer-C" "control-buffer")) nil [13276 13511]) |
|
672 |
("ediff-setup-windows-plain" function (:arguments ("buffer-A" "buffer-B" "buffer-C" "control-buffer")) nil [13633 13986]) |
|
673 |
("ediff-setup-control-buffer" function (:prototype-flag t) nil [13988 14039]) |
|
674 |
("ediff-setup-windows-plain-merge" function (:arguments ("buf-A" "buf-B" "buf-C" "control-buffer")) nil [14041 16342]) |
|
675 |
("ediff-setup-windows-plain-compare" function (:arguments ("buf-A" "buf-B" "buf-C" "control-buffer")) nil [16411 18956]) |
|
676 |
("ediff-setup-windows-multiframe" function (:arguments ("buf-A" "buf-B" "buf-C" "control-buf")) nil [19008 19323]) |
|
677 |
("ediff-setup-windows-multiframe-merge" function (:arguments ("buf-A" "buf-B" "buf-C" "control-buf")) nil [19325 27140]) |
|
678 |
("ediff-setup-windows-multiframe-compare" function (:arguments ("buf-A" "buf-B" "buf-C" "control-buf")) nil [27210 33395]) |
|
679 |
("ediff-skip-unsuitable-frames" function (:arguments ("ok-unsplittable")) nil [33515 34351]) |
|
680 |
("ediff-frame-has-dedicated-windows" function (:arguments ("frame")) nil [34353 34546]) |
|
681 |
("ediff-window-ok-for-display" function (:arguments ("wind")) nil [34780 35075]) |
|
682 |
("declare-function" code nil nil [35077 35152]) |
|
683 |
("ediff-setup-control-frame" function (:arguments ("ctl-buffer" "designated-minibuffer-frame")) nil [35190 40254]) |
|
684 |
("ediff-destroy-control-frame" function (:arguments ("ctl-buffer")) nil [40257 40713]) |
|
685 |
("ediff-make-frame-position" function (:arguments ("ctl-buffer" "ctl-frame-width" "ctl-frame-height")) nil [40760 42616]) |
|
686 |
("ediff-xemacs-select-frame-hook" function nil nil [42618 42795]) |
|
687 |
("ediff-make-wide-display" function nil nil [42797 43746]) |
|
688 |
("ediff-refresh-mode-lines" function nil nil [43922 47007]) |
|
689 |
("ediff-refresh-control-frame" function nil nil [47010 47551]) |
|
690 |
("ediff-make-narrow-control-buffer-id" function (:arguments ("skip-name")) nil [47554 47982]) |
|
691 |
("ediff-make-base-title" function nil nil [47984 48112]) |
|
692 |
("ediff-make-wide-control-buffer-id" function nil nil [48114 48548]) |
|
693 |
("ediff-get-visible-buffer-window" function (:arguments ("buff")) nil [48587 48762]) |
|
694 |
("ediff-keep-window-config" function (:arguments ("control-buf")) nil [48813 50118]) |
|
695 |
("ediff-wind" package nil nil [50121 50142])) |
|
696 |
:file "ediff-wind.el" |
|
697 |
:pointmax 50397 |
|
698 |
:fsize 50396 |
|
699 |
:lastmodtime '(23525 29614 0 0) |
|
700 |
:unmatched-syntax '((close-paren 1575 . 1576) (symbol 1460 . 1476) (open-paren 1459 . 1460) (close-paren 1364 . 1365) (symbol 1269 . 1285) (open-paren 1268 . 1269))) |
|
701 |
(semanticdb-table "semanticdb-table" |
|
702 |
:file "ediff-util.el" |
|
703 |
:fsize 158125 |
|
704 |
:lastmodtime '(23525 29614 0 0)) |
|
705 |
(semanticdb-table "semanticdb-table" |
|
706 |
:major-mode emacs-lisp-mode |
|
707 |
:tags |
|
708 |
'( ("ediff-multiframe" variable nil nil [931 956]) |
|
709 |
("ediff-init" include nil nil [974 995]) |
|
710 |
("ediff-long-help-message-head" variable |
|
711 |
(:constant-flag t |
|
712 |
:default-value " Move around | Toggle features | Manipulate |
|
713 |
=====================|===========================|=============================") |
|
714 |
nil [1015 1246]) |
|
715 |
("ediff-long-help-message-tail" variable |
|
716 |
(:constant-flag t |
|
717 |
:default-value "=====================|===========================|============================= |
|
718 |
R -show registry | = -compare regions | M -show session group |
|
719 |
D -diff output | E -browse Ediff manual| G -send bug report |
|
720 |
i -status info | ? -help off | z/q -suspend/quit |
|
721 |
------------------------------------------------------------------------------- |
|
722 |
For help on a specific command: Click Button 2 over it; or |
|
723 |
Put the cursor over it and type RET.") |
|
724 |
nil [1247 1823]) |
|
725 |
("ediff-long-help-message-compare3" variable |
|
726 |
(:constant-flag t |
|
727 |
:default-value " |
|
728 |
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y |
|
729 |
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff |
|
730 |
j -jump to diff | @ -auto-refinement | * -refine current region |
|
731 |
gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
|
732 |
C-l -recenter | #c -ignore case | |
|
733 |
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
|
734 |
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
|
735 |
~ -rotate buffers| m -wide display | |
|
736 |
") |
|
737 |
nil [1825 2546]) |
|
738 |
("ediff-long-help-message-compare2" variable |
|
739 |
(:constant-flag t |
|
740 |
:default-value " |
|
741 |
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A |
|
742 |
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff |
|
743 |
j -jump to diff | @ -auto-refinement | * -refine current region |
|
744 |
gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
|
745 |
C-l -recenter | #c -ignore case | |
|
746 |
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
|
747 |
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
|
748 |
~ -swap variants | m -wide display | |
|
749 |
") |
|
750 |
nil [2548 3269]) |
|
751 |
("ediff-long-help-message-narrow2" variable |
|
752 |
(:constant-flag t |
|
753 |
:default-value " |
|
754 |
p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A |
|
755 |
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff |
|
756 |
j -jump to diff | @ -auto-refinement | * -refine current region |
|
757 |
gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
|
758 |
C-l -recenter | #c -ignore case | % -narrow/widen buffs |
|
759 |
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
|
760 |
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
|
761 |
~ -swap variants | m -wide display | |
|
762 |
") |
|
763 |
nil [3271 4027]) |
|
764 |
("ediff-long-help-message-word-mode" variable |
|
765 |
(:constant-flag t |
|
766 |
:default-value " |
|
767 |
p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y |
|
768 |
n,SPC -next diff | h -highlighting | rx -restore buf X's old diff |
|
769 |
j -jump to diff | | |
|
770 |
gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs |
|
771 |
C-l -recenter | #c -ignore case | |
|
772 |
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X |
|
773 |
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output |
|
774 |
~ -swap variants | m -wide display | |
|
775 |
") |
|
776 |
nil [4029 4734]) |
|
777 |
("ediff-long-help-message-merge" variable |
|
778 |
(:constant-flag t |
|
779 |
:default-value " |
|
780 |
p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C |
|
781 |
n,SPC -next diff | h -highlighting | r -restore buf C's old diff |
|
782 |
j -jump to diff | @ -auto-refinement | * -refine current region |
|
783 |
gx -goto X's point| ## -ignore whitespace | ! -update diff regions |
|
784 |
C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions |
|
785 |
v/V -scroll up/dn | X -read-only in buf X | wx -save buf X |
|
786 |
</> -scroll lt/rt | m -wide display | wd -save diff output |
|
787 |
~ -swap variants | s -shrink window C | / -show/hide ancestor buff |
|
788 |
| $$ -show clashes only | & -merge w/new default |
|
789 |
| $* -skip changed regions | |
|
790 |
") |
|
791 |
nil [4736 5618]) |
|
792 |
("ediff-defvar-local" code nil nil [5653 5772]) |
|
793 |
("ediff-brief-message-string" variable |
|
794 |
(:constant-flag t |
|
795 |
:default-value " Type ? for help") |
|
796 |
nil [5774 5872]) |
|
797 |
("ediff-defvar-local" code nil nil [5906 6026]) |
|
798 |
("ediff-defvar-local" code nil nil [6028 6284]) |
|
799 |
("ediff-defvar-local" code nil nil [6285 6447]) |
|
800 |
("ediff-use-long-help-message" variable nil nil [6449 6609]) |
|
801 |
("ediff-defvar-local" code nil nil [6639 6948]) |
|
802 |
("ediff-help-region-map" variable (:default-value (make-sparse-keymap)) nil [7013 7064]) |
|
803 |
("define-key" code nil nil [7066 7176]) |
|
804 |
("ediff-set-help-overlays" function nil nil [7208 7720]) |
|
805 |
("ediff-help-for-quick-help" function (:user-visible-flag t) nil [7723 11001]) |
|
806 |
("ediff-help-message-line-length" function nil nil [11096 11278]) |
|
807 |
("ediff-indent-help-message" function nil nil [11281 11589]) |
|
808 |
("ediff-set-help-message" function nil nil [11632 13305]) |
|
809 |
("ediff-customize" function nil nil [13322 13392]) |
|
810 |
("ediff-help" package nil nil [13395 13416])) |
|
811 |
:file "ediff-help.el" |
|
812 |
:pointmax 13447 |
|
813 |
:fsize 13610 |
|
814 |
:lastmodtime '(23525 29613 0 0) |
|
815 |
:unmatched-syntax nil) |
|
816 |
(semanticdb-table "semanticdb-table" |
|
817 |
:major-mode emacs-lisp-mode |
|
818 |
:tags |
|
819 |
'( ("ediff-version" variable |
|
820 |
(:constant-flag t |
|
821 |
:default-value "2.81.5") |
|
822 |
nil [554 618]) |
|
823 |
("ediff-date" variable |
|
824 |
(:constant-flag t |
|
825 |
:default-value "July 4, 2013") |
|
826 |
nil [619 677]) |
|
827 |
("ediff" package nil nil [5070 5086]) |
|
828 |
("unless" code nil nil [5129 5205]) |
|
829 |
("ediff-util" include nil nil [5208 5229]) |
|
830 |
("ediff-init" include nil nil [5247 5268]) |
|
831 |
("ediff-mult" include nil nil [5269 5290]) |
|
832 |
("ediff" customgroup (:user-visible-flag t) nil [5334 5443]) |
|
833 |
("ediff-use-last-dir" variable nil nil [5446 5592]) |
|
834 |
("ediff-last-dir-A" variable nil nil [5649 5678]) |
|
835 |
("ediff-last-dir-B" variable nil nil [5734 5763]) |
|
836 |
("ediff-last-dir-C" variable nil nil [5819 5848]) |
|
837 |
("ediff-last-dir-ancestor" variable nil nil [5915 5951]) |
|
838 |
("ediff-last-merge-autostore-dir" variable nil nil [6030 6073]) |
|
839 |
("ediff-set-read-only-in-buf-A" function nil nil [6139 6253]) |
|
840 |
("declare-function" code nil nil [6255 6359]) |
|
841 |
("declare-function" code nil nil [6360 6480]) |
|
842 |
("ediff-get-default-file-name" function (:arguments ("default" "fileno")) nil [6799 7560]) |
|
843 |
("ediff-files" function |
|
844 |
(:user-visible-flag t |
|
845 |
:arguments ("file-A" "file-B" "startup-hooks")) |
|
846 |
nil [7604 8660]) |
|
847 |
("ediff-files3" function |
|
848 |
(:user-visible-flag t |
|
849 |
:arguments ("file-A" "file-B" "file-C" "startup-hooks")) |
|
850 |
nil [8677 10267]) |
|
851 |
("defalias" code nil nil [10284 10316]) |
|
852 |
("ediff-find-file" function (:arguments ("file-var" "buffer-name" "last-dir" "hooks-var")) nil [10319 12460]) |
|
853 |
("ediff-files-internal" function (:arguments ("file-A" "file-B" "file-C" "startup-hooks" "job-name" "merge-buffer-file")) nil [12534 13582]) |
|
854 |
("declare-function" code nil nil [13584 13638]) |
|
855 |
("defalias" code nil nil [13655 13685]) |
|
856 |
("ediff-current-file" function (:user-visible-flag t) nil [13702 15382]) |
|
857 |
("ediff-backup" function |
|
858 |
(:user-visible-flag t |
|
859 |
:arguments ("file")) |
|
860 |
nil [15400 15969]) |
|
861 |
("ediff-buffers" function |
|
862 |
(:user-visible-flag t |
|
863 |
:arguments ("buffer-A" "buffer-B" "startup-hooks" "job-name")) |
|
864 |
nil [15986 16947]) |
|
865 |
("defalias" code nil nil [16964 16999]) |
|
866 |
("ediff-buffers3" function |
|
867 |
(:user-visible-flag t |
|
868 |
:arguments ("buffer-A" "buffer-B" "buffer-C" "startup-hooks" "job-name")) |
|
869 |
nil [17017 18284]) |
|
870 |
("defalias" code nil nil [18301 18338]) |
|
871 |
("ediff-buffers-internal" function (:arguments ("buf-A" "buf-B" "buf-C" "startup-hooks" "job-name" "merge-buffer-file")) nil [18414 20312]) |
|
872 |
("ediff-get-default-directory-name" function nil nil [20557 20831]) |
|
873 |
("ediff-directories" function |
|
874 |
(:user-visible-flag t |
|
875 |
:arguments ("dir1" "dir2" "regexp")) |
|
876 |
nil [20849 21890]) |
|
877 |
("defalias" code nil nil [21907 21943]) |
|
878 |
("ediff-directory-revisions" function |
|
879 |
(:user-visible-flag t |
|
880 |
:arguments ("dir1" "regexp")) |
|
881 |
nil [21961 22863]) |
|
882 |
("defalias" code nil nil [22880 22933]) |
|
883 |
("ediff-directories3" function |
|
884 |
(:user-visible-flag t |
|
885 |
:arguments ("dir1" "dir2" "dir3" "regexp")) |
|
886 |
nil [22951 24166]) |
|
887 |
("defalias" code nil nil [24183 24221]) |
|
888 |
("ediff-merge-directories" function |
|
889 |
(:user-visible-flag t |
|
890 |
:arguments ("dir1" "dir2" "regexp" "merge-autostore-dir")) |
|
891 |
nil [24238 25414]) |
|
892 |
("defalias" code nil nil [25431 25479]) |
|
893 |
("ediff-merge-directories-with-ancestor" function |
|
894 |
(:user-visible-flag t |
|
895 |
:arguments ("dir1" "dir2" "ancestor-dir" "regexp" "merge-autostore-dir")) |
|
896 |
nil [25496 27061]) |
|
897 |
("ediff-merge-directory-revisions" function |
|
898 |
(:user-visible-flag t |
|
899 |
:arguments ("dir1" "regexp" "merge-autostore-dir")) |
|
900 |
nil [27078 28132]) |
|
901 |
("defalias" code nil nil [28149 28214]) |
|
902 |
("ediff-merge-directory-revisions-with-ancestor" function |
|
903 |
(:user-visible-flag t |
|
904 |
:arguments ("dir1" "regexp" "merge-autostore-dir")) |
|
905 |
nil [28231 29373]) |
|
906 |
("defalias" code nil nil [29390 29487]) |
|
907 |
("defalias" code nil nil [29504 29580]) |
|
908 |
("ediff-directories-internal" function (:arguments ("dir1" "dir2" "dir3" "regexp" "action" "jobname" "startup-hooks" "merge-autostore-dir")) nil [29985 32710]) |
|
909 |
("ediff-directory-revisions-internal" function (:arguments ("dir1" "regexp" "action" "jobname" "startup-hooks" "merge-autostore-dir")) nil [32797 34421]) |
|
910 |
("ediff-windows-wordwise" function |
|
911 |
(:user-visible-flag t |
|
912 |
:arguments ("dumb-mode" "wind-A" "wind-B" "startup-hooks")) |
|
913 |
nil [34472 35013]) |
|
914 |
("ediff-windows-linewise" function |
|
915 |
(:user-visible-flag t |
|
916 |
:arguments ("dumb-mode" "wind-A" "wind-B" "startup-hooks")) |
|
917 |
nil [35030 35564]) |
|
918 |
("ediff-windows" function (:arguments ("dumb-mode" "wind-A" "wind-B" "startup-hooks" "job-name" "word-mode")) nil [35806 36852]) |
|
919 |
("ediff-regions-wordwise" function |
|
920 |
(:user-visible-flag t |
|
921 |
:arguments ("buffer-A" "buffer-B" "startup-hooks")) |
|
922 |
nil [36870 38508]) |
|
923 |
("ediff-regions-linewise" function |
|
924 |
(:user-visible-flag t |
|
925 |
:arguments ("buffer-A" "buffer-B" "startup-hooks")) |
|
926 |
nil [38525 40756]) |
|
927 |
("ediff-regions-internal" function (:arguments ("buffer-A" "beg-A" "end-A" "buffer-B" "beg-B" "end-B" "startup-hooks" "job-name" "word-mode" "setup-parameters")) nil [40860 42571]) |
|
928 |
("defalias" code nil nil [42618 42660]) |
|
929 |
("ediff-merge-on-startup" function nil nil [42662 42937]) |
|
930 |
("ediff-merge-files" function |
|
931 |
(:user-visible-flag t |
|
932 |
:arguments ("file-A" "file-B" "startup-hooks" "merge-buffer-file")) |
|
933 |
nil [42954 44351]) |
|
934 |
("ediff-merge-files-with-ancestor" function |
|
935 |
(:user-visible-flag t |
|
936 |
:arguments ("file-A" "file-B" "file-ancestor" "startup-hooks" "merge-buffer-file")) |
|
937 |
nil [44368 46364]) |
|
938 |
("defalias" code nil nil [46381 46451]) |
|
939 |
("ediff-merge-buffers" function |
|
940 |
(:user-visible-flag t |
|
941 |
:arguments ("buffer-A" "buffer-B" "startup-hooks" "job-name" "merge-buffer-file")) |
|
942 |
nil [46468 47768]) |
|
943 |
("ediff-merge-buffers-with-ancestor" function |
|
944 |
(:user-visible-flag t |
|
945 |
:arguments ("buffer-A" "buffer-B" "buffer-ancestor" "startup-hooks" "job-name" "merge-buffer-file")) |
|
946 |
nil [47785 49482]) |
|
947 |
("ediff-merge-revisions" function |
|
948 |
(:user-visible-flag t |
|
949 |
:arguments ("file" "startup-hooks" "merge-buffer-file")) |
|
950 |
nil [49500 50596]) |
|
951 |
("ediff-merge-revisions-with-ancestor" function |
|
952 |
(:user-visible-flag t |
|
953 |
:arguments ("file" "startup-hooks" "merge-buffer-file")) |
|
954 |
nil [50614 51972]) |
|
955 |
("ediff-last-dir-patch" variable nil nil [51990 52019]) |
|
956 |
("ediff-patch-default-directory" variable nil nil [52020 52058]) |
|
957 |
("declare-function" code nil nil [52059 52157]) |
|
958 |
("declare-function" code nil nil [52158 52285]) |
|
959 |
("ediff-patch-file" function |
|
960 |
(:user-visible-flag t |
|
961 |
:arguments ("arg" "patch-buf")) |
|
962 |
nil [52302 53370]) |
|
963 |
("declare-function" code nil nil [53372 53503]) |
|
964 |
("ediff-patch-buffer" function |
|
965 |
(:user-visible-flag t |
|
966 |
:arguments ("arg" "patch-buf")) |
|
967 |
nil [53520 54348]) |
|
968 |
("defalias" code nil nil [54366 54402]) |
|
969 |
("defalias" code nil nil [54418 54463]) |
|
970 |
("ediff-revision" function |
|
971 |
(:user-visible-flag t |
|
972 |
:arguments ("file" "startup-hooks")) |
|
973 |
nil [54516 55869]) |
|
974 |
("defalias" code nil nil [55887 55924]) |
|
975 |
("ediff-load-version-control" function (:arguments ("silent")) nil [56057 56497]) |
|
976 |
("ediff-version" function (:user-visible-flag t) nil [56515 56850]) |
|
977 |
("declare-function" code nil nil [56901 56979]) |
|
978 |
("ediff-documentation" function |
|
979 |
(:user-visible-flag t |
|
980 |
:arguments ("node")) |
|
981 |
nil [56996 57793]) |
|
982 |
("ediff-files-command" function nil nil [57840 58120]) |
|
983 |
("ediff3-files-command" function nil nil [58137 58470]) |
|
984 |
("ediff-merge-command" function nil nil [58487 58785]) |
|
985 |
("ediff-merge-with-ancestor-command" function nil nil [58802 59196]) |
|
986 |
("ediff-directories-command" function nil nil [59213 59567]) |
|
987 |
("ediff-directories3-command" function nil nil [59584 59988]) |
|
988 |
("ediff-merge-directories-command" function nil nil [60005 60377]) |
|
989 |
("ediff-merge-directories-with-ancestor-command" function nil nil [60394 60859]) |
|
990 |
("ediff-util" include nil nil [60863 60884]) |
|
991 |
("run-hooks" code nil nil [60886 60914])) |
|
992 |
:file "ediff.el" |
|
993 |
:pointmax 61164 |
|
994 |
:fsize 61163 |
|
995 |
:lastmodtime '(23525 29614 0 0) |
|
996 |
:unmatched-syntax '((close-paren 5205 . 5206) (symbol 5110 . 5126) (open-paren 5109 . 5110))) |
|
997 |
(semanticdb-table "semanticdb-table" |
|
998 |
:major-mode emacs-lisp-mode |
|
999 |
:tags |
|
1000 |
'( ("A-begin" variable nil nil [1008 1024]) |
|
1001 |
("A-end" variable nil nil [1025 1039]) |
|
1002 |
("B-begin" variable nil nil [1040 1056]) |
|
1003 |
("B-end" variable nil nil [1057 1071]) |
|
1004 |
("diff-vector" variable nil nil [1072 1092]) |
|
1005 |
("merge-begin" variable nil nil [1093 1113]) |
|
1006 |
("merge-end" variable nil nil [1114 1132]) |
|
1007 |
("valid-diff" variable nil nil [1133 1152]) |
|
1008 |
("emerge-defvar-local" function (:arguments ("var" "value" "doc")) nil [1166 1610]) |
|
1009 |
("emerge-minor-modes-list" variable (:default-value (quote ((emerge-mode " Emerge") (emerge-fast-mode " F") (emerge-edit-mode " E") (emerge-auto-advance " A") (emerge-skip-prefers " S")))) nil [1683 1862]) |
|
1010 |
("if" code nil nil [1863 1995]) |
|
1011 |
("emerge-mode" function nil nil [2075 2594]) |
|
1012 |
("emerge" customgroup (:user-visible-flag t) nil [2632 2706]) |
|
1013 |
("emerge-diff-program" variable (:default-value "diff") nil [3318 3439]) |
|
1014 |
("emerge-diff3-program" variable (:default-value "diff3") nil [3440 3628]) |
|
1015 |
("emerge-diff-options" variable nil nil [3629 3769]) |
|
1016 |
("emerge-match-diff-line" variable (:default-value (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) (concat "^" x "\\([acd]\\)" x "$"))) nil [3770 4049]) |
|
1017 |
("emerge-diff-ok-lines-regexp" variable (:default-value "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)") nil [4050 4298]) |
|
1018 |
("emerge-diff3-ok-lines-regexp" variable (:default-value "^\\([1-3]:\\|====\\| \\)") nil [4299 4533]) |
|
1019 |
("emerge-rcs-ci-program" variable (:default-value "ci") nil [4535 4660]) |
|
1020 |
("emerge-rcs-co-program" variable (:default-value "co") nil [4661 4787]) |
|
1021 |
("emerge-process-local-variables" variable nil nil [4789 5046]) |
|
1022 |
("emerge-execute-line-deletions" variable nil nil [5047 5467]) |
|
1023 |
("emerge-before-flag" variable (:default-value "vvvvvvvvvvvvvvvvvvvv |
|
1024 |
") nil [5469 5720]) |
|
1025 |
("emerge-after-flag" variable (:default-value "^^^^^^^^^^^^^^^^^^^^ |
|
1026 |
") nil [5721 5971]) |
|
1027 |
("emerge-startup-hook" variable nil nil [5992 6127]) |
|
1028 |
("emerge-select-hook" variable nil nil [6128 6311]) |
|
1029 |
("emerge-unselect-hook" variable nil nil [6312 6499]) |
|
1030 |
("emerge-default-last-directories" variable nil nil [6590 6862]) |
|
1031 |
("emerge-last-dir-A" variable nil nil [6864 6965]) |
|
1032 |
("emerge-last-dir-B" variable nil nil [6966 7068]) |
|
1033 |
("emerge-last-dir-ancestor" variable nil nil [7069 7180]) |
|
1034 |
("emerge-last-dir-output" variable nil nil [7181 7288]) |
|
1035 |
("emerge-last-revision-A" variable nil nil [7289 7403]) |
|
1036 |
("emerge-last-revision-B" variable nil nil [7404 7519]) |
|
1037 |
("emerge-last-revision-ancestor" variable nil nil [7520 7644]) |
|
1038 |
("emerge-before-flag-length" variable nil nil [7646 7680]) |
|
1039 |
("emerge-before-flag-lines" variable nil nil [7681 7714]) |
|
1040 |
("emerge-before-flag-match" variable nil nil [7715 7748]) |
|
1041 |
("emerge-after-flag-length" variable nil nil [7749 7782]) |
|
1042 |
("emerge-after-flag-lines" variable nil nil [7783 7815]) |
|
1043 |
("emerge-after-flag-match" variable nil nil [7816 7848]) |
|
1044 |
("emerge-diff-buffer" variable nil nil [7849 7876]) |
|
1045 |
("emerge-diff-error-buffer" variable nil nil [7877 7910]) |
|
1046 |
("emerge-prefix-argument" variable nil nil [7911 7942]) |
|
1047 |
("emerge-file-out" variable nil nil [7943 7967]) |
|
1048 |
("emerge-exit-func" variable nil nil [7968 7993]) |
|
1049 |
("emerge-globalized-difference-list" variable nil nil [7994 8036]) |
|
1050 |
("emerge-globalized-number-of-differences" variable nil nil [8037 8085]) |
|
1051 |
("emerge-new-flags" function nil nil [8233 8849]) |
|
1052 |
("emerge-count-matches-string" function (:arguments ("string" "regexp")) nil [8851 9096]) |
|
1053 |
("emerge-new-flags" code nil nil [9131 9149]) |
|
1054 |
("emerge-min-visible-lines" variable (:default-value 3) nil [9151 9327]) |
|
1055 |
("emerge-temp-file-prefix" variable (:default-value (expand-file-name "emerge" temporary-file-directory)) nil [9329 9542]) |
|
1056 |
("make-obsolete-variable" code nil nil [9544 9659]) |
|
1057 |
("emerge-temp-file-mode" variable (:default-value 384) nil [9661 9781]) |
|
1058 |
("make-obsolete-variable" code nil nil [9783 9904]) |
|
1059 |
("emerge-combine-versions-template" variable (:default-value "#ifdef NEW |
|
1060 |
%b#else /* not NEW */ |
|
1061 |
%a#endif /* not NEW */ |
|
1062 |
") nil [9906 10477]) |
|
1063 |
("emerge-basic-keymap" variable nil nil [10497 10677]) |
|
1064 |
("emerge-fast-keymap" variable nil nil [10679 10797]) |
|
1065 |
("emerge-options-menu" variable (:default-value (make-sparse-keymap "Options")) nil [10799 10860]) |
|
1066 |
("emerge-merge-menu" variable (:default-value (make-sparse-keymap "Merge")) nil [10862 10919]) |
|
1067 |
("emerge-move-menu" variable (:default-value (make-sparse-keymap "Move")) nil [10921 10976]) |
|
1068 |
("emerge-command-prefix" variable (:default-value "") nil [10978 11147]) |
|
1069 |
("emerge-setup-fixed-keymaps" function nil nil [11302 18224]) |
|
1070 |
("emerge-defvar-local" code nil nil [18322 18390]) |
|
1071 |
("emerge-defvar-local" code nil nil [18391 18477]) |
|
1072 |
("emerge-defvar-local" code nil nil [18478 18564]) |
|
1073 |
("emerge-defvar-local" code nil nil [18565 18655]) |
|
1074 |
("emerge-defvar-local" code nil nil [18656 18746]) |
|
1075 |
("emerge-defvar-local" code nil nil [18747 18848]) |
|
1076 |
("emerge-defvar-local" code nil nil [18849 18978]) |
|
1077 |
("emerge-saved-variables" variable |
|
1078 |
(:constant-flag t |
|
1079 |
:default-value (quote ((buffer-modified-p set-buffer-modified-p) buffer-read-only buffer-auto-save-file-name))) |
|
1080 |
nil [18980 19208]) |
|
1081 |
("emerge-merging-values" variable |
|
1082 |
(:constant-flag t |
|
1083 |
:default-value (quote (nil t nil))) |
|
1084 |
nil [19209 19322]) |
|
1085 |
("emerge-defvar-local" code nil nil [19324 19430]) |
|
1086 |
("emerge-defvar-local" code nil nil [19431 19537]) |
|
1087 |
("emerge-defvar-local" code nil nil [19539 20999]) |
|
1088 |
("emerge-defvar-local" code nil nil [21000 21097]) |
|
1089 |
("emerge-defvar-local" code nil nil [21098 21185]) |
|
1090 |
("emerge-defvar-local" code nil nil [21186 21419]) |
|
1091 |
("emerge-defvar-local" code nil nil [21420 21515]) |
|
1092 |
("emerge-defvar-local" code nil nil [21516 21664]) |
|
1093 |
("emerge-defvar-local" code nil nil [21665 21802]) |
|
1094 |
("emerge-defvar-local" code nil nil [21803 22076]) |
|
1095 |
("emerge-defvar-local" code nil nil [22077 22197]) |
|
1096 |
("emerge-files-internal" function (:arguments ("file-A" "file-B" "startup-hooks" "quit-hooks" "output-file")) nil [22239 23706]) |
|
1097 |
("emerge-setup" function (:arguments ("buffer-A" "file-A" "buffer-B" "file-B" "startup-hooks" "quit-hooks" "output-file")) nil [23740 25328]) |
|
1098 |
("emerge-make-diff-list" function (:arguments ("file-A" "file-B")) nil [25387 25956]) |
|
1099 |
("emerge-extract-diffs" function (:arguments ("diff-buffer")) nil [25958 27433]) |
|
1100 |
("emerge-prepare-error-list" function (:arguments ("ok-regexp")) nil [27482 27776]) |
|
1101 |
("emerge-files-with-ancestor-internal" function (:arguments ("file-A" "file-B" "file-ancestor" "startup-hooks" "quit-hooks" "output-file")) nil [27834 29954]) |
|
1102 |
("emerge-setup-with-ancestor" function (:arguments ("buffer-A" "file-A" "buffer-B" "file-B" "buffer-ancestor" "file-ancestor" "startup-hooks" "quit-hooks" "output-file")) nil [30005 31783]) |
|
1103 |
("emerge-make-diff3-list" function (:arguments ("file-A" "file-B" "file-ancestor")) nil [31859 32491]) |
|
1104 |
("emerge-extract-diffs3" function (:arguments ("diff-buffer")) nil [32493 33377]) |
|
1105 |
("emerge-get-diff3-group" function (:arguments ("file")) nil [33379 34524]) |
|
1106 |
("emerge-files" function |
|
1107 |
(:user-visible-flag t |
|
1108 |
:arguments ("_arg" "file-A" "file-B" "file-out" "startup-hooks" "quit-hooks")) |
|
1109 |
nil [34581 35206]) |
|
1110 |
("emerge-files-with-ancestor" function |
|
1111 |
(:user-visible-flag t |
|
1112 |
:arguments ("_arg" "file-A" "file-B" "file-ancestor" "file-out" "startup-hooks" "quit-hooks")) |
|
1113 |
nil [35223 36024]) |
|
1114 |
("emerge-files-exit" function (:arguments ("file-out")) nil [36103 36269]) |
|
1115 |
("emerge-buffers" function |
|
1116 |
(:user-visible-flag t |
|
1117 |
:arguments ("buffer-A" "buffer-B" "startup-hooks" "quit-hooks")) |
|
1118 |
nil [36328 37093]) |
|
1119 |
("emerge-buffers-with-ancestor" function |
|
1120 |
(:user-visible-flag t |
|
1121 |
:arguments ("buffer-A" "buffer-B" "buffer-ancestor" "startup-hooks" "quit-hooks")) |
|
1122 |
nil [37110 38452]) |
|
1123 |
("emerge-files-command" function nil nil [38522 38863]) |
|
1124 |
("emerge-files-with-ancestor-command" function nil nil [38880 39881]) |
|
1125 |
("emerge-command-exit" function (:arguments ("file-out")) nil [39883 40005]) |
|
1126 |
("emerge-files-remote" function (:arguments ("file-a" "file-b" "file-out")) nil [40072 40317]) |
|
1127 |
("emerge-files-with-ancestor-remote" function (:arguments ("file-a" "file-b" "file-anc" "file-out")) nil [40334 40625]) |
|
1128 |
("emerge-remote-exit" function (:arguments ("file-out" "emerge-exit-func")) nil [40627 40815]) |
|
1129 |
("emerge-revisions" function |
|
1130 |
(:user-visible-flag t |
|
1131 |
:arguments ("arg" "file" "revision-A" "revision-B" "startup-hooks" "quit-hooks")) |
|
1132 |
nil [40879 41558]) |
|
1133 |
("emerge-revisions-with-ancestor" function |
|
1134 |
(:user-visible-flag t |
|
1135 |
:arguments ("arg" "file" "revision-A" "revision-B" "ancestor" "startup-hooks" "quit-hooks")) |
|
1136 |
nil [41575 42569]) |
|
1137 |
("emerge-revisions-internal" function (:arguments ("file" "revision-A" "revision-B" "startup-hooks" "quit-hooks" "_output-file")) nil [42571 43824]) |
|
1138 |
("emerge-revision-with-ancestor-internal" function (:arguments ("file" "revision-A" "revision-B" "ancestor" "startup-hooks" "quit-hooks" "output-file")) nil [43826 45693]) |
|
1139 |
("emerge-execute-line" function (:user-visible-flag t) nil [45751 50083]) |
|
1140 |
("emerge-merge-directories-filename-regexp" variable (:default-value "[^.]") nil [50155 50322]) |
|
1141 |
("emerge-merge-directories" function (:arguments ("a-dir" "b-dir" "ancestor-dir" "output-dir")) nil [50339 53248]) |
|
1142 |
("emerge-setup-windows" function (:arguments ("buffer-A" "buffer-B" "merge-buffer" "pos")) nil [53383 54309]) |
|
1143 |
("emerge-set-keys" function nil nil [54352 55733]) |
|
1144 |
("emerge-remember-buffer-characteristics" function nil nil [55735 56701]) |
|
1145 |
("emerge-restore-buffer-characteristics" function nil nil [56703 57145]) |
|
1146 |
("emerge-goto-line" function (:arguments ("desired-line" "current-line")) nil [57238 57352]) |
|
1147 |
("emerge-convert-diffs-to-markers" function (:arguments ("A-buffer" "B-buffer" "merge-buffer" "lineno-list")) nil [57354 59402]) |
|
1148 |
("emerge-select-prefer-Bs" function nil nil [59468 59838]) |
|
1149 |
("emerge-handle-local-variables" function nil nil [59924 60143]) |
|
1150 |
("emerge-write-and-delete" function (:arguments ("file-out")) nil [60171 60712]) |
|
1151 |
("emerge-recenter" function |
|
1152 |
(:user-visible-flag t |
|
1153 |
:arguments ("arg")) |
|
1154 |
nil [60728 62458]) |
|
1155 |
("emerge-operate-on-windows" function (:arguments ("operation" "arg")) nil [63058 63724]) |
|
1156 |
("emerge-scroll-up" function |
|
1157 |
(:user-visible-flag t |
|
1158 |
:arguments ("arg")) |
|
1159 |
nil [63726 64714]) |
|
1160 |
("emerge-scroll-down" function |
|
1161 |
(:user-visible-flag t |
|
1162 |
:arguments ("arg")) |
|
1163 |
nil [64716 65712]) |
|
1164 |
("emerge-scroll-left" function |
|
1165 |
(:user-visible-flag t |
|
1166 |
:arguments ("arg")) |
|
1167 |
nil [65714 66722]) |
|
1168 |
("emerge-scroll-right" function |
|
1169 |
(:user-visible-flag t |
|
1170 |
:arguments ("arg")) |
|
1171 |
nil [66724 67736]) |
|
1172 |
("emerge-scroll-reset" function (:user-visible-flag t) nil [67738 68028]) |
|
1173 |
("emerge-position-region" function (:arguments ("beg" "end" "pos")) nil [68405 69344]) |
|
1174 |
("emerge-next-difference" function (:user-visible-flag t) nil [69346 69819]) |
|
1175 |
("emerge-previous-difference" function (:user-visible-flag t) nil [69821 70251]) |
|
1176 |
("emerge-jump-to-difference" function |
|
1177 |
(:user-visible-flag t |
|
1178 |
:arguments ("difference-number")) |
|
1179 |
nil [70253 70642]) |
|
1180 |
("emerge-abort" function (:user-visible-flag t) nil [70644 70731]) |
|
1181 |
("emerge-quit" function |
|
1182 |
(:user-visible-flag t |
|
1183 |
:arguments ("arg")) |
|
1184 |
nil [70733 71552]) |
|
1185 |
("emerge-really-quit" function (:arguments ("arg")) nil [71586 72539]) |
|
1186 |
("emerge-select-A" function |
|
1187 |
(:user-visible-flag t |
|
1188 |
:arguments ("force")) |
|
1189 |
nil [72541 73158]) |
|
1190 |
("emerge-select-A-edit" function (:arguments ("merge-begin" "merge-end" "A-begin" "A-end")) nil [73193 73517]) |
|
1191 |
("emerge-select-B" function |
|
1192 |
(:user-visible-flag t |
|
1193 |
:arguments ("force")) |
|
1194 |
nil [73519 74136]) |
|
1195 |
("emerge-select-B-edit" function (:arguments ("merge-begin" "merge-end" "B-begin" "B-end")) nil [74171 74495]) |
|
1196 |
("emerge-default-A" function (:user-visible-flag t) nil [74497 75357]) |
|
1197 |
("emerge-default-B" function (:user-visible-flag t) nil [75359 76219]) |
|
1198 |
("emerge-fast-mode" function (:user-visible-flag t) nil [76221 76640]) |
|
1199 |
("emerge-edit-mode" function (:user-visible-flag t) nil [76642 77060]) |
|
1200 |
("emerge-auto-advance" function |
|
1201 |
(:user-visible-flag t |
|
1202 |
:arguments ("arg")) |
|
1203 |
nil [77062 77607]) |
|
1204 |
("emerge-skip-prefers" function |
|
1205 |
(:user-visible-flag t |
|
1206 |
:arguments ("arg")) |
|
1207 |
nil [77609 78195]) |
|
1208 |
("emerge-copy-as-kill-A" function (:user-visible-flag t) nil [78197 78627]) |
|
1209 |
("emerge-copy-as-kill-B" function (:user-visible-flag t) nil [78629 79059]) |
|
1210 |
("emerge-insert-A" function |
|
1211 |
(:user-visible-flag t |
|
1212 |
:arguments ("arg")) |
|
1213 |
nil [79061 79640]) |
|
1214 |
("emerge-insert-B" function |
|
1215 |
(:user-visible-flag t |
|
1216 |
:arguments ("arg")) |
|
1217 |
nil [79642 80221]) |
|
1218 |
("emerge-mark-difference" function |
|
1219 |
(:user-visible-flag t |
|
1220 |
:arguments ("arg")) |
|
1221 |
nil [80223 80732]) |
|
1222 |
("emerge-file-names" function (:user-visible-flag t) nil [80734 81980]) |
|
1223 |
("emerge-join-differences" function |
|
1224 |
(:user-visible-flag t |
|
1225 |
:arguments ("arg")) |
|
1226 |
nil [81982 83754]) |
|
1227 |
("emerge-split-difference" function (:user-visible-flag t) nil [83756 85992]) |
|
1228 |
("emerge-trim-difference" function (:user-visible-flag t) nil [85994 89331]) |
|
1229 |
("emerge-find-difference" function |
|
1230 |
(:user-visible-flag t |
|
1231 |
:arguments ("arg")) |
|
1232 |
nil [89697 90203]) |
|
1233 |
("emerge-find-difference-merge" function |
|
1234 |
(:user-visible-flag t |
|
1235 |
:arguments ("arg")) |
|
1236 |
nil [90205 90693]) |
|
1237 |
("emerge-find-difference-A" function |
|
1238 |
(:user-visible-flag t |
|
1239 |
:arguments ("arg")) |
|
1240 |
nil [90695 91268]) |
|
1241 |
("emerge-find-difference-B" function |
|
1242 |
(:user-visible-flag t |
|
1243 |
:arguments ("arg")) |
|
1244 |
nil [91270 91843]) |
|
1245 |
("emerge-find-difference1" function (:arguments ("arg" "location" "begin" "end")) nil [91845 93214]) |
|
1246 |
("emerge-line-numbers" function (:user-visible-flag t) nil [93216 93928]) |
|
1247 |
("emerge-line-diff" variable nil nil [93930 93955]) |
|
1248 |
("emerge-line-number-in-buf" function (:arguments ("begin-marker" "end-marker")) nil [93957 94378]) |
|
1249 |
("emerge-set-combine-template" function |
|
1250 |
(:user-visible-flag t |
|
1251 |
:arguments ("string" "localize")) |
|
1252 |
nil [94380 95069]) |
|
1253 |
("emerge-set-combine-versions-template" function |
|
1254 |
(:user-visible-flag t |
|
1255 |
:arguments ("start" "end" "localize")) |
|
1256 |
nil [95071 95797]) |
|
1257 |
("emerge-combine-versions" function |
|
1258 |
(:user-visible-flag t |
|
1259 |
:arguments ("force")) |
|
1260 |
nil [95799 96213]) |
|
1261 |
("emerge-combine-versions-register" function |
|
1262 |
(:user-visible-flag t |
|
1263 |
:arguments ("char" "force")) |
|
1264 |
nil [96215 96989]) |
|
1265 |
("emerge-combine-versions-internal" function (:arguments ("emerge-combine-template" "force")) nil [96991 97308]) |
|
1266 |
("emerge-combine-template" variable nil nil [97310 97342]) |
|
1267 |
("emerge-combine-versions-edit" function (:arguments ("merge-begin" "merge-end" "A-begin" "A-end" "B-begin" "B-end")) nil [97344 98202]) |
|
1268 |
("emerge-set-merge-mode" function |
|
1269 |
(:user-visible-flag t |
|
1270 |
:arguments ("mode")) |
|
1271 |
nil [98204 98627]) |
|
1272 |
("emerge-one-line-window" function nil nil [98629 98752]) |
|
1273 |
("emerge-select-difference" function (:arguments ("n")) nil [98899 99269]) |
|
1274 |
("emerge-place-flags-in-buffer" function (:arguments ("buffer" "difference" "before-index" "after-index")) nil [99271 99564]) |
|
1275 |
("emerge-place-flags-in-buffer1" function (:arguments ("difference" "before-index" "after-index")) nil [99566 101697]) |
|
1276 |
("emerge-unselect-difference" function (:arguments ("n")) nil [101769 102206]) |
|
1277 |
("emerge-remove-flags-in-buffer" function (:arguments ("buffer" "before" "after")) nil [102208 102815]) |
|
1278 |
("emerge-unselect-and-select-difference" function (:arguments ("n" "suppress-display")) nil [102876 103590]) |
|
1279 |
("emerge-select-version" function (:arguments ("force" "a-version" "b-version" "neither-version")) nil [104006 104892]) |
|
1280 |
("emerge-read-file-name" function (:arguments ("prompt" "alternative-default-dir" "default-file" "A-file" "must-match")) nil [104962 107135]) |
|
1281 |
("emerge-refresh-mode-line" function nil nil [107207 107813]) |
|
1282 |
("emerge-compare-buffers" function (:arguments ("buffer-x" "x-begin" "x-end" "buffer-y" "y-begin" "y-end")) nil [107882 108677]) |
|
1283 |
("emerge-unique-buffer-name" function (:arguments ("prefix" "suffix")) nil [108801 109069]) |
|
1284 |
("emerge-validate-difference" function nil nil [109117 109306]) |
|
1285 |
("emerge-save-variables" function (:arguments ("vars")) nil [109805 109933]) |
|
1286 |
("emerge-restore-variables" function (:arguments ("vars" "values")) nil [109935 110184]) |
|
1287 |
("emerge-make-temp-file" function (:arguments ("prefix")) nil [110310 110477]) |
|
1288 |
("emerge-query-write-file" function (:user-visible-flag t) nil [110558 110817]) |
|
1289 |
("emerge-query-save-buffer" function (:user-visible-flag t) nil [110819 111076]) |
|
1290 |
("emerge-query-and-call" function (:arguments ("command")) nil [111078 112177]) |
|
1291 |
("emerge-verify-file-buffer" function nil nil [112440 113282]) |
|
1292 |
("emerge-copy-modes" function (:arguments ("buffer")) nil [113425 113535]) |
|
1293 |
("emerge-force-define-key" function (:arguments ("keymap" "key" "definition")) nil [113588 114020]) |
|
1294 |
("emerge-define-key-if-possible" function (:arguments ("keymap" "key" "definition")) nil [117098 117590]) |
|
1295 |
("emerge-show-file-name" function (:user-visible-flag t) nil [118208 119021]) |
|
1296 |
("emerge-make-auto-save-file-name" function nil nil [119679 120828]) |
|
1297 |
("emerge-hash-string-into-string" function (:arguments ("s")) nil [120966 121333]) |
|
1298 |
("emerge-unslashify-name" function (:arguments ("s")) nil [121444 121793]) |
|
1299 |
("emerge-metachars" variable nil nil [121795 121942]) |
|
1300 |
("make-obsolete-variable" code nil nil [121943 121996]) |
|
1301 |
("emerge" package nil nil [121998 122015])) |
|
1302 |
:file "emerge.el" |
|
1303 |
:pointmax 122041 |
|
1304 |
:fsize 122040 |
|
1305 |
:lastmodtime '(23525 29614 0 0) |
|
1306 |
:unmatched-syntax nil)) |
|
1307 |
:file "!drive_c!Program Files!Emacs 26.1!share!emacs!26.1!lisp!vc!semantic.cache" |
|
1308 |
:semantic-tag-version "2.0" |
|
1309 |
:semanticdb-version "2.2") |