Mercurial > emacs
diff lisp/frame.el @ 90103:3ebd9bdb4fe5
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-13
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90
Update from CVS: man/calc.texi: Add macro for LaTeX for info output.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 13 Feb 2005 07:19:08 +0000 |
parents | f3ec05478165 d751f08f4c04 |
children | bf0d492ea2d5 |
line wrap: on
line diff
--- a/lisp/frame.el Sun Feb 13 00:40:20 2005 +0000 +++ b/lisp/frame.el Sun Feb 13 07:19:08 2005 +0000 @@ -135,7 +135,7 @@ ;; (set-window-dedicated-p window t) window)) ;; If no window yet, make one in a new frame. - (let ((frame + (let ((frame (with-current-buffer buffer (make-frame (append args special-display-frame-alist))))) (set-window-buffer (frame-selected-window frame) buffer) @@ -593,7 +593,7 @@ ;; Alias, kept temporarily. (defalias 'new-frame 'make-frame) -(make-obsolete 'new-frame 'make-frame "21.4") +(make-obsolete 'new-frame 'make-frame "22.1") (defun make-frame (&optional parameters) "Return a newly created frame displaying the current buffer. @@ -1195,7 +1195,7 @@ ;; miscellaneous obsolescence declarations (defvaralias 'delete-frame-hook 'delete-frame-functions) -(make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "21.4") +(make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "22.1") ;; Highlighting trailing whitespace. @@ -1253,10 +1253,36 @@ (defvar blink-cursor-timer nil "Timer started from `blink-cursor-start'. -This timer calls `blink-cursor' every `blink-cursor-interval' seconds.") +This timer calls `blink-cursor-timer-function' every +`blink-cursor-interval' seconds.") -(defvar blink-cursor-mode nil - "Non-nil means blinking cursor is active.") +;; The strange sequence below is meant to set both the right temporary +;; value and the right "standard expression" , according to Custom, +;; for blink-cursor-mode. We do not know the standard _evaluated_ +;; value yet, because the standard expression uses values that are not +;; yet set. Evaluating it now would yield an error, but we make sure +;; that it is not evaluated, by ensuring that blink-cursor-mode is set +;; before the defcustom is evaluated and by using the right :initialize +;; function. The correct evaluated standard value will be installed +;; in startup.el using exactly the same expression as in the defcustom. +(defvar blink-cursor-mode) +(unless (boundp 'blink-cursor-mode) (setq blink-cursor-mode nil)) +(defcustom blink-cursor-mode + (not (or noninteractive + emacs-quick-startup + (eq system-type 'ms-dos) + (not (memq window-system '(x w32))))) + "*Non-nil means Blinking Cursor mode is active." + :group 'cursor + :tag "Blinking cursor" + :type 'boolean + :initialize 'custom-initialize-set + :set #'(lambda (symbol value) + (set-default symbol value) + (blink-cursor-mode (or value 0)))) + +(defvaralias 'blink-cursor 'blink-cursor-mode) +(make-obsolete-variable 'blink-cursor 'blink-cursor-mode "22.1") (defun blink-cursor-mode (arg) "Toggle blinking cursor mode. @@ -1289,18 +1315,6 @@ (setq blink-cursor-mode t)) (internal-show-cursor nil t)))) -;; Note that this is really initialized from startup.el before -;; the init-file is read. - -(defcustom blink-cursor nil - "*Non-nil means blinking cursor mode is active." - :group 'cursor - :tag "Blinking cursor" - :type 'boolean - :set #'(lambda (symbol value) - (set-default symbol value) - (blink-cursor-mode (or value 0)))) - (defun blink-cursor-start () "Timer function called from the timer `blink-cursor-idle-timer'. This starts the timer `blink-cursor-timer', which makes the cursor blink