diff options
Diffstat (limited to 'lisp/vc/ediff-wind.el')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index cc8ef4ad5c0..eee3f40fd96 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -68,7 +68,7 @@ 'ediff-setup-windows-plain)) (make-obsolete 'ediff-choose-window-setup-function-automatically - 'ediff-setup-windows-default "24.2") + 'ediff-setup-windows-default "24.3") (defcustom ediff-window-setup-function 'ediff-setup-windows-default "Function called to set up windows. @@ -102,7 +102,7 @@ provided functions are written." (const :tag "Single Frame" ediff-setup-windows-plain) (function :tag "Other function")) :group 'ediff-window - :version "24.2") + :version "24.3") ;; indicates if we are in a multiframe setup (ediff-defvar-local ediff-multiframe nil "") |