diff options
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 11 | ||||
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/xresources.texi | 4 |
6 files changed, 30 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 76292a04027..ed111a6f9bb 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -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. @@ -968,6 +968,9 @@ If the configure option `--without-xim' was used to turn off use of 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0aa2347977e..0fb92cabbfb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/startup.el b/lisp/startup.el index 98cadbc9d9c..fddb8e9904b 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -714,10 +714,19 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (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 diff --git a/man/ChangeLog b/man/ChangeLog index 9e03a55b77b..ba9dc904618 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -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 diff --git a/man/xresources.texi b/man/xresources.texi index 7e1beb2442a..b5090afd260 100644 --- a/man/xresources.texi +++ b/man/xresources.texi @@ -175,6 +175,10 @@ Width in pixels of the external border. @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}). |