diff options
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/edt.el | 3 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 13 | ||||
| -rw-r--r-- | lisp/emulation/viper-ex.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-macs.el | 12 |
4 files changed, 17 insertions, 15 deletions
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 2c9e5799ac1..9bd1627ffeb 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -1984,7 +1984,8 @@ created." (if (edt-y-or-n-p "Do you want to run it now? ") (load-file path) (error "EDT Emulation not configured"))) - (insert "Nope, I can't seem to find it. :-(\n\n") + (insert (substitute-command-keys + "Nope, I can't seem to find it. :-(\n\n")) (sit-for 20) (error "EDT Emulation not configured")))))) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 4fe948a2918..8b3f6b46507 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1751,8 +1751,8 @@ invokes the command before that, etc." (setq this-command 'viper-display-current-destructive-command) - (message " `.' runs %s%s" - (concat "`" (viper-array-to-string keys) "'") + (message " `.' runs `%s'%s" + (viper-array-to-string keys) (viper-abbreviate-string (if (featurep 'xemacs) (replace-in-string ; xemacs @@ -1763,7 +1763,8 @@ invokes the command before that, etc." text ; emacs ) max-text-len - " inserting `" "'" " .......")) + (format-message " inserting `") (format-message "'") + " .......")) )) @@ -4341,7 +4342,7 @@ and regexp replace." (query-replace-regexp str (viper-read-string-with-history - (format "Query replace regexp `%s' with: " str) + (format-message "Query replace regexp `%s' with: " str) nil ; no initial 'viper-replace1-history (car viper-replace1-history) ; default @@ -4349,7 +4350,7 @@ and regexp replace." (query-replace str (viper-read-string-with-history - (format "Query replace `%s' with: " str) + (format-message "Query replace `%s' with: " str) nil ; no initial 'viper-replace1-history (car viper-replace1-history) ; default @@ -4643,7 +4644,7 @@ One can use \\=`\\=` and \\='\\=' to temporarily jump 1 step back." reg (buffer-name buf) line-no)) (princ (format "Here is some text around %c:\n\n %s" reg text))) - (princ (format viper-EmptyTextmarker reg)))) + (princ (format-message viper-EmptyTextmarker reg)))) )) (t (error viper-InvalidTextmarker reg))))) diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index e6bcf8f89a4..fb2c1792a41 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -491,7 +491,7 @@ reversed." (forward-char 1) (cond ((looking-at "'") (setq ex-token nil)) ((looking-at "[a-z]") (setq ex-token (following-char))) - (t (error "Marks are ' and a-z"))) + (t (error "%s" "Marks are ' and a-z"))) (forward-char 1)) ((looking-at "\n") (setq ex-token-type 'end-mark) @@ -2190,7 +2190,7 @@ Please contact your system administrator. " (defun ex-compile () "Reads args from the command line, then runs make with the args. If no args are given, then it runs the last compile command. -Type 'mak ' (including the space) to run make with no args." +Type `mak ' (including the space) to run make with no args." (let (args) (with-current-buffer (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index e8568328b7a..4b33b423740 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -529,9 +529,9 @@ mistakes in macro names to be passed to this function is to use (cond ((and (cdr buf-mapping) (or (and (not (cdr mode-mapping)) (not (cdr global-mapping))) (y-or-n-p - (format "Unmap %S for `%s' only? " - (viper-display-macro macro-name) - (buffer-name))))) + (format-message "Unmap %S for `%s' only? " + (viper-display-macro macro-name) + (buffer-name))))) (setq macro-pair buf-mapping) (message "%S is unmapped for %s in `%s'" (viper-display-macro macro-name) @@ -539,9 +539,9 @@ mistakes in macro names to be passed to this function is to use ((and (cdr mode-mapping) (or (not (cdr global-mapping)) (y-or-n-p - (format "Unmap %S for the major mode `%S' only? " - (viper-display-macro macro-name) - major-mode)))) + (format-message "Unmap %S for the major mode `%S' only? " + (viper-display-macro macro-name) + major-mode)))) (setq macro-pair mode-mapping) (message "%S is unmapped for %s in %S" (viper-display-macro macro-name) state-name major-mode)) |