Mercurial > emacs
changeset 15578:fadc581e380e
(vip-read-key): inhibit quit added.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Mon, 01 Jul 1996 02:34:51 +0000 |
parents | e369d2f12bc7 |
children | 690a439bcc0e |
files | lisp/emulation/viper-util.el |
diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/viper-util.el Sun Jun 30 18:19:19 1996 +0000 +++ b/lisp/emulation/viper-util.el Mon Jul 01 02:34:51 1996 +0000 @@ -194,7 +194,10 @@ (eq (device-class (selected-device)) 'color))) (defsubst vip-get-cursor-color () - (cdr (assoc 'cursor-color (frame-parameters)))) + (if vip-emacs-p + (cdr (assoc 'cursor-color (frame-parameters))) + (color-instance-name (frame-property (selected-frame) 'cursor-color)))) + ;; OS/2 (cond ((eq (vip-device-type) 'pm) @@ -934,15 +937,17 @@ ;; This function lets function-key-map convert key sequences into logical ;; keys. This does a better job than vip-read-event when it comes to kbd -;; macros, since it enables certain macros to be shared between X and TTY -;; modes. +;; macros, since it enables certain macros to be shared between X and TTY modes +;; by correctly mapping key sequences for Left/Right/... (one an ascii +;; terminal) into logical keys left, right, etc. (defun vip-read-key () (let ((overriding-local-map vip-overriding-map) + (inhibit-quit t) key) (use-global-map vip-overriding-map) (setq key (elt (read-key-sequence nil) 0)) (use-global-map global-map) - key)) + key)) ;; Emacs has a bug in eventp, which causes (eventp nil) to return (nil)