[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v
From: |
Reiner Steib |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v |
Date: |
Sat, 12 Apr 2008 09:47:45 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Reiner Steib <rsteib> 08/04/12 09:47:43
Index: ediff-wind.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-wind.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- ediff-wind.el 10 Apr 2008 14:09:36 -0000 1.59
+++ ediff-wind.el 12 Apr 2008 09:47:41 -0000 1.60
@@ -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.