lisp/desktop.el (desktop-clear): Fix previous change.

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

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 50f2be3..124bdbd 100644 (file)
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1,6 +1,6 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
-;; Copyright (C) 1994-1997, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -42,17 +42,16 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
-(eval-when-compile
-  (require 'ediff-util)
-  (require 'ediff-help))
+(require 'ediff-init)
+(require 'ediff-help)
 ;; end pacifier
 
-(require 'ediff-init)
 
 ;; be careful with ediff-tbar
-(if (featurep 'xemacs)
-    (require 'ediff-tbar)
-  (defun ediff-compute-toolbar-width () 0))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (require 'ediff-tbar)
+    (defun ediff-compute-toolbar-width () 0)))
 
 (defgroup ediff-window nil
   "Ediff window manipulation."
@@ -63,13 +62,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.2")
-
 (defcustom ediff-window-setup-function 'ediff-setup-windows-default
   "Function called to set up windows.
 Ediff provides a choice of three functions:
@@ -102,7 +99,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 "")
@@ -360,6 +357,8 @@ into icons, regardless of the window manager."
     (ediff-setup-windows-plain-compare
      buffer-A buffer-B buffer-C control-buffer)))
 
+(autoload 'ediff-setup-control-buffer "ediff-util")
+
 (defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer)
   ;; skip dedicated and unsplittable frames
   (ediff-destroy-control-frame control-buffer)
@@ -910,6 +909,8 @@ into icons, regardless of the window manager."
     (not (ediff-frame-has-dedicated-windows (window-frame wind)))
     )))
 
+(declare-function ediff-make-bottom-toolbar "ediff-util" (&optional frame))
+
 ;; Prepare or refresh control frame
 (defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame)
   (let ((window-min-height 1)
@@ -957,7 +958,7 @@ into icons, regardless of the window manager."
          (and (eq this-command 'ediff-toggle-help)
               dont-iconify-ctl-frame))
 
-    ;; 1 more line for the modeline
+    ;; 1 more line for the mode line
     (setq lines (1+ (count-lines (point-min) (point-max)))
          fheight lines
          fwidth (max (+ (ediff-help-message-line-length) 2)
@@ -1141,7 +1142,7 @@ It assumes that it is called from within the control buffer."
 
 
 ;; Revise the mode line to display which difference we have selected
-;; Also resets modelines of buffers A/B, since they may be clobbered by
+;; Also resets mode lines of buffers A/B, since they may be clobbered by
 ;; other invocations of Ediff.
 (defun ediff-refresh-mode-lines ()
   (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)