procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* viper-cmd.el (viper-escape-to-state): bug fix

Browse source 
(viper-envelop-ESC-key): changed the definition of fast keysequence so
	it'll work with keyboard macros

	* ediff.el (ediff-patch-buffer): changed the docstring.
This commit is contained in:
Michael Kifer 2005-07-19 05:01:20 +00:00
parent c061dd8f05
commit acfb6f24f7
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/emulation/viper-cmd.el
View file

@ -774,7 +774,8 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to
)
(if (commandp com)
(progn
;; 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,9 +997,12 @@ as a Meta key and any number of multiple escapes is allowed."
(inhibit-quit t))
(if (viper-ESC-event-p event)
(progn
(if (viper-fast-keysequence-p)
;; 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)
(let (minor-mode-map-alist emulation-mode-map-alists)
(viper-set-unread-command-events event)
(setq keyseq (read-key-sequence nil 'continue-echo))
) ; let