From: Reiner Steib Date: Sat, 12 Apr 2008 09:47:42 +0000 (+0000) Subject: (ediff-split-window-function, ediff-merge-split-window-function): X-Git-Tag: emacs-pretest-23.0.90~6306 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c12b5b0035577589609f902d8069b3ba9839acb2;p=emacs.git (ediff-split-window-function, ediff-merge-split-window-function): Improve custom type. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b8b54ab8107..253c2db6c72 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-04-12 Reiner Steib + + * ediff-wind.el (ediff-split-window-function) + (ediff-merge-split-window-function): Improve custom type. + 2008-04-12 Eli Zaretskii * loadup.el ("minibuffer"): Move after "faces". diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 17cd25d8713..5e698c39ebb 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -137,7 +137,10 @@ by setting this variable to `split-window-horizontally'. You can also have your own function to do fancy splits. This variable has no effect when buffer-A/B are shown in different frames. In this case, Ediff will use those frames to display these buffers." - :type 'function + :type '(choice + (const :tag "Split vertically" split-window-vertically) + (const :tag "Split horizontally" split-window-horizontally) + function) :group 'ediff-window) (defcustom ediff-merge-split-window-function 'split-window-horizontally @@ -147,7 +150,10 @@ by setting this variable to `split-window-vertically'. You can also have your own function to do fancy splits. This variable has no effect when buffer-A/B/C are shown in different frames. In this case, Ediff will use those frames to display these buffers." - :type 'function + :type '(choice + (const :tag "Split vertically" split-window-vertically) + (const :tag "Split horizontally" split-window-horizontally) + function) :group 'ediff-window) ;; Definitions hidden from the compiler by compat wrappers.