diff options
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 0f64a361a97..59a1490e399 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1,7 +1,7 @@ ;;; frame.el --- multi-frame management independent of window systems -;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -617,8 +617,7 @@ The functions are run with one arg, the newly created frame.") "Functions to run after a frame's font has been changed.") ;; Alias, kept temporarily. -(defalias 'new-frame 'make-frame) -(make-obsolete 'new-frame 'make-frame "22.1") +(define-obsolete-function-alias 'new-frame 'make-frame "22.1") (defun make-frame (&optional parameters) "Return a newly created frame displaying the current buffer. @@ -916,7 +915,7 @@ When called interactively, prompt for the name of the font to use. To get the frame's current default font, use `frame-parameters'. The default behavior is to keep the numbers of lines and columns in -the frame, thus may change its pixel size. If optional KEEP-SIZE is +the frame, thus may change its pixel size. If optional KEEP-SIZE is non-nil (interactively, prefix argument) the current frame size (in pixels) is kept by adjusting the numbers of the lines and columns." (interactive @@ -1218,23 +1217,21 @@ The value is one of the symbols `static-gray', `gray-scale', ;;;; Aliases for backward compatibility with Emacs 18. -(defalias 'screen-height 'frame-height) -(defalias 'screen-width 'frame-width) +(define-obsolete-function-alias 'screen-height 'frame-height) ;before 19.15 +(define-obsolete-function-alias 'screen-width 'frame-width) ;before 19.15 (defun set-screen-width (cols &optional pretend) - "Obsolete function to change the size of the screen to COLS columns. + "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; new code -should use `set-frame-width instead'." +This function is provided only for compatibility with Emacs 18." (set-frame-width (selected-frame) cols pretend)) (defun set-screen-height (lines &optional pretend) - "Obsolete function to change the height of the screen to LINES lines. + "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; new code -should use `set-frame-height' instead." +This function is provided only for compatibility with Emacs 18." (set-frame-height (selected-frame) lines pretend)) (defun delete-other-frames (&optional frame) @@ -1257,14 +1254,12 @@ left untouched. FRAME nil or omitted means use the selected frame." (when (eq (frame-parameter frame 'minibuffer) 'only) (delete-frame frame))))) -(make-obsolete 'screen-height 'frame-height) ;before 19.15 -(make-obsolete 'screen-width 'frame-width) ;before 19.15 (make-obsolete 'set-screen-width 'set-frame-width) ;before 19.15 (make-obsolete 'set-screen-height 'set-frame-height) ;before 19.15 ;; miscellaneous obsolescence declarations -(defvaralias 'delete-frame-hook 'delete-frame-functions) -(make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "22.1") +(define-obsolete-variable-alias 'delete-frame-hook + 'delete-frame-functions "22.1") ;; Highlighting trailing whitespace. @@ -1325,10 +1320,6 @@ The function `blink-cursor-start' is called when the timer fires.") This timer calls `blink-cursor-timer-function' every `blink-cursor-interval' seconds.") -;; We do not know the standard _evaluated_ value yet, because the standard -;; expression uses values that are not yet set. The correct evaluated -;; standard value will be installed in startup.el using exactly the same -;; expression as in the defcustom. (define-minor-mode blink-cursor-mode "Toggle blinking cursor mode. With a numeric argument, turn blinking cursor mode on iff ARG is positive. @@ -1339,9 +1330,10 @@ Note that this command is effective only when Emacs displays through a window system, because then Emacs does its own cursor display. On a text-only terminal, this is not implemented." :init-value (not (or noninteractive - (if (boundp 'no-blinking-cursor) no-blinking-cursor) + no-blinking-cursor (eq system-type 'ms-dos) (not (memq initial-window-system '(x w32))))) + :initialize 'custom-initialize-safe-default :group 'cursor :global t (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer)) @@ -1358,8 +1350,7 @@ cursor display. On a text-only terminal, this is not implemented." 'blink-cursor-start))) (internal-show-cursor nil t))) -(defvaralias 'blink-cursor 'blink-cursor-mode) -(make-obsolete-variable 'blink-cursor 'blink-cursor-mode "22.1") +(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1") (defun blink-cursor-start () "Timer function called from the timer `blink-cursor-idle-timer'. @@ -1405,7 +1396,7 @@ itself as a pre-command hook." (defcustom cursor-in-non-selected-windows t - "*Non-nil means show a hollow box cursor in non-selected-windows. + "*Non-nil means show a hollow box cursor in non-selected windows. If nil, don't show a cursor except in the selected window. Use Custom to set this variable to get the display updated." :tag "Cursor in non-selected windows" |