/[emacs]/emacs/lisp/emulation/viper-util.el
ViewVC logotype

Diff of /emacs/lisp/emulation/viper-util.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.46 by kifer, Tue Jan 8 04:36:00 2002 UTC revision 1.47 by kifer, Sun Feb 10 06:46:12 2002 UTC
# Line 925  Line 925 
925        ))        ))
926    
927            
 (defsubst viper-events-to-keys (events)  
   (viper-cond-compile-for-xemacs-or-emacs  
    (events-to-keys events) ; xemacs  
    events ; emacs  
    ))  
                     
928            
929  ;; it is suggested that an event must be copied before it is assigned to  ;; it is suggested that an event must be copied before it is assigned to
930  ;; last-command-event in XEmacs  ;; last-command-event in XEmacs
# Line 969  Line 963 
963                    (elt (listify-key-sequence keyseq) 0)))                    (elt (listify-key-sequence keyseq) 0)))
964      (if (viper-ESC-event-p event)      (if (viper-ESC-event-p event)
965          (let (unread-command-events)          (let (unread-command-events)
           (viper-set-unread-command-events keyseq)  
966            (if (viper-fast-keysequence-p)            (if (viper-fast-keysequence-p)
967                (let ((viper-vi-global-user-minor-mode  nil)                (let ((viper-vi-global-user-minor-mode  nil)
968                      (viper-vi-local-user-minor-mode  nil)                      (viper-vi-local-user-minor-mode  nil)
969                        (viper-vi-intercept-minor-mode nil)
970                        (viper-insert-intercept-minor-mode nil)
971                      (viper-replace-minor-mode nil) ; actually unnecessary                      (viper-replace-minor-mode nil) ; actually unnecessary
972                      (viper-insert-global-user-minor-mode  nil)                      (viper-insert-global-user-minor-mode  nil)
973                      (viper-insert-local-user-minor-mode  nil))                      (viper-insert-local-user-minor-mode  nil))
974                  (setq keyseq (read-key-sequence prompt continue-echo)))                  ;; Note: set unread-command-events only after testing for fast
975              (setq keyseq (read-key-sequence prompt continue-echo)))))                  ;; keysequence. Otherwise, viper-fast-keysequence-p will be
976                    ;; always t -- whether there is anything after ESC or not
977                    (viper-set-unread-command-events keyseq)
978                    (setq keyseq (read-key-sequence nil)))
979                (viper-set-unread-command-events keyseq)
980                (setq keyseq (read-key-sequence nil)))))
981      keyseq))      keyseq))
982    
983    

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26