[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Tue, 12 Apr 2005 15:59:55 -0400 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.345 emacs/lisp/startup.el:1.346
*** emacs/lisp/startup.el:1.345 Sun Apr 10 23:36:22 2005
--- emacs/lisp/startup.el Tue Apr 12 19:59:54 2005
***************
*** 714,723 ****
(and command-line-args
(setcdr command-line-args args)))
! ;; Under X Windows, this creates the X frame and deletes the terminal frame.
(when (fboundp 'frame-initialize)
(frame-initialize))
;; If frame was created with a menu bar, set menu-bar-mode on.
(unless (or noninteractive
emacs-basic-display
--- 714,732 ----
(and command-line-args
(setcdr command-line-args args)))
! ;; Under X Window, this creates the X frame and deletes the terminal frame.
(when (fboundp 'frame-initialize)
(frame-initialize))
+ ;; Turn off blinking cursor if so specified in X resources. This is here
+ ;; only because all other settings of no-blinking-cursor is here.
+ (unless (or noninteractive
+ emacs-basic-display
+ (and (memq window-system '(x w32 mac))
+ (not (member (x-get-resource "cursorBlink" "CursorBlink")
+ '("off" "false")))))
+ (setq no-blinking-cursor t))
+
;; If frame was created with a menu bar, set menu-bar-mode on.
(unless (or noninteractive
emacs-basic-display
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Thien-Thi Nguyen, 2005/04/04
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Glenn Morris, 2005/04/05
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Kim F . Storm, 2005/04/06
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Richard M . Stallman, 2005/04/10
- [Emacs-diffs] Changes to emacs/lisp/startup.el,
Jan Djärv <=
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/12
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/12
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/13
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/13
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Jan Djärv, 2005/04/14
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/15
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Richard M . Stallman, 2005/04/17
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Luc Teirlinck, 2005/04/17
- [Emacs-diffs] Changes to emacs/lisp/startup.el, Richard M . Stallman, 2005/04/23