diff options
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/cua-gmrk.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/vip.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 16 | ||||
| -rw-r--r-- | lisp/emulation/viper-init.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper-macs.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 9a50352d50..a68c4dfdf6 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1242,7 +1242,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." ;; Handle shifted cursor keys and other movement commands. ;; If region is not active, region is activated if key is shifted. - ;; If region is active, region is cancelled if key is unshifted + ;; If region is active, region is canceled if key is unshifted ;; (and region not started with C-SPC). ;; If rectangle is active, expand rectangle in specified direction and ;; ignore the movement. diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index 690555e81d..b6a3a97790 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -94,7 +94,7 @@ insert the deleted or copied text before the global marker, even when the global marker is in another buffer. If the global marker isn't set, set the global marker at point in the current buffer. Otherwise jump to the global marker position and cancel it. -With prefix argument, don't jump to global mark when cancelling it." +With prefix argument, don't jump to global mark when canceling it." (interactive "P") (unless cua--global-mark-initialized (cua--init-global-mark)) diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index a0c6062fb2..1298e5424a 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -420,7 +420,7 @@ Type `n' to quit this window for now.\n") (goto-char (point-min)) (if (y-or-n-p "Inhibit VIP startup message? ") (progn - (with-current-buffer + (with-current-buffer (find-file-noselect (substitute-in-file-name vip-startup-file)) (goto-char (point-max)) @@ -877,7 +877,7 @@ is the name of the register for COM." (if (> beg end) (exchange-point-and-mark))) (defun vip-global-execute () - "Call last keyboad macro for each line in the region." + "Call last keyboard macro for each line in the region." (if (> (point) (mark)) (exchange-point-and-mark)) (beginning-of-line) (call-last-kbd-macro) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ce3cc3c9a2..78bc09af13 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -716,7 +716,7 @@ (error (viper-message-conditions conds)))) -;; escape to emacs mode termporarily +;; escape to emacs mode temporarily (defun viper-escape-to-emacs (arg &optional events) "Escape to Emacs state from Vi state for one Emacs command. ARG is used as the prefix value for the executed command. If @@ -726,7 +726,7 @@ EVENTS is a list of events, which become the beginning of the command." (message "Switched to EMACS state for the next command...")) (viper-escape-to-state arg events 'emacs-state)) -;; escape to Vi mode termporarily +;; escape to Vi mode temporarily (defun viper-escape-to-vi (arg) "Escape from Emacs state to Vi state for one Vi 1-character command. If the Vi command that the user types has a prefix argument, e.g., `d2w', then @@ -2407,7 +2407,7 @@ problems." t 'local) (add-hook 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) - ;; guard against a smartie who switched from R-replace to normal replace + ;; guard against a smarty who switched from R-replace to normal replace (remove-hook 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) (if overwrite-mode (overwrite-mode -1)) @@ -2531,7 +2531,7 @@ problems." 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) (add-hook 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) - ;; guard against a smartie who switched from R-replace to normal replace + ;; guard against a smarty who switched from R-replace to normal replace (remove-hook 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) ) @@ -3767,7 +3767,7 @@ If MAJOR-MODE is set, set the macros only in that major mode." "//" 'vi-state [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] scope) - ;; toggle regexp/vanila search + ;; toggle regexp/vanilla search (viper-record-kbd-macro "///" 'vi-state [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] @@ -3824,7 +3824,7 @@ the macros are set in the current major mode. "//" 'emacs-state [1 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] (or arg-majormode major-mode)) - ;; toggle regexp/vanila search + ;; toggle regexp/vanilla search (viper-record-kbd-macro "///" 'emacs-state [2 (meta x) v i p e r - t o g g l e - s e a r c h - s t y l e return] @@ -4017,7 +4017,7 @@ Null string will repeat previous search." (setq viper-prefix-commands (cons viper-buffer-search-char viper-prefix-commands))) -;; This is a Viper wraper for isearch-forward. +;; This is a Viper wrapper for isearch-forward. (defun viper-isearch-forward (arg) "Do incremental search forward." (interactive "P") @@ -4025,7 +4025,7 @@ Null string will repeat previous search." (if (listp arg) (setq arg (car arg))) (viper-exec-form-in-emacs (list 'isearch-forward arg))) -;; This is a Viper wraper for isearch-backward." +;; This is a Viper wrapper for isearch-backward." (defun viper-isearch-backward (arg) "Do incremental search backward." (interactive "P") diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 2d221d5fa0..2fc8dc599c 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -818,7 +818,7 @@ Related buffers can be cycled through via :R and :P commands." ;;; Face-saving tricks (defgroup viper-highlighting nil - "Hilighting of replace region, search pattern, minibuffer, etc." + "Highlighting of replace region, search pattern, minibuffer, etc." :prefix "viper-" :group 'viper) diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index e978823a49..2704bdc5b4 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -921,7 +921,7 @@ name from there." (defun viper-global-execute () - "Call last keyboad macro for each line in the region." + "Call last keyboard macro for each line in the region." (if (> (point) (mark t)) (exchange-point-and-mark)) (beginning-of-line) (call-last-kbd-macro) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index b2035e8ede..3704725b8d 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -491,7 +491,7 @@ unless it is coming up in a wrong Viper state." ) "List specifying how to modify the various major modes to enable some Viperisms. The list has the structure: ((mode viper-state keymap) (mode viper-state -keymap) ...). If `mode' is on the list, the `kemap' will be made active (on +keymap) ...). If `mode' is on the list, the `keymap' will be made active (on the minor-mode-map-alist) in the specified viper state. If you change this list, have to restart Emacs for the change to take effect. However, if you did the change through the customization widget, then Emacs |