window-height, window-width, and window-full-width-p are now in window.el.

* window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
Remove.
* window.el (window-height): Defalias to window-total-height.
(window-width): Defalias to window-body-width.

2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5911a35db2..5838d198d9b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-height): Defalias to window-total-height.
+        (window-width): Defalias to window-body-width.
+
 2011-06-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * image-mode.el (image-toggle-animation): New command.
diff --git a/lisp/window.el b/lisp/window.el
index 856ec66a005..98c49faaf28 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -900,6 +900,9 @@ Note: This function does not take into account the value of
 `line-spacing' when calculating the number of lines in WINDOW."
   (window-total-size window))
 
+;; Eventually we should make `window-height' obsolete.
+(defalias 'window-height 'window-total-height)
+
 ;; See discussion in bug#4543.
 (defsubst window-full-height-p (&optional window)
   "Return t if WINDOW is as high as the containing frame.
@@ -951,6 +954,9 @@ not include the number of columns used for WINDOW's fringes or
 display margins either."
   (window-body-size window t))
 
+;; Eventually we should make `window-height' obsolete.
+(defalias 'window-width 'window-body-width)
+
 (defun one-window-p (&optional nomini all-frames)
   "Return non-nil if the selected window is the only window.
 Optional arg NOMINI non-nil means don't count the minibuffer