Mercurial > emacs
comparison lisp/frame.el @ 90108:bbc2e661b93c
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-18
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 125-128)
- Update from CVS
- Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 28-30)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 25 Feb 2005 06:44:33 +0000 |
parents | bf0d492ea2d5 e8f69f91a18b |
children | 29e773288013 |
comparison
equal
deleted
inserted
replaced
90107:02eaf6dd9258 | 90108:bbc2e661b93c |
---|---|
1271 cursor display. On a text-only terminal, this is not implemented." | 1271 cursor display. On a text-only terminal, this is not implemented." |
1272 :init-value (not (or noninteractive | 1272 :init-value (not (or noninteractive |
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)) |
1279 (setq blink-cursor-idle-timer nil | 1280 (setq blink-cursor-idle-timer nil |
1280 blink-cursor-timer nil) | 1281 blink-cursor-timer nil) |