diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
| commit | b9fe4732f60bef14008aa9c4735d45f23fd8f670 (patch) | |
| tree | a1143820e91e6ead088b0b85b24f9388cceace95 /lisp/ediff-init.el | |
| parent | ea8d3061370eb3c02cc659eb0b013a358de853b2 (diff) | |
| download | emacs-b9fe4732f60bef14008aa9c4735d45f23fd8f670.tar.gz | |
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-change-state): Got rid of make-local-hook.
(viper-special-read-and-insert-char): Make C-m work right in the r
comand.
(viper-buffer-search-enable): Fixed format string.
* viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
instead of viper-info-on-file.
(ex-set-visited-file-name): New function.
* viper.el (viper-emacs-state-mode-list): Added mail-mode.
* ediff-mult.el (ediff-meta-mark-equal-files): Added optional
action argument.
* ediff-init.el: Fixed some doc strings.
* ediff-util.el (ediff-after-quit-hook-internal): New variable.
Got rid of make-local-hook.
* ediff-wind.el (ediff-setup-control-frame): Got rid of
make-local-hook.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index cbc57655ac2..336f360f31a 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -590,7 +590,7 @@ highlighted using ASCII flags." Actually, Ediff restores the scope of visibility that existed at startup.") (defcustom ediff-keep-variants t - "*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. + "*nil means prompt to remove unmodified buffers A/B/C at session end. Supplying a prefix argument to the quit command `q' temporarily reverses the meaning of this variable." :type 'boolean @@ -1241,7 +1241,7 @@ This property can be toggled interactively." (defcustom ediff-autostore-merges 'group-jobs-only "*Save the results of merge jobs automatically. -nil means don't save automatically. t means always save. Anything but nil or t +nil means don't save automatically. t means always save. Anything else means save automatically only if the merge job is part of a group of jobs, such as `ediff-merge-directory' or `ediff-merge-directory-revisions'." :type '(choice (const nil) (const t) (const group-jobs-only)) |