Mercurial > emacs
comparison lisp/ediff-init.el @ 42288:3ce98f3e0608
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.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Mon, 24 Dec 2001 05:50:31 +0000 |
parents | 7308bbc423d5 |
children | 633233bf2bbf |
comparison
equal
deleted
inserted
replaced
42287:c95e74201401 | 42288:3ce98f3e0608 |
---|---|
588 (ediff-defvar-local ediff-quit-widened t | 588 (ediff-defvar-local ediff-quit-widened t |
589 "*Non-nil means: when finished, Ediff widens buffers A/B. | 589 "*Non-nil means: when finished, Ediff widens buffers A/B. |
590 Actually, Ediff restores the scope of visibility that existed at startup.") | 590 Actually, Ediff restores the scope of visibility that existed at startup.") |
591 | 591 |
592 (defcustom ediff-keep-variants t | 592 (defcustom ediff-keep-variants t |
593 "*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. | 593 "*nil means prompt to remove unmodified buffers A/B/C at session end. |
594 Supplying a prefix argument to the quit command `q' temporarily reverses the | 594 Supplying a prefix argument to the quit command `q' temporarily reverses the |
595 meaning of this variable." | 595 meaning of this variable." |
596 :type 'boolean | 596 :type 'boolean |
597 :group 'ediff) | 597 :group 'ediff) |
598 | 598 |
1239 ;; if nil, this silences some messages | 1239 ;; if nil, this silences some messages |
1240 (defconst ediff-verbose-p t) | 1240 (defconst ediff-verbose-p t) |
1241 | 1241 |
1242 (defcustom ediff-autostore-merges 'group-jobs-only | 1242 (defcustom ediff-autostore-merges 'group-jobs-only |
1243 "*Save the results of merge jobs automatically. | 1243 "*Save the results of merge jobs automatically. |
1244 nil means don't save automatically. t means always save. Anything but nil or t | 1244 nil means don't save automatically. t means always save. Anything else |
1245 means save automatically only if the merge job is part of a group of jobs, such | 1245 means save automatically only if the merge job is part of a group of jobs, such |
1246 as `ediff-merge-directory' or `ediff-merge-directory-revisions'." | 1246 as `ediff-merge-directory' or `ediff-merge-directory-revisions'." |
1247 :type '(choice (const nil) (const t) (const group-jobs-only)) | 1247 :type '(choice (const nil) (const t) (const group-jobs-only)) |
1248 :group 'ediff-merge) | 1248 :group 'ediff-merge) |
1249 (make-variable-buffer-local 'ediff-autostore-merges) | 1249 (make-variable-buffer-local 'ediff-autostore-merges) |