Summary for xwem--main--2.1--patch-40

[Zajcev Evgeny <lg@xxxxxxxx>]

Location: lg@xxxxxxxxxxxxxx http://arch.xwem.org/2005/

Revision: xwem--main--2.1--patch-40
Archive: lg@xxxxxxxxxxxxxx
Creator: Zajcev Evgeny <lg@xxxxxxxx>
Date: Sun Mar 27 01:23:00 MSK 2005
Standard-date: 2005-03-26 22:23:00 GMT
Modified-files: lisp/xwem-keyboard.el
New-patches: lg@xxxxxxxxxxxxxx/xwem--main--2.1--patch-40
Summary: universal argument commands fixes to work with macroses
Keywords: macro, universal

* lisp/xwem-keyboard.el (xwem-universal-digit): [fix] xwem-last-event
  not guarantee to be event.  This fixes bug when H-<digit> command is
  used in macroses.

* lisp/xwem-keyboard.el (xwem-universal-command): [fix] use
  `xwem-dispatch-command-event' directly.

* added files

    {arch}/xwem/xwem--main/xwem--main--2.1/lg@xxxxxxxxxxxxxx/patch-log/patch-40

* modified files

--- orig/lisp/xwem-keyboard.el
+++ mod/lisp/xwem-keyboard.el
@@ -1610,7 +1610,10 @@
 minus sign ends the argument."
   (xwem-interactive "P")
 
-  (let* ((num (event-key xwem-last-event))
+  (let* ((num (or (and (key-press-event-p xwem-last-event)
+                       (event-key xwem-last-event))
+                  (and (listp xwem-last-event)
+                       (car (last xwem-last-event)))))
          (digit (- num ?0)))
     (cond ((integerp arg)
            (setq xwem-prefix-arg (+ (* arg 10) (if (< arg 0) (-  digit) 
digit))))
@@ -1628,12 +1631,9 @@
   (xwem-interactive "P")
 
   (setq xwem-prefix-arg arg)
+  (setq xwem-override-map nil)
 
-  (let ((keylist (append xwem-this-command-keys nil)))
-    (mapc 'xwem-unread-command-event
-          (nthcdr xwem-universal-argument-num-events keylist)))
-
-  (setq xwem-override-map nil))
+  (xwem-dispatch-command-event xwem-last-event xwem-last-xevent))
 
 ;;}}}