diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-08-03 00:35:38 +0200 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-08-03 00:35:38 +0200 |
| commit | 548c5c47f1636e7acf9ee85ddce62c36dc68efe7 (patch) | |
| tree | b7231928af74dfebf3337459537d8431931aaba2 /lisp | |
| parent | 4d464ae4d6970592730a50ed716499c46931a5a4 (diff) | |
| download | emacs-548c5c47f1636e7acf9ee85ddce62c36dc68efe7.tar.gz emacs-548c5c47f1636e7acf9ee85ddce62c36dc68efe7.tar.bz2 emacs-548c5c47f1636e7acf9ee85ddce62c36dc68efe7.zip | |
* lisp/frame.el (screen-height, screen-width, set-screen-width)
(set-screen-height): Remove ancient compatibility aliases.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/frame.el | 20 |
2 files changed, 3 insertions, 20 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e475a152e38..60a1b8a3f18 100644 --- 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 534d6a2b4e7..8b5be93791e 100644 --- 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)))) -;;;; 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") |