Merge from origin/emacs-25

[gnu-emacs] / lisp / emulation / viper-keym.el

diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 998f850f8c50ed416ca54161f66451352a34b312..f5bb32fcb2da62b0bcc97e5598799f77ba3549d2 100644 (file)
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -154,10 +154,8 @@ viper-insert-basic-map.  Not recommended, except for novice users.")
 ;; Some important keys used in viper
 (defcustom viper-toggle-key [(control ?z)]  ; "\C-z"
   "The key used to change states from Emacs to Vi and back.
-In insert mode, this key also functions as Meta.
-
-Enter as a sexp.  Examples: \"\\C-z\", [(control ?z)]."
-  :type 'sexp
+In insert mode, this key also functions as Meta."
+  :type 'key-sequence
   :group 'viper
   :set (lambda (symbol value)
         (let ((old-value (if (boundp 'viper-toggle-key)