diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-10 18:46:24 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-10 18:46:24 +0000 |
| commit | 8ea74b0e4570fe6e3ee583b0655bf6137d82dc28 (patch) | |
| tree | d1d6a6c3acdc71b8843ee590b05c4e4150567803 /lisp/ediff-mult.el | |
| parent | 9a4183e9ea0b4b2d09629652ce3d2d02bff1e647 (diff) | |
| download | emacs-8ea74b0e4570fe6e3ee583b0655bf6137d82dc28.tar.gz | |
* viper-cmd.el (viper--key-maps): new variable.
(viper-normalize-minor-mode-map-alist): use viper--key-maps and
emulation-mode-map-alists.
(viper-envelop-ESC-key): use viper-subseq.
(viper-search-forward/backward/next): disable debug-on-error.
* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
viper-ESC-key): new defcustoms.
* viper-macs.el (ex-map-read-args): use viper-subseq.
* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
(viper-subseq): copy of subseq from cl.el.
* viper.el (viper-go-away,viper-set-hooks): use
emulation-mode-map-alists, advise self-insert-command, add-minor-mode.
* viper-mous.el (viper-current-frame-saved): use defvar.
* viper-init.el: got rid of -face in face names.
* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
Make it work with longlines mode
* ediff-mult.el (ediff-meta-mode-hook): new variable.
* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.
* ediff-init: got rid of -face in face names.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index c7ad411b4ac..1303d65cf2e 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -205,6 +205,12 @@ Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." This can be toggled with `ediff-toggle-filename-truncation'." :type 'boolean :group 'ediff-mult) + +(defcustom ediff-meta-mode-hook nil + "*Hooks run just after setting up meta mode." + :type 'hook + :group 'ediff-mult) + (defcustom ediff-registry-setup-hook nil "*Hooks run just after the registry control panel is set up." :type 'hook @@ -411,7 +417,8 @@ Commands: (kill-all-local-variables) (setq major-mode 'ediff-meta-mode) (setq mode-name "MetaEdiff") - (run-mode-hooks 'ediff-meta-mode-hook)) + ;; don't use run-mode-hooks here! + (run-hooks 'ediff-meta-mode-hook)) ;; the keymap for the buffer showing directory differences |