* lisp/frame.el (screen-height, screen-width, set-screen-width)

(set-screen-height): Remove ancient compatibility aliases.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e475a152e385df0057f9ffd26ae794906853a8bc..60a1b8a3f18ff2d5bf594e28b6f6ae5695b8c25e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * frame.el (screen-height, screen-width, set-screen-width)
+       (set-screen-height): Remove ancient compatibility aliases.
+
        * textmodes/fill.el (justify-current-line): Don't add 1 to nspaces
        when justifying.  It seems useless and harmful for ncols=1 (bug#6738).
 

diff --git a/lisp/frame.el b/lisp/frame.el
index 534d6a2b4e7cb7709bb687c35c337064f46726bb..8b5be93791eca07f3e215348a751ba6446ae9146 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1431,23 +1431,6 @@ In the 3rd, 4th, and 6th examples, the returned value is relative to
 the opposite frame edge from the edge indicated in the input spec."
   (cons (car spec) (frame-geom-value-cons (car spec) (cdr spec))))
 \f
-;;;; Aliases for backward compatibility with Emacs 18.
-(define-obsolete-function-alias 'screen-height 'frame-height "19.7")
-(define-obsolete-function-alias 'screen-width 'frame-width "19.7")
-
-(defun set-screen-width (cols &optional pretend)
-  "Change the size of the screen to COLS columns.
-Optional second arg non-nil means that redisplay should use COLS columns
-but that the idea of the actual width of the frame should not be changed.
-This function is provided only for compatibility with Emacs 18."
-  (set-frame-width (selected-frame) cols pretend))
-
-(defun set-screen-height (lines &optional pretend)
-  "Change the height of the screen to LINES lines.
-Optional second arg non-nil means that redisplay should use LINES lines
-but that the idea of the actual height of the screen should not be changed.
-This function is provided only for compatibility with Emacs 18."
-  (set-frame-height (selected-frame) lines pretend))
 
 (defun delete-other-frames (&optional frame)
   "Delete all frames except FRAME.
@@ -1473,9 +1456,6 @@ left untouched.  FRAME nil or omitted means use the selected frame."
       (when (eq (frame-parameter frame 'minibuffer) 'only)
        (delete-frame frame)))))
 
-(make-obsolete 'set-screen-width 'set-frame-width "19.7")
-(make-obsolete 'set-screen-height 'set-frame-height "19.7")
-
 ;; miscellaneous obsolescence declarations
 (define-obsolete-variable-alias 'delete-frame-hook
     'delete-frame-functions "22.1")