diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
| commit | 7d0278167b563513731e93c71d65463eadb6b89a (patch) | |
| tree | 2d16b74f5e7cc6768ffb80872d0f5d5443163eda /lisp/ediff-help.el | |
| parent | 1862a24e48a6c85a9821c3a82441a5f5e3b94c69 (diff) | |
| download | emacs-7d0278167b563513731e93c71d65463eadb6b89a.tar.gz | |
* ediff-diff.el: Moved variables around to have it compile under NT.
* ediff-help.el (ediff-use-long-help-message): made it customizable.
* ediff-init.el (ediff-abbrev-jobname): use capitalize.
* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
redundant skip-small-frames test.
* viper-cmd.el (viper-change-state-to-vi): disable overwrite mode.
(viper-downgrade-to-insert): protect against errors in hooks.
* viper-init.el (viper-vi-state-hook,viper-insert-state-hook,
viper-replace-state-hook,viper-emacs-state-hook): do cursor handling.
(viper-restore-cursor-type,viper-set-insert-cursor-type): new
functions.
* viper-util.el (viper-memq-char): bug fixes
* viper.el (viper-mode): fix cursor handling.
Diffstat (limited to 'lisp/ediff-help.el')
| -rw-r--r-- | lisp/ediff-help.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index 0de065f5e86..246bb5b9a8f 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -144,8 +144,10 @@ produce the brief help message. This function must return a string.") "The long help message that the user can customize. See `ediff-brief-help-message-function' for more.") -(defvar ediff-use-long-help-message nil - "*If t, Ediff displays a long help message. Short help message otherwise.") +(defcustom ediff-use-long-help-message nil + "*If t, Ediff displays a long help message. Short help message otherwise." + :type 'boolean + :group 'ediff-window) ;; The actual help message. (ediff-defvar-local ediff-help-message "" |