Index: emacs/lisp/emulation/viper-cmd.el
diff -c emacs/lisp/emulation/viper-cmd.el:1.45
emacs/lisp/emulation/viper-cmd.el:1.46
*** emacs/lisp/emulation/viper-cmd.el:1.45 Sun Jul 10 18:46:24 2005
--- emacs/lisp/emulation/viper-cmd.el Tue Jul 19 05:01:19 2005
***************
*** 774,780 ****
)
(if (commandp com)
! (progn
(setq prefix-arg (or prefix-arg arg))
(command-execute com)))
)
--- 774,781 ----
)
(if (commandp com)
! ;; pretend that current state is the state we excaped to
! (let ((viper-current-state state))
(setq prefix-arg (or prefix-arg arg))
(command-execute com)))
)
***************
*** 996,1004 ****
(inhibit-quit t))
(if (viper-ESC-event-p event)
(progn
! (if (viper-fast-keysequence-p)
(progn
! (let (minor-mode-map-alist)
(viper-set-unread-command-events event)
(setq keyseq (read-key-sequence nil 'continue-echo))
) ; let
--- 997,1008 ----
(inhibit-quit t))
(if (viper-ESC-event-p event)
(progn
! ;; Emacs 22.50.8 introduced a bug, which makes even a single ESC into
! ;; a fast keyseq. To guard against this, we added a check if there
! ;; are other events as well
! (if (and (viper-fast-keysequence-p) unread-command-events)
(progn
! (let (minor-mode-map-alist emulation-mode-map-alists)
(viper-set-unread-command-events event)
(setq keyseq (read-key-sequence nil 'continue-echo))
) ; let
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
