aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-02-12 18:00:53 +0000
committerLuc Teirlinck2005-02-12 18:00:53 +0000
commit3413f9285c17973c10bc0808091b758d4dd50aa6 (patch)
treeb2e677d32fb1e7e13a6456ee685ba1376099294c
parenta795e09a78dabe829220ec58d70b59302462db70 (diff)
downloademacs-3413f9285c17973c10bc0808091b758d4dd50aa6.tar.gz
emacs-3413f9285c17973c10bc0808091b758d4dd50aa6.zip
(command-line): Adapt blinking cursor init to changes in frame.el.
-rw-r--r--lisp/startup.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 672d20d5445..790d8704c29 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -735,12 +735,14 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
735 (<= (frame-parameter nil 'tool-bar-lines) 0)) 735 (<= (frame-parameter nil 'tool-bar-lines) 0))
736 (tool-bar-mode 1)) 736 (tool-bar-mode 1))
737 737
738 ;; Can't do this init in defcustom because window-system isn't set. 738 ;; Can't do this init in defcustom because the relevant variables
739 ;; are not set. If you make any changes to the `or' form below,
740 ;; you should also change the corresponding expression in the
741 ;; defcustom in frame.el, or Custom will be badly confused.
739 (unless (or noninteractive 742 (unless (or noninteractive
740 emacs-quick-startup 743 emacs-quick-startup
741 (eq system-type 'ms-dos) 744 (eq system-type 'ms-dos)
742 (not (memq window-system '(x w32)))) 745 (not (memq window-system '(x w32))))
743 (setq-default blink-cursor t)
744 (blink-cursor-mode 1)) 746 (blink-cursor-mode 1))
745 747
746 (unless noninteractive 748 (unless noninteractive