Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index af757a2a55c..1685b829f64 100644
--- 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