changeset 61505:c8cf56d85000

Added new X reosurce, cursorBlink.
author Jan Djärv <jan.h.d@swipnet.se>
date Tue, 12 Apr 2005 19:59:54 +0000
parents 440fc97d89f0
children d1e357adedb5
files etc/ChangeLog etc/NEWS lisp/ChangeLog lisp/startup.el man/ChangeLog man/xresources.texi
diffstat 6 files changed, 30 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/etc/ChangeLog	Tue Apr 12 10:28:24 2005 +0000
+++ b/etc/ChangeLog	Tue Apr 12 19:59:54 2005 +0000
@@ -1,3 +1,7 @@
+2005-04-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* NEWS: Mention cursorBlink resource.
+
 2005-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* NEWS: Mention dynamic change of keyboard-coding-system on Mac.
--- a/etc/NEWS	Tue Apr 12 10:28:24 2005 +0000
+++ b/etc/NEWS	Tue Apr 12 19:59:54 2005 +0000
@@ -968,6 +968,9 @@
 XIM by default, the X resource useXIM can be used to turn it on.
 
 +++
+** The X resource cursorBlink can be used to turn off cursor blinking.
+
++++
 ** `undo-only' does an undo which does not redo any previous undo.
 
 ---
--- a/lisp/ChangeLog	Tue Apr 12 10:28:24 2005 +0000
+++ b/lisp/ChangeLog	Tue Apr 12 19:59:54 2005 +0000
@@ -1,3 +1,8 @@
+2005-04-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* startup.el (command-line): Turn off blinking cursor if
+	cursorBlink in resources is off or false.
+
 2005-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* term/mac-win.el (dnd): Require dnd.
--- a/lisp/startup.el	Tue Apr 12 10:28:24 2005 +0000
+++ b/lisp/startup.el	Tue Apr 12 19:59:54 2005 +0000
@@ -714,10 +714,19 @@
     (and command-line-args
          (setcdr command-line-args args)))
 
-  ;; Under X Windows, this creates the X frame and deletes the terminal frame.
+  ;; 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
--- a/man/ChangeLog	Tue Apr 12 10:28:24 2005 +0000
+++ b/man/ChangeLog	Tue Apr 12 19:59:54 2005 +0000
@@ -1,3 +1,7 @@
+2005-04-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xresources.texi (Table of Resources): Add cursorBlink.
+
 2005-04-11  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* rmail.texi (Rmail Summary Edit): Explain numeric arguments to
--- a/man/xresources.texi	Tue Apr 12 10:28:24 2005 +0000
+++ b/man/xresources.texi	Tue Apr 12 19:59:54 2005 +0000
@@ -175,6 +175,10 @@
 @item @code{cursorColor} (class @code{Foreground})
 Color name for text cursor (point).
 
+@item @code{cursorBlink} (class @code{CursorBlink})
+Specifies whether to make the cursor blink. The default is @samp{on}.  Use
+@samp{off} or @samp{false} to turn cursor blinking off.
+
 @item @code{font} (class @code{Font})
 Font name for text (or fontset name, @pxref{Fontsets}).