Mercurial > emacs
comparison lisp/ediff-init.el @ 35377:ee8a7170097b
(ediff-before-setup-hook)
(ediff-merge-filename-prefix): Add :version.
author | Dave Love <fx@gnu.org> |
---|---|
date | Wed, 17 Jan 2001 18:28:50 +0000 |
parents | fdb5d08ced13 |
children | be20c22dc16d |
comparison
equal
deleted
inserted
replaced
35376:19d92c9e26e9 | 35377:ee8a7170097b |
---|---|
379 (defcustom ediff-before-setup-hook nil | 379 (defcustom ediff-before-setup-hook nil |
380 "*Hooks to run before Ediff begins to set up windows and buffers. | 380 "*Hooks to run before Ediff begins to set up windows and buffers. |
381 This hook can be used to save the previous window config, which can be restored | 381 This hook can be used to save the previous window config, which can be restored |
382 on ediff-quit or ediff-suspend." | 382 on ediff-quit or ediff-suspend." |
383 :type 'hook | 383 :type 'hook |
384 :version "21.1" | |
384 :group 'ediff-hook) | 385 :group 'ediff-hook) |
385 (defcustom ediff-before-setup-windows-hook nil | 386 (defcustom ediff-before-setup-windows-hook nil |
386 "*Hooks to run before Ediff sets its window configuration. | 387 "*Hooks to run before Ediff sets its window configuration. |
387 This hook is run every time when Ediff arranges its windows. | 388 This hook is run every time when Ediff arranges its windows. |
388 This happens each time Ediff detects that the windows were messed up by the | 389 This happens each time Ediff detects that the windows were messed up by the |
1218 (ediff-defvar-local ediff-merge-store-file nil "") | 1219 (ediff-defvar-local ediff-merge-store-file nil "") |
1219 | 1220 |
1220 (defcustom ediff-merge-filename-prefix "merge_" | 1221 (defcustom ediff-merge-filename-prefix "merge_" |
1221 "*Prefix to be attached to saved merge buffers." | 1222 "*Prefix to be attached to saved merge buffers." |
1222 :type 'string | 1223 :type 'string |
1224 :version "21.1" | |
1223 :group 'ediff-merge) | 1225 :group 'ediff-merge) |
1224 | 1226 |
1225 (defcustom ediff-no-emacs-help-in-control-buffer nil | 1227 (defcustom ediff-no-emacs-help-in-control-buffer nil |
1226 "*Non-nil means C-h should not invoke Emacs help in control buffer. | 1228 "*Non-nil means C-h should not invoke Emacs help in control buffer. |
1227 Instead, C-h would jump to previous difference." | 1229 Instead, C-h would jump to previous difference." |