aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 465dec9fece..7d48d8704eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-02-24 Luc Teirlinck <teirllm@auburn.edu>
2
3 * frame.el (blink-cursor-mode): Add :group keyword.
4
12005-02-24 Ulf Jasper <ulf.jasper@web.de> 52005-02-24 Ulf Jasper <ulf.jasper@web.de>
2 6
3 * calendar/icalendar.el (icalendar--decode-isodatetime): New 7 * calendar/icalendar.el (icalendar--decode-isodatetime): New
diff --git a/lisp/frame.el b/lisp/frame.el
index 5da549fd73e..6e04537731d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1273,6 +1273,7 @@ cursor display. On a text-only terminal, this is not implemented."
1273 emacs-quick-startup 1273 emacs-quick-startup
1274 (eq system-type 'ms-dos) 1274 (eq system-type 'ms-dos)
1275 (not (memq window-system '(x w32))))) 1275 (not (memq window-system '(x w32)))))
1276 :group 'cursor
1276 :global t 1277 :global t
1277 (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer)) 1278 (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
1278 (if blink-cursor-timer (cancel-timer blink-cursor-timer)) 1279 (if blink-cursor-timer (cancel-timer blink-cursor-timer))