Use declare forms, where possible, to mark obsolete functions.

[bpt/emacs.git] / lisp / vc / ediff-wind.el

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index eee3f40..d7118ad 100644 (file)
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -63,13 +63,11 @@
 
 ;; Determine which window setup function to use based on current window system.
 (defun ediff-choose-window-setup-function-automatically ()
+  (declare (obsolete ediff-setup-windows-default "24.3"))
   (if (ediff-window-display-p)
       'ediff-setup-windows-multiframe
     'ediff-setup-windows-plain))
 
-(make-obsolete 'ediff-choose-window-setup-function-automatically
-              'ediff-setup-windows-default "24.3")
-
 (defcustom ediff-window-setup-function 'ediff-setup-windows-default
   "Function called to set up windows.
 Ediff provides a choice of three functions: