diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
| commit | 899a431bae4a7b48a266c5da56610a5ea44febad (patch) | |
| tree | 38050620920c4ff4b5bd4dc2c4f3267dfe76eef2 /lisp/ediff-help.el | |
| parent | d06e384795d5ca4e82c88273847eeb9d01380046 (diff) | |
| download | emacs-899a431bae4a7b48a266c5da56610a5ea44febad.tar.gz | |
2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-same-contents) Eliminate CL-type functions.
* ediff-mult.el (ediff-intersect-directories) Make sure that ".." and
"." files are deleted from all file lists before comparison
* viper-keym.el
(viper-toggle-key,viper-quoted-insert-key,viper-ESC-key):
Made them customizable.
* viper.el (viper-non-hook-settings): fixed the names of defadvices.
Diffstat (limited to 'lisp/ediff-help.el')
| -rw-r--r-- | lisp/ediff-help.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index bdd92f5c12d..69d170faedf 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -132,7 +132,7 @@ Normally, not a user option. See `ediff-help-message' for details.") "Normally, not a user option. See `ediff-help-message' for details.") (defconst ediff-brief-message-string - " ? -quick help " + " Type ? for help" "Contents of the brief help message.") ;; The actual brief help message (ediff-defvar-local ediff-brief-help-message "" |