Mercurial > emacs
comparison lisp/frame.el @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 22 Jul 2005 08:27:27 +0000 |
parents | fbb2bea03df9 f1a7394cf1a7 |
children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
90202:7597b4a23c3b | 90203:187d6a1f84f7 |
---|---|
590 | 590 |
591 (defvar after-setting-font-hook nil | 591 (defvar after-setting-font-hook nil |
592 "Functions to run after a frame's font has been changed.") | 592 "Functions to run after a frame's font has been changed.") |
593 | 593 |
594 ;; Alias, kept temporarily. | 594 ;; Alias, kept temporarily. |
595 (defalias 'new-frame 'make-frame) | 595 (define-obsolete-function-alias 'new-frame 'make-frame "22.1") |
596 (make-obsolete 'new-frame 'make-frame "22.1") | |
597 | 596 |
598 (defun make-frame (&optional parameters) | 597 (defun make-frame (&optional parameters) |
599 "Return a newly created frame displaying the current buffer. | 598 "Return a newly created frame displaying the current buffer. |
600 Optional argument PARAMETERS is an alist of parameters for the new frame. | 599 Optional argument PARAMETERS is an alist of parameters for the new frame. |
601 Each element of PARAMETERS should have the form (NAME . VALUE), for example: | 600 Each element of PARAMETERS should have the form (NAME . VALUE), for example: |
849 "Set the font of the selected frame to FONT-NAME. | 848 "Set the font of the selected frame to FONT-NAME. |
850 When called interactively, prompt for the name of the font to use. | 849 When called interactively, prompt for the name of the font to use. |
851 To get the frame's current default font, use `frame-parameters'. | 850 To get the frame's current default font, use `frame-parameters'. |
852 | 851 |
853 The default behavior is to keep the numbers of lines and columns in | 852 The default behavior is to keep the numbers of lines and columns in |
854 the frame, thus may change its pixel size. If optional KEEP-SIZE is | 853 the frame, thus may change its pixel size. If optional KEEP-SIZE is |
855 non-nil (interactively, prefix argument) the current frame size (in | 854 non-nil (interactively, prefix argument) the current frame size (in |
856 pixels) is kept by adjusting the numbers of the lines and columns." | 855 pixels) is kept by adjusting the numbers of the lines and columns." |
857 (interactive | 856 (interactive |
858 (let* ((completion-ignore-case t) | 857 (let* ((completion-ignore-case t) |
859 (font (completing-read "Font name: " | 858 (font (completing-read "Font name: " |
1147 (t | 1146 (t |
1148 'static-gray)))) | 1147 'static-gray)))) |
1149 | 1148 |
1150 | 1149 |
1151 ;;;; Aliases for backward compatibility with Emacs 18. | 1150 ;;;; Aliases for backward compatibility with Emacs 18. |
1152 (defalias 'screen-height 'frame-height) | 1151 (define-obsolete-function-alias 'screen-height 'frame-height) ;before 19.15 |
1153 (defalias 'screen-width 'frame-width) | 1152 (define-obsolete-function-alias 'screen-width 'frame-width) ;before 19.15 |
1154 | 1153 |
1155 (defun set-screen-width (cols &optional pretend) | 1154 (defun set-screen-width (cols &optional pretend) |
1156 "Obsolete function to change the size of the screen to COLS columns. | 1155 "Change the size of the screen to COLS columns. |
1157 Optional second arg non-nil means that redisplay should use COLS columns | 1156 Optional second arg non-nil means that redisplay should use COLS columns |
1158 but that the idea of the actual width of the frame should not be changed. | 1157 but that the idea of the actual width of the frame should not be changed. |
1159 This function is provided only for compatibility with Emacs 18; new code | 1158 This function is provided only for compatibility with Emacs 18." |
1160 should use `set-frame-width instead'." | |
1161 (set-frame-width (selected-frame) cols pretend)) | 1159 (set-frame-width (selected-frame) cols pretend)) |
1162 | 1160 |
1163 (defun set-screen-height (lines &optional pretend) | 1161 (defun set-screen-height (lines &optional pretend) |
1164 "Obsolete function to change the height of the screen to LINES lines. | 1162 "Change the height of the screen to LINES lines. |
1165 Optional second arg non-nil means that redisplay should use LINES lines | 1163 Optional second arg non-nil means that redisplay should use LINES lines |
1166 but that the idea of the actual height of the screen should not be changed. | 1164 but that the idea of the actual height of the screen should not be changed. |
1167 This function is provided only for compatibility with Emacs 18; new code | 1165 This function is provided only for compatibility with Emacs 18." |
1168 should use `set-frame-height' instead." | |
1169 (set-frame-height (selected-frame) lines pretend)) | 1166 (set-frame-height (selected-frame) lines pretend)) |
1170 | 1167 |
1171 (defun delete-other-frames (&optional frame) | 1168 (defun delete-other-frames (&optional frame) |
1172 "Delete all frames except FRAME. | 1169 "Delete all frames except FRAME. |
1173 If FRAME uses another frame's minibuffer, the minibuffer frame is | 1170 If FRAME uses another frame's minibuffer, the minibuffer frame is |
1186 ;; Delete minibuffer-only frames. | 1183 ;; Delete minibuffer-only frames. |
1187 (dolist (frame frames) | 1184 (dolist (frame frames) |
1188 (when (eq (frame-parameter frame 'minibuffer) 'only) | 1185 (when (eq (frame-parameter frame 'minibuffer) 'only) |
1189 (delete-frame frame))))) | 1186 (delete-frame frame))))) |
1190 | 1187 |
1191 (make-obsolete 'screen-height 'frame-height) ;before 19.15 | |
1192 (make-obsolete 'screen-width 'frame-width) ;before 19.15 | |
1193 (make-obsolete 'set-screen-width 'set-frame-width) ;before 19.15 | 1188 (make-obsolete 'set-screen-width 'set-frame-width) ;before 19.15 |
1194 (make-obsolete 'set-screen-height 'set-frame-height) ;before 19.15 | 1189 (make-obsolete 'set-screen-height 'set-frame-height) ;before 19.15 |
1195 | 1190 |
1196 ;; miscellaneous obsolescence declarations | 1191 ;; miscellaneous obsolescence declarations |
1197 (defvaralias 'delete-frame-hook 'delete-frame-functions) | 1192 (define-obsolete-variable-alias 'delete-frame-hook |
1198 (make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "22.1") | 1193 'delete-frame-functions "22.1") |
1199 | 1194 |
1200 | 1195 |
1201 ;; Highlighting trailing whitespace. | 1196 ;; Highlighting trailing whitespace. |
1202 | 1197 |
1203 (make-variable-buffer-local 'show-trailing-whitespace) | 1198 (make-variable-buffer-local 'show-trailing-whitespace) |
1284 (run-with-idle-timer blink-cursor-delay | 1279 (run-with-idle-timer blink-cursor-delay |
1285 blink-cursor-delay | 1280 blink-cursor-delay |
1286 'blink-cursor-start))) | 1281 'blink-cursor-start))) |
1287 (internal-show-cursor nil t))) | 1282 (internal-show-cursor nil t))) |
1288 | 1283 |
1289 (defvaralias 'blink-cursor 'blink-cursor-mode) | 1284 (define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1") |
1290 (make-obsolete-variable 'blink-cursor 'blink-cursor-mode "22.1") | |
1291 | 1285 |
1292 (defun blink-cursor-start () | 1286 (defun blink-cursor-start () |
1293 "Timer function called from the timer `blink-cursor-idle-timer'. | 1287 "Timer function called from the timer `blink-cursor-idle-timer'. |
1294 This starts the timer `blink-cursor-timer', which makes the cursor blink | 1288 This starts the timer `blink-cursor-timer', which makes the cursor blink |
1295 if appropriate. It also arranges to cancel that timer when the next | 1289 if appropriate. It also arranges to cancel that timer when the next |
1331 :type 'number | 1325 :type 'number |
1332 :group 'cursor) | 1326 :group 'cursor) |
1333 | 1327 |
1334 | 1328 |
1335 (defcustom cursor-in-non-selected-windows t | 1329 (defcustom cursor-in-non-selected-windows t |
1336 "*Non-nil means show a hollow box cursor in non-selected-windows. | 1330 "*Non-nil means show a hollow box cursor in non-selected windows. |
1337 If nil, don't show a cursor except in the selected window. | 1331 If nil, don't show a cursor except in the selected window. |
1338 Use Custom to set this variable to get the display updated." | 1332 Use Custom to set this variable to get the display updated." |
1339 :tag "Cursor in non-selected windows" | 1333 :tag "Cursor in non-selected windows" |
1340 :type 'boolean | 1334 :type 'boolean |
1341 :group 'cursor | 1335 :group 'cursor |