Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

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

 * gnus--rel--5.10  (patch 197-199)

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

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

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 9311bdc0613..0463b01b7e3 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -399,6 +399,9 @@ and after the region marked by the rectangle to search."
                  (other :tag "Enabled" t))
   :group 'cua)
 
+(defvar cua-global-keymap)              ; forward
+(defvar cua--region-keymap)             ; forward
+
 (defcustom cua-rectangle-mark-key [(control return)]
   "Global key used to toggle the cua rectangle mark."
   :set #'(lambda (symbol value)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index e8f58db3ce9..ddd37b16cc2 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -532,7 +532,7 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
 
 ;;;###autoload
 (defun viper-mode ()
-  "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'."
+  "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'."
   (interactive)
   (if (not noninteractive)
       (progn