diff options
| -rw-r--r-- | lisp/emulation/vi.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el index b0a6b4c2666..4e17644e66a 100644 --- a/lisp/emulation/vi.el +++ b/lisp/emulation/vi.el | |||
| @@ -455,7 +455,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs." | |||
| 455 | (vi-mode-setup)) | 455 | (vi-mode-setup)) |
| 456 | 456 | ||
| 457 | (if (eq major-mode 'vi-mode) | 457 | (if (eq major-mode 'vi-mode) |
| 458 | (message "Already in vi-mode." (ding)) | 458 | (progn (ding) (message "Already in vi-mode.")) |
| 459 | (setq vi-mode-old-local-map (current-local-map)) | 459 | (setq vi-mode-old-local-map (current-local-map)) |
| 460 | (setq vi-mode-old-mode-name mode-name) | 460 | (setq vi-mode-old-mode-name mode-name) |
| 461 | (setq vi-mode-old-major-mode major-mode) | 461 | (setq vi-mode-old-major-mode major-mode) |
| @@ -703,7 +703,7 @@ use those instead of the ones saved." | |||
| 703 | regexp-search-ring | 703 | regexp-search-ring |
| 704 | search-ring)))) | 704 | search-ring)))) |
| 705 | (if (null search-command) | 705 | (if (null search-command) |
| 706 | (message "No last search command to repeat." (ding)) | 706 | (progn (ding) (message "No last search command to repeat.")) |
| 707 | (funcall search-command search-string nil nil arg))) | 707 | (funcall search-command search-string nil nil arg))) |
| 708 | 708 | ||
| 709 | (defun vi-reverse-last-search (arg &optional search-command search-string) | 709 | (defun vi-reverse-last-search (arg &optional search-command search-string) |
| @@ -718,7 +718,7 @@ If the optional search args are given, use those instead of the ones saved." | |||
| 718 | regexp-search-ring | 718 | regexp-search-ring |
| 719 | search-ring)))) | 719 | search-ring)))) |
| 720 | (if (null search-command) | 720 | (if (null search-command) |
| 721 | (message "No last search command to repeat." (ding)) | 721 | (progn (ding) (message "No last search command to repeat.")) |
| 722 | (funcall (cond ((eq search-command 're-search-forward) 're-search-backward) | 722 | (funcall (cond ((eq search-command 're-search-forward) 're-search-backward) |
| 723 | ((eq search-command 're-search-backward) 're-search-forward) | 723 | ((eq search-command 're-search-backward) 're-search-forward) |
| 724 | ((eq search-command 'search-forward) 'search-backward) | 724 | ((eq search-command 'search-forward) 'search-backward) |
| @@ -838,7 +838,7 @@ Goto mark '@' means jump into and pop the top mark on the mark ring." | |||
| 838 | (t | 838 | (t |
| 839 | (let ((mark (vi-get-mark mark-char))) | 839 | (let ((mark (vi-get-mark mark-char))) |
| 840 | (if (null mark) | 840 | (if (null mark) |
| 841 | (message "Mark register undefined." (vi-ding)) | 841 | (progn (vi-ding) (message "Mark register undefined.")) |
| 842 | (set-mark-command nil) | 842 | (set-mark-command nil) |
| 843 | (goto-char mark) | 843 | (goto-char mark) |
| 844 | (if line-flag (back-to-indentation))))))) | 844 | (if line-flag (back-to-indentation))))))) |
| @@ -881,7 +881,7 @@ is given, it is used instead of the saved one." | |||
| 881 | (interactive "p") | 881 | (interactive "p") |
| 882 | (if (null find-arg) (setq find-arg vi-last-find-char)) | 882 | (if (null find-arg) (setq find-arg vi-last-find-char)) |
| 883 | (if (null find-arg) | 883 | (if (null find-arg) |
| 884 | (message "No last find char to repeat." (ding)) | 884 | (progn (ding) (message "No last find char to repeat.")) |
| 885 | (vi-find-char (cons (* (car find-arg) -1) (cdr find-arg)) count))) ;6/13/86 | 885 | (vi-find-char (cons (* (car find-arg) -1) (cdr find-arg)) count))) ;6/13/86 |
| 886 | 886 | ||
| 887 | (defun vi-find-char (arg count) | 887 | (defun vi-find-char (arg count) |
| @@ -909,7 +909,7 @@ it is used instead of the saved one." | |||
| 909 | (interactive "p") | 909 | (interactive "p") |
| 910 | (if (null find-arg) (setq find-arg vi-last-find-char)) | 910 | (if (null find-arg) (setq find-arg vi-last-find-char)) |
| 911 | (if (null find-arg) | 911 | (if (null find-arg) |
| 912 | (message "No last find char to repeat." (ding)) | 912 | (progn (ding) (message "No last find char to repeat.")) |
| 913 | (vi-find-char find-arg count))) | 913 | (vi-find-char find-arg count))) |
| 914 | 914 | ||
| 915 | (defun vi-backward-find-char (count char) | 915 | (defun vi-backward-find-char (count char) |
| @@ -1465,7 +1465,8 @@ It assumes a `(def..' always starts at the beginning of a line." | |||
| 1465 | (goto-char (point-min)) | 1465 | (goto-char (point-min)) |
| 1466 | (if (re-search-forward (concat "^(def[unvarconst ]*" name) nil t) | 1466 | (if (re-search-forward (concat "^(def[unvarconst ]*" name) nil t) |
| 1467 | nil | 1467 | nil |
| 1468 | (message "No definition for \"%s\" in current file." name (ding)) | 1468 | (ding) |
| 1469 | (message "No definition for \"%s\" in current file." name) | ||
| 1469 | (set-mark-command t)))) | 1470 | (set-mark-command t)))) |
| 1470 | 1471 | ||
| 1471 | (defun vi-split-open-line (arg) | 1472 | (defun vi-split-open-line (arg) |