diff options
| author | Juanma Barranquero | 2010-01-18 05:39:40 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2010-01-18 05:39:40 +0100 |
| commit | db9e401b3bf3514cadf6fc5a4f15e8c869d0df4c (patch) | |
| tree | 51ac199a0ed2477d0395c7eace93fc8fa4dabf6d /lisp/emulation | |
| parent | 33972e801477b638f22f4ba3f6e04199d5992124 (diff) | |
| download | emacs-db9e401b3bf3514cadf6fc5a4f15e8c869d0df4c.tar.gz emacs-db9e401b3bf3514cadf6fc5a4f15e8c869d0df4c.zip | |
Fix typos in docstrings, error messages, etc.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 73cff9d8934..8c216d9aca6 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -479,7 +479,7 @@ | |||
| 479 | (assoc major-mode viper-emacs-state-modifier-alist)) | 479 | (assoc major-mode viper-emacs-state-modifier-alist)) |
| 480 | viper-empty-keymap)) | 480 | viper-empty-keymap)) |
| 481 | )) | 481 | )) |
| 482 | 482 | ||
| 483 | ;; This var is not local in Emacs, so we make it local. It must be local | 483 | ;; This var is not local in Emacs, so we make it local. It must be local |
| 484 | ;; because although the stack of minor modes can be the same for all buffers, | 484 | ;; because although the stack of minor modes can be the same for all buffers, |
| 485 | ;; the associated *keymaps* can be different. In Viper, | 485 | ;; the associated *keymaps* can be different. In Viper, |
| @@ -891,7 +891,7 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to | |||
| 891 | 891 | ||
| 892 | 892 | ||
| 893 | (defun viper-exec-form-in-vi (form) | 893 | (defun viper-exec-form-in-vi (form) |
| 894 | "Execute FORM in Vi state, regardless of the Ccurrent Vi state." | 894 | "Execute FORM in Vi state, regardless of the current Vi state." |
| 895 | (let ((buff (current-buffer)) | 895 | (let ((buff (current-buffer)) |
| 896 | result) | 896 | result) |
| 897 | (viper-set-mode-vars-for 'vi-state) | 897 | (viper-set-mode-vars-for 'vi-state) |
| @@ -910,7 +910,7 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to | |||
| 910 | 910 | ||
| 911 | (defun viper-exec-form-in-emacs (form) | 911 | (defun viper-exec-form-in-emacs (form) |
| 912 | "Execute FORM in Emacs, temporarily disabling Viper's minor modes. | 912 | "Execute FORM in Emacs, temporarily disabling Viper's minor modes. |
| 913 | Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes." | 913 | Similar to `viper-escape-to-emacs', but accepts forms rather than keystrokes." |
| 914 | (let ((buff (current-buffer)) | 914 | (let ((buff (current-buffer)) |
| 915 | result) | 915 | result) |
| 916 | (viper-set-mode-vars-for 'emacs-state) | 916 | (viper-set-mode-vars-for 'emacs-state) |
| @@ -939,7 +939,7 @@ such minor modes. | |||
| 939 | Usage: | 939 | Usage: |
| 940 | (viper-harness-minor-mode load-file) | 940 | (viper-harness-minor-mode load-file) |
| 941 | 941 | ||
| 942 | LOAD-FILE is a name of the file where the specific minor mode is defined. | 942 | LOAD-FILE is the name of the file where the specific minor mode is defined. |
| 943 | Suffixes such as .el or .elc should be stripped." | 943 | Suffixes such as .el or .elc should be stripped." |
| 944 | 944 | ||
| 945 | (interactive "sEnter name of the load file: ") | 945 | (interactive "sEnter name of the load file: ") |
| @@ -961,9 +961,9 @@ Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. | |||
| 961 | If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. | 961 | If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. |
| 962 | Other ESC sequences are emulated via the current Emacs's major mode | 962 | Other ESC sequences are emulated via the current Emacs's major mode |
| 963 | keymap. This is more convenient on TTYs, since this won't block | 963 | keymap. This is more convenient on TTYs, since this won't block |
| 964 | function keys such as up,down, etc. ESC will also will also work as | 964 | function keys such as up, down, etc. ESC will also will also work as |
| 965 | a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions | 965 | a Meta key in this case. When viper-no-multiple-ESC is nil, ESC works |
| 966 | as a Meta key and any number of multiple escapes is allowed." | 966 | as a Meta key and any number of multiple escapes are allowed." |
| 967 | (interactive "P") | 967 | (interactive "P") |
| 968 | (let (char) | 968 | (let (char) |
| 969 | (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) | 969 | (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) |
| @@ -1181,7 +1181,7 @@ as a Meta key and any number of multiple escapes is allowed." | |||
| 1181 | ((eq event-char 'delete) (setq event-char ?\C-?)) | 1181 | ((eq event-char 'delete) (setq event-char ?\C-?)) |
| 1182 | ((eq event-char 'backspace) (setq event-char ?\C-h)) | 1182 | ((eq event-char 'backspace) (setq event-char ?\C-h)) |
| 1183 | ((eq event-char 'space) (setq event-char ?\ ))) | 1183 | ((eq event-char 'space) (setq event-char ?\ ))) |
| 1184 | (setq last-command-event | 1184 | (setq last-command-event |
| 1185 | (if (featurep 'xemacs) | 1185 | (if (featurep 'xemacs) |
| 1186 | (character-to-event (or com event-char)) | 1186 | (character-to-event (or com event-char)) |
| 1187 | (or com event-char))) | 1187 | (or com event-char))) |
| @@ -1257,7 +1257,7 @@ as a Meta key and any number of multiple escapes is allowed." | |||
| 1257 | 1257 | ||
| 1258 | ;; as com is non-nil, this means that we have a command to execute | 1258 | ;; as com is non-nil, this means that we have a command to execute |
| 1259 | (if (viper-memq-char (car com) '(?r ?R)) | 1259 | (if (viper-memq-char (car com) '(?r ?R)) |
| 1260 | ;; execute apropriate region command. | 1260 | ;; execute appropriate region command. |
| 1261 | (let ((char (car com)) (com (cdr com))) | 1261 | (let ((char (car com)) (com (cdr com))) |
| 1262 | (setq prefix-arg (cons value com)) | 1262 | (setq prefix-arg (cons value com)) |
| 1263 | (if (viper= char ?r) | 1263 | (if (viper= char ?r) |
| @@ -1285,7 +1285,7 @@ as a Meta key and any number of multiple escapes is allowed." | |||
| 1285 | ;; gg acts as G0 | 1285 | ;; gg acts as G0 |
| 1286 | ((equal (car com) ?g) (viper-goto-line 0)) | 1286 | ((equal (car com) ?g) (viper-goto-line 0)) |
| 1287 | (t (error "Viper bell"))))) | 1287 | (t (error "Viper bell"))))) |
| 1288 | 1288 | ||
| 1289 | (if cmd-to-exec-at-end | 1289 | (if cmd-to-exec-at-end |
| 1290 | (progn | 1290 | (progn |
| 1291 | (setq last-command-event | 1291 | (setq last-command-event |
| @@ -1621,7 +1621,7 @@ Use the info in viper-d-com, which has the form | |||
| 1621 | where `com' is the command to be re-executed, `val' is the | 1621 | where `com' is the command to be re-executed, `val' is the |
| 1622 | argument to `com', `ch' is a flag for repeat, and `reg' is optional; | 1622 | argument to `com', `ch' is a flag for repeat, and `reg' is optional; |
| 1623 | if it exists, it is the name of the register for `com'. | 1623 | if it exists, it is the name of the register for `com'. |
| 1624 | If the prefix argument, ARG, is non-nil, it is used instead of `val'." | 1624 | If the prefix argument ARG is non-nil, it is used instead of `val'." |
| 1625 | (interactive "P") | 1625 | (interactive "P") |
| 1626 | (let ((save-point (point)) ; save point before repeating prev cmd | 1626 | (let ((save-point (point)) ; save point before repeating prev cmd |
| 1627 | ;; Pass along that we are repeating a destructive command | 1627 | ;; Pass along that we are repeating a destructive command |
| @@ -1944,7 +1944,7 @@ Undo previous insertion and inserts new." | |||
| 1944 | require-final-newline | 1944 | require-final-newline |
| 1945 | ;; add newline only if we actually edited buffer. otherwise it | 1945 | ;; add newline only if we actually edited buffer. otherwise it |
| 1946 | ;; might unintentionally modify binary buffers | 1946 | ;; might unintentionally modify binary buffers |
| 1947 | (buffer-modified-p) | 1947 | (buffer-modified-p) |
| 1948 | (not (viper-is-in-minibuffer)) | 1948 | (not (viper-is-in-minibuffer)) |
| 1949 | (not buffer-read-only)) | 1949 | (not buffer-read-only)) |
| 1950 | ;; text property may be read-only | 1950 | ;; text property may be read-only |
| @@ -2539,7 +2539,7 @@ problems." | |||
| 2539 | 2539 | ||
| 2540 | (defun viper-replace-state-exit-cmd () | 2540 | (defun viper-replace-state-exit-cmd () |
| 2541 | "Binding for keys that cause Replace state to switch to Vi or to Insert. | 2541 | "Binding for keys that cause Replace state to switch to Vi or to Insert. |
| 2542 | These keys are ESC, RET, and LineFeed" | 2542 | These keys are ESC, RET, and LineFeed." |
| 2543 | (interactive) | 2543 | (interactive) |
| 2544 | (if overwrite-mode ; if in replace mode invoked via 'R' | 2544 | (if overwrite-mode ; if in replace mode invoked via 'R' |
| 2545 | (viper-finish-R-mode) | 2545 | (viper-finish-R-mode) |
| @@ -3711,7 +3711,7 @@ controlled by the sign of prefix numeric value." | |||
| 3711 | (defun viper-toggle-search-style (arg) | 3711 | (defun viper-toggle-search-style (arg) |
| 3712 | "Toggle the value of viper-case-fold-search/viper-re-search. | 3712 | "Toggle the value of viper-case-fold-search/viper-re-search. |
| 3713 | Without prefix argument, will ask which search style to toggle. With prefix | 3713 | Without prefix argument, will ask which search style to toggle. With prefix |
| 3714 | arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search. | 3714 | arg 1, toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
| 3715 | 3715 | ||
| 3716 | Although this function is bound to \\[viper-toggle-search-style], the most | 3716 | Although this function is bound to \\[viper-toggle-search-style], the most |
| 3717 | convenient way to use it is to bind `//' to the macro | 3717 | convenient way to use it is to bind `//' to the macro |
| @@ -4262,7 +4262,7 @@ Null string will repeat previous search." | |||
| 4262 | (defun viper-del-backward-char-in-replace () | 4262 | (defun viper-del-backward-char-in-replace () |
| 4263 | "Delete one character in replace mode. | 4263 | "Delete one character in replace mode. |
| 4264 | If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes | 4264 | If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes |
| 4265 | charecters. If it is nil, then the cursor just moves backwards, similarly | 4265 | characters. If it is nil, then the cursor just moves backwards, similarly |
| 4266 | to Vi. The variable `viper-ex-style-editing', if t, doesn't let the | 4266 | to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
| 4267 | cursor move past the beginning of line." | 4267 | cursor move past the beginning of line." |
| 4268 | (interactive) | 4268 | (interactive) |
| @@ -4614,7 +4614,7 @@ One can use `` and '' to temporarily jump 1 step back." | |||
| 4614 | (indent-to (+ (current-column) viper-shift-width))) | 4614 | (indent-to (+ (current-column) viper-shift-width))) |
| 4615 | 4615 | ||
| 4616 | (defun viper-backward-indent () | 4616 | (defun viper-backward-indent () |
| 4617 | "Backtab, C-d in VI" | 4617 | "Backtab, `C-d' in Vi." |
| 4618 | (interactive) | 4618 | (interactive) |
| 4619 | (if viper-cted | 4619 | (if viper-cted |
| 4620 | (let ((p (point)) (c (current-column)) bol (indent t)) | 4620 | (let ((p (point)) (c (current-column)) bol (indent t)) |
| @@ -4689,7 +4689,7 @@ One can use `` and '' to temporarily jump 1 step back." | |||
| 4689 | viper-InvalidRegister reg))))) | 4689 | viper-InvalidRegister reg))))) |
| 4690 | 4690 | ||
| 4691 | (defun viper-brac-function (arg) | 4691 | (defun viper-brac-function (arg) |
| 4692 | "Function called by \[, the brac. View textmarkers and call \[\[" | 4692 | "Function called by \[, the brac. View textmarkers and call \[\[." |
| 4693 | (interactive "P") | 4693 | (interactive "P") |
| 4694 | (let ((reg (read-char))) | 4694 | (let ((reg (read-char))) |
| 4695 | (cond ((viper= ?\[ reg) | 4695 | (cond ((viper= ?\[ reg) |
| @@ -4922,7 +4922,7 @@ Please, specify your level now: ") | |||
| 4922 | 4922 | ||
| 4923 | ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer | 4923 | ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
| 4924 | (defun viper-register-to-point (char &optional enforce-buffer) | 4924 | (defun viper-register-to-point (char &optional enforce-buffer) |
| 4925 | "Like jump-to-register, but switches to another buffer in another window." | 4925 | "Like `jump-to-register', but switches to another buffer in another window." |
| 4926 | (interactive "cViper register to point: ") | 4926 | (interactive "cViper register to point: ") |
| 4927 | (let ((val (get-register char))) | 4927 | (let ((val (get-register char))) |
| 4928 | (cond | 4928 | (cond |
| @@ -5047,7 +5047,7 @@ PLEASE FOLLOW THESE PROCEDURES | |||
| 5047 | ------------------------------ | 5047 | ------------------------------ |
| 5048 | 5048 | ||
| 5049 | Before reporting a bug, please verify that it is related to Viper, and is | 5049 | Before reporting a bug, please verify that it is related to Viper, and is |
| 5050 | not cause by other packages you are using. | 5050 | not caused by other packages you are using. |
| 5051 | 5051 | ||
| 5052 | Don't report compilation warnings, unless you are certain that there is a | 5052 | Don't report compilation warnings, unless you are certain that there is a |
| 5053 | problem. These warnings are normal and unavoidable. | 5053 | problem. These warnings are normal and unavoidable. |