Mercurial > emacs
comparison lisp/ediff-mult.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Jul 2005 08:02:00 +0000 |
parents | f9a65d7ebd29 a4c59075cac8 |
children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
90200:f9a65d7ebd29 | 90201:fbb2bea03df9 |
---|---|
203 (defcustom ediff-meta-truncate-filenames t | 203 (defcustom ediff-meta-truncate-filenames t |
204 "*If non-nil, truncate long file names in the session group buffers. | 204 "*If non-nil, truncate long file names in the session group buffers. |
205 This can be toggled with `ediff-toggle-filename-truncation'." | 205 This can be toggled with `ediff-toggle-filename-truncation'." |
206 :type 'boolean | 206 :type 'boolean |
207 :group 'ediff-mult) | 207 :group 'ediff-mult) |
208 | |
209 (defcustom ediff-meta-mode-hook nil | |
210 "*Hooks run just after setting up meta mode." | |
211 :type 'hook | |
212 :group 'ediff-mult) | |
213 | |
208 (defcustom ediff-registry-setup-hook nil | 214 (defcustom ediff-registry-setup-hook nil |
209 "*Hooks run just after the registry control panel is set up." | 215 "*Hooks run just after the registry control panel is set up." |
210 :type 'hook | 216 :type 'hook |
211 :group 'ediff-mult) | 217 :group 'ediff-mult) |
212 | 218 |
409 Commands: | 415 Commands: |
410 \\{ediff-meta-buffer-map}" | 416 \\{ediff-meta-buffer-map}" |
411 (kill-all-local-variables) | 417 (kill-all-local-variables) |
412 (setq major-mode 'ediff-meta-mode) | 418 (setq major-mode 'ediff-meta-mode) |
413 (setq mode-name "MetaEdiff") | 419 (setq mode-name "MetaEdiff") |
414 (run-mode-hooks 'ediff-meta-mode-hook)) | 420 ;; don't use run-mode-hooks here! |
421 (run-hooks 'ediff-meta-mode-hook)) | |
415 | 422 |
416 | 423 |
417 ;; the keymap for the buffer showing directory differences | 424 ;; the keymap for the buffer showing directory differences |
418 (suppress-keymap ediff-dir-diffs-buffer-map) | 425 (suppress-keymap ediff-dir-diffs-buffer-map) |
419 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer) | 426 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer) |