Mercurial > emacs
changeset 94042:62c45d39d360
(ediff-split-window-function, ediff-merge-split-window-function):
Improve custom type.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sat, 12 Apr 2008 09:47:42 +0000 |
| parents | 23d6df7eb459 |
| children | 3901934685f5 |
| files | lisp/ChangeLog lisp/ediff-wind.el |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 12 09:26:40 2008 +0000 +++ b/lisp/ChangeLog Sat Apr 12 09:47:42 2008 +0000 @@ -1,3 +1,8 @@ +2008-04-12 Reiner Steib <Reiner.Steib@gmx.de> + + * ediff-wind.el (ediff-split-window-function) + (ediff-merge-split-window-function): Improve custom type. + 2008-04-12 Eli Zaretskii <eliz@gnu.org> * loadup.el ("minibuffer"): Move after "faces".
--- a/lisp/ediff-wind.el Sat Apr 12 09:26:40 2008 +0000 +++ b/lisp/ediff-wind.el Sat Apr 12 09:47:42 2008 +0000 @@ -137,7 +137,10 @@ 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 @@ 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.