Mercurial > emacs
comparison lisp/frame.el @ 83261:7d309d464f83
Merged from miles@gnu.org--gnu-2005 (patch 28-30, 126-128)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-126
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-127
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-128
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-28
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-29
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-30
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-301
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 25 Feb 2005 13:02:38 +0000 |
parents | cf4b5d1da82f e8f69f91a18b |
children | 1f334cdd7020 |
comparison
equal
deleted
inserted
replaced
83260:25f02aeb20f4 | 83261:7d309d464f83 |
---|---|
1342 cursor display. On a text-only terminal, this is not implemented." | 1342 cursor display. On a text-only terminal, this is not implemented." |
1343 :init-value (not (or noninteractive | 1343 :init-value (not (or noninteractive |
1344 emacs-quick-startup | 1344 emacs-quick-startup |
1345 (eq system-type 'ms-dos) | 1345 (eq system-type 'ms-dos) |
1346 (not (memq initial-window-system '(x w32))))) | 1346 (not (memq initial-window-system '(x w32))))) |
1347 :group 'cursor | |
1347 :global t | 1348 :global t |
1348 (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer)) | 1349 (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer)) |
1349 (if blink-cursor-timer (cancel-timer blink-cursor-timer)) | 1350 (if blink-cursor-timer (cancel-timer blink-cursor-timer)) |
1350 (setq blink-cursor-idle-timer nil | 1351 (setq blink-cursor-idle-timer nil |
1351 blink-cursor-timer nil) | 1352 blink-cursor-timer nil) |