2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper-cmd.el (viper-special-read-and-insert-char): convert events to
	chars if XEmacs.
	(viper-after-change-undo-hook): check if undo-in-progress is bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a82cdbb83d89ce724d991afbe8b3f3d5f8b41ef1..4d8887a0d598a468dcae3f2bb947f0dae424dab9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-30  Michael Kifer  <kifer@cs.stonybrook.edu>
+       
+       * viper-cmd.el (viper-special-read-and-insert-char): convert events to
+       chars if XEmacs.
+       (viper-after-change-undo-hook): check if undo-in-progress is bound.
+       
 2006-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/python.el (python-eldoc-function): Re-enable quit while

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index af757a2a55c6b1e18d2c5922c5b518869aa50a51..1685b829f64a67f0dec48b559550693506bd654f 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -892,12 +892,17 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
              (t
               ;;(setq ch (read-char-exclusive))
               (setq ch (aref (read-key-sequence nil) 0))
+              (if viper-xemacs-p
+                  (setq ch (event-to-character ch)))
               ;; replace ^M with the newline
               (if (eq ch ?\C-m) (setq ch ?\n))
               ;; Make sure ^V and ^Q work as quotation chars
               (if (memq ch '(?\C-v ?\C-q))
-                  ;;(setq ch (read-char-exclusive))
-                  (setq ch (aref (read-key-sequence nil) 0))
+                  (progn
+                    ;;(setq ch (read-char-exclusive))
+                    (setq ch (aref (read-key-sequence nil) 0))
+                    (if viper-xemacs-p
+                        (setq ch (event-to-character ch))))
                 )
               (insert ch))
              )
@@ -1750,7 +1755,7 @@ invokes the command before that, etc."
 
 ;; Hook used in viper-undo
 (defun viper-after-change-undo-hook (beg end len)
-  (if undo-in-progress
+  (if (and (boundp 'undo-in-progress) undo-in-progress)
       (setq undo-beg-posn beg
            undo-end-posn (or end beg))
     ;; some other hooks may be changing various text properties in