• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.10/emacs-93/emacs/lisp/

Lines Matching +defs:mode +defs:function

87 (defun ediff-mode ()
88 "Ediff mode controls all operations in a single Ediff session.
89 This mode is entered through one of the following commands:
117 \\{ediff-mode-map}"
119 (setq major-mode 'ediff-mode)
120 (setq mode-name "Ediff")
121 ;; We use run-hooks instead of run-mode-hooks for two reasons.
123 ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything
125 ;; Second, changing run-hooks to run-mode-hooks would require an
127 (run-hooks 'ediff-mode-hook))
134 (ediff-defvar-local ediff-mode-map nil
135 "Local keymap used in Ediff mode.
142 (if (null ediff-mode-map)
144 (use-local-map ediff-mode-map))
149 (setq ediff-mode-map nil)
155 (setq ediff-mode-map (make-sparse-keymap))
156 (suppress-keymap ediff-mode-map)
158 (define-key ediff-mode-map
160 (define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help)
162 (define-key ediff-mode-map "p" 'ediff-previous-difference)
163 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
164 (define-key ediff-mode-map [delete] 'ediff-previous-difference)
165 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
168 (define-key ediff-mode-map [backspace] 'ediff-previous-difference)
169 (define-key ediff-mode-map "n" 'ediff-next-difference)
170 (define-key ediff-mode-map " " 'ediff-next-difference)
171 (define-key ediff-mode-map "j" 'ediff-jump-to-difference)
172 (define-key ediff-mode-map "g" nil)
173 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
174 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
175 (define-key ediff-mode-map "q" 'ediff-quit)
176 (define-key ediff-mode-map "D" 'ediff-show-diff-output)
177 (define-key ediff-mode-map "z" 'ediff-suspend)
178 (define-key ediff-mode-map "\C-l" 'ediff-recenter)
179 (define-key ediff-mode-map "|" 'ediff-toggle-split)
180 (define-key ediff-mode-map "h" 'ediff-toggle-hilit)
181 (or ediff-word-mode
182 (define-key ediff-mode-map "@" 'ediff-toggle-autorefine))
184 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
185 (define-key ediff-mode-map "~" 'ediff-swap-buffers)
186 (define-key ediff-mode-map "v" 'ediff-scroll-vertically)
187 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
188 (define-key ediff-mode-map "^" 'ediff-scroll-vertically)
189 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
190 (define-key ediff-mode-map "V" 'ediff-scroll-vertically)
191 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
192 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
193 (define-key ediff-mode-map "i" 'ediff-status-info)
194 (define-key ediff-mode-map "E" 'ediff-documentation)
195 (define-key ediff-mode-map "?" 'ediff-toggle-help)
196 (define-key ediff-mode-map "!" 'ediff-update-diffs)
197 (define-key ediff-mode-map "M" 'ediff-show-current-session-meta-buffer)
198 (define-key ediff-mode-map "R" 'ediff-show-registry)
199 (or ediff-word-mode
200 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
201 (define-key ediff-mode-map "a" nil)
202 (define-key ediff-mode-map "b" nil)
203 (define-key ediff-mode-map "r" nil)
206 (define-key ediff-mode-map "/" 'ediff-show-ancestor)
208 (define-key ediff-mode-map "a" 'ediff-copy-A-to-C)
209 (define-key ediff-mode-map "b" 'ediff-copy-B-to-C)
210 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer)
211 (define-key ediff-mode-map "s" 'ediff-shrink-window-C)
212 (define-key ediff-mode-map "+" 'ediff-combine-diffs)
213 (define-key ediff-mode-map "$" nil)
214 (define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only)
215 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions)
216 (define-key ediff-mode-map "&" 'ediff-re-merge))
218 (define-key ediff-mode-map "ab" 'ediff-copy-A-to-B)
219 (define-key ediff-mode-map "ba" 'ediff-copy-B-to-A)
220 (define-key ediff-mode-map "ac" 'ediff-copy-A-to-C)
221 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C)
222 (define-key ediff-mode-map "c" nil)
223 (define-key ediff-mode-map "ca" 'ediff-copy-C-to-A)
224 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B)
225 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
226 (define-key ediff-mode-map "rb" 'ediff-restore-diff)
227 (define-key ediff-mode-map "rc" 'ediff-restore-diff)
228 (define-key ediff-mode-map "C" 'ediff-toggle-read-only))
230 (define-key ediff-mode-map "a" 'ediff-copy-A-to-B)
231 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A)
232 (define-key ediff-mode-map "ra" 'ediff-restore-diff)
233 (define-key ediff-mode-map "rb" 'ediff-restore-diff))
235 (define-key ediff-mode-map "G" 'ediff-submit-report)
236 (define-key ediff-mode-map "#" nil)
237 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
238 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
239 (define-key ediff-mode-map "#c" 'ediff-toggle-ignore-case)
240 (or ediff-word-mode
241 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
242 (define-key ediff-mode-map "o" nil)
243 (define-key ediff-mode-map "A" 'ediff-toggle-read-only)
244 (define-key ediff-mode-map "B" 'ediff-toggle-read-only)
245 (define-key ediff-mode-map "w" nil)
246 (define-key ediff-mode-map "wa" 'ediff-save-buffer)
247 (define-key ediff-mode-map "wb" 'ediff-save-buffer)
248 (define-key ediff-mode-map "wd" 'ediff-save-buffer)
249 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
251 (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics))
254 (define-key ediff-mode-map "wc" 'ediff-save-buffer)
255 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
258 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
260 ;; Allow ediff-mode-map to be referenced indirectly
261 (fset 'ediff-mode-map ediff-mode-map)
303 (ediff-mode)
307 (make-local-variable 'ediff-split-window-function)
310 (make-local-variable 'ediff-window-setup-function)
332 ediff-word-mode-job (ediff-word-mode-job))
362 (setq ediff-split-window-function
363 ediff-merge-split-window-function)
375 (funcall (ediff-with-current-buffer buf major-mode))
377 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
406 (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
407 (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
409 (ediff-with-current-buffer buffer-C (ediff-strip-mode-line-format)))
412 (ediff-strip-mode-line-format)))
416 ;; ediff-setup-diff-regions-function must be set after setup
418 (setq ediff-setup-diff-regions-function
478 ;; (it can happen if it is on rmail-mode or similar)
505 (funcall ediff-setup-diff-regions-function file-A file-B file-C)
547 (ediff-refresh-mode-lines)
560 ;; This function assumes that we are in the window where control buffer is
577 (ediff-refresh-mode-lines)
585 ediff-split-window-function
613 (auto-save-mode 1))
666 (if ediff-word-mode
677 ;; not word-mode
699 (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
705 (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3
710 (funcall ediff-setup-diff-regions-function file-A file-B file-C))
843 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
846 ;; this function returns to the window it was called from
918 (setq ediff-split-window-function
919 (if (eq ediff-split-window-function 'split-window-vertically)
967 "Toggle auto-refine mode."
970 (if ediff-word-mode
971 (error "No fine differences in this mode"))
1047 (toggle-ro-cmd (cond (ediff-toggle-read-only-function)
1069 ;; do this, the mode line will show %%, since the file was
1104 (checkout-function (key-binding "\C-x\C-q")))
1112 (command-execute checkout-function)))))
1296 (funcall ediff-make-wide-display-function)
1305 To change the default, set the variable `ediff-window-setup-function',
1313 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
1315 ((eq ediff-window-setup-function 'ediff-setup-windows-plain)
1321 (setq-default ediff-window-setup-function window-setup-func)
1324 (setq ediff-window-setup-function window-setup-func
1406 "Toggle the mode that shows only the merge regions where both variants differ from the ancestor."
1417 "Toggle the mode that skips the merge regions that differ from the default."
1443 ;; This function does nothing if job-name is not
1735 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1761 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1785 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
1810 (setq regexp-skip (funcall ediff-skip-diff-region-function n))
2078 (ediff-refresh-mode-lines)
2176 (ediff-refresh-mode-lines)
2217 ((or (and (eq ediff-skip-diff-region-function
2218 ediff-focus-on-regexp-matches-function)
2220 (and (eq ediff-skip-diff-region-function
2221 ediff-hide-regexp-matches-function)
2224 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
2226 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
2264 (setq ediff-skip-diff-region-function
2265 ediff-focus-on-regexp-matches-function
2317 Regions to be ignored according to this function are those where
2320 This function returns nil if the region number N (specified as
2361 This function returns nil if the region number N (specified as
2456 ;; restore buffer mode line id's in buffer-A/B/C
2472 (kill-local-variable 'mode-line-buffer-identification)
2473 (kill-local-variable 'mode-line-format)
2481 (kill-local-variable 'mode-line-buffer-identification)
2482 (kill-local-variable 'mode-line-format)
2490 (kill-local-variable 'mode-line-buffer-identification)
2491 (kill-local-variable 'mode-line-format)
2499 (kill-local-variable 'mode-line-buffer-identification)
2500 (kill-local-variable 'mode-line-format)
2623 (funcall ediff-split-window-function))
2633 (funcall ediff-split-window-function))
2760 (defun ediff-default-suspend-function ()
2836 (fundamental-mode))
2900 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
2902 ((eq ediff-skip-diff-region-function
2903 ediff-hide-regexp-matches-function)
2911 ((eq ediff-skip-diff-region-function
2912 ediff-focus-on-regexp-matches-function)
3022 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
3115 ;; This is adapted from a similar function in `emerge.el'.
3206 (set-file-modes f ediff-temp-file-mode)
3417 ;; This function operates only from an ediff control buffer
3443 ;; put the diff file in diff-mode, if it is available
3444 (if (fboundp 'diff-mode)
3446 (diff-mode)))
3484 After quitting the session invoked via this function, type C-l to the parent
3605 (if use-current-diff-p ; word mode, if diffing current diff
3608 (list (cons 'ediff-split-window-function ediff-split-window-function)))
3768 ;; supporting sticky overlays, this function will make a sticky overlay.
3840 (use-dired-major-mode
3842 ((eq (ediff-with-current-buffer (car excl-buff-lst) major-mode)
3843 'dired-mode)
3863 ((eq use-dired-major-mode 'yes)
3864 (if (eq (ediff-with-current-buffer x major-mode)
3865 'dired-mode)
3867 ((eq (ediff-with-current-buffer x major-mode)
3868 'dired-mode)
3869 (if (null use-dired-major-mode)
3877 ((memq (ediff-with-current-buffer x major-mode)
3878 '(rmail-mode
3879 vm-mode
3880 gnus-article-mode
3881 mh-show-mode))
3902 ((eq use-dired-major-mode 'yes)
3904 x major-mode)
3905 'dired-mode)
3907 ((eq (ediff-with-current-buffer x major-mode)
3908 'dired-mode)
3923 (if (eq major-mode 'Buffer-menu-mode)
3963 ediff-forward-word-function
3966 ediff-control-frame-position-function
3968 ediff-window-setup-function
3969 ediff-split-window-function
3971 ediff-word-mode
4044 ;; If buffer B is not fundamental or text mode, use its syntax table
4046 ;; The syntax mode is used in ediff-forward-word-function
4052 (if (not (memq major-mode
4053 '(fundamental-mode text-mode indented-text-mode)))
4071 (make-local-variable 'transient-mark-mode)
4073 transient-mark-mode t) ; emacs
4235 (fundamental-mode))