Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

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

diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 4b33b423740b5a3ef3bc6cb00f94b193940a2012..fd6b22231a69e14e277eae3e8853798a3a3717ef 100644 (file)
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -1,6 +1,6 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
-;; Copyright (C) 1994-1997, 2000-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2016 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
@@ -327,8 +327,8 @@ Can be used in `viper-custom-file-name' to define permanent macros.
 MACRO-NAME is a string of characters or a vector of keys.  STATE is
 either `vi-state' or `insert-state'.  It specifies the Viper state in which to
 define the macro.  MACRO-BODY is a string that represents the keyboard macro.
-Optional SCOPE says whether the macro should be global \(t\), mode-specific
-\(a major-mode symbol\), or buffer-specific \(buffer name, a string\).
+Optional SCOPE says whether the macro should be global \(t), mode-specific
+\(a major-mode symbol), or buffer-specific \(buffer name, a string).
 If SCOPE is nil, the user is asked to specify the scope."
   (let* (state-name keymap
         (macro-alist-var
@@ -370,11 +370,11 @@ If SCOPE is nil, the user is asked to specify the scope."
                (cond
                 ((y-or-n-p
                   (format-message
-                   "Map this macro for buffer ‘%s’ only? "
+                   "Map this macro for buffer `%s' only? "
                    (buffer-name)))
                  (setq msg
                        (format-message
-                        "%S is mapped to %s for %s in ‘%s’"
+                        "%S is mapped to %s for %s in `%s'"
                         (viper-display-macro macro-name)
                         (viper-abbreviate-string
                          (format
@@ -386,11 +386,11 @@ If SCOPE is nil, the user is asked to specify the scope."
                  (buffer-name))
                 ((y-or-n-p
                   (format-message
-                   "Map this macro for the major mode ‘%S’ only? "
+                   "Map this macro for the major mode `%S' only? "
                    major-mode))
                  (setq msg
                        (format-message
-                        "%S is mapped to %s for %s in ‘%S’"
+                        "%S is mapped to %s for %s in `%S'"
                         (viper-display-macro macro-name)
                         (viper-abbreviate-string
                          (format
@@ -894,7 +894,7 @@ mistakes in macro names to be passed to this function is to use
   (set-register reg last-kbd-macro))
 
 (defun viper-register-macro (count)
-  "Keyboard macros in registers - a modified \@ command."
+  "Keyboard macros in registers - a modified @ command."
   (interactive "P")
   (let ((reg (downcase (read-char))))
     (cond ((or (and (<= ?a reg) (<= reg ?z)))