Mercurial > emacs
annotate lisp/emulation/viper-cmd.el @ 37678:ebec0594dece
(compile-files): Redirect output of chmod to
/dev/null.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 11 May 2001 10:53:56 +0000 |
| parents | f6a67d77484a |
| children | 67b464da13ec |
| rev | line source |
|---|---|
| 18129 | 1 ;;; viper-cmd.el --- Vi command support for Viper |
| 2 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 3 | |
|
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
4 ;; This file is part of GNU Emacs. |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
5 |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
6 ;; GNU Emacs is free software; you can redistribute it and/or modify |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
7 ;; it under the terms of the GNU General Public License as published by |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
8 ;; the Free Software Foundation; either version 2, or (at your option) |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
9 ;; any later version. |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
10 |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
11 ;; GNU Emacs is distributed in the hope that it will be useful, |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
12 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
13 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
14 ;; GNU General Public License for more details. |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
15 |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
16 ;; You should have received a copy of the GNU General Public License |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
17 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
18 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
19 ;; Boston, MA 02111-1307, USA. |
| 18129 | 20 |
| 21 ;; Code | |
| 22 | |
| 23 (provide 'viper-cmd) | |
| 18172 | 24 (require 'advice) |
| 18129 | 25 |
| 26 ;; Compiler pacifier | |
| 19078 | 27 (defvar viper-minibuffer-current-face) |
| 28 (defvar viper-minibuffer-insert-face) | |
| 29 (defvar viper-minibuffer-vi-face) | |
| 30 (defvar viper-minibuffer-emacs-face) | |
| 18289 | 31 (defvar viper-always) |
| 19078 | 32 (defvar viper-mode-string) |
| 33 (defvar viper-custom-file-name) | |
| 18129 | 34 (defvar iso-accents-mode) |
| 19462 | 35 (defvar quail-mode) |
| 36 (defvar quail-current-str) | |
| 18129 | 37 (defvar zmacs-region-stays) |
| 38 (defvar mark-even-if-inactive) | |
| 39 | |
| 18172 | 40 ;; loading happens only in non-interactive compilation |
| 41 ;; in order to spare non-viperized emacs from being viperized | |
| 42 (if noninteractive | |
| 43 (eval-when-compile | |
| 44 (let ((load-path (cons (expand-file-name ".") load-path))) | |
| 45 (or (featurep 'viper-util) | |
| 46 (load "viper-util.el" nil nil 'nosuffix)) | |
| 47 (or (featurep 'viper-keym) | |
| 48 (load "viper-keym.el" nil nil 'nosuffix)) | |
| 49 (or (featurep 'viper-mous) | |
| 50 (load "viper-mous.el" nil nil 'nosuffix)) | |
| 51 (or (featurep 'viper-macs) | |
| 52 (load "viper-macs.el" nil nil 'nosuffix)) | |
| 53 (or (featurep 'viper-ex) | |
| 54 (load "viper-ex.el" nil nil 'nosuffix)) | |
| 55 ))) | |
| 18129 | 56 ;; end pacifier |
| 57 | |
| 58 | |
| 59 (require 'viper-util) | |
| 60 (require 'viper-keym) | |
| 61 (require 'viper-mous) | |
| 62 (require 'viper-macs) | |
| 63 (require 'viper-ex) | |
| 64 | |
| 65 | |
| 66 | |
| 67 ;; Generic predicates | |
| 68 | |
| 69 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane | |
| 70 | |
| 71 ;; generate test functions | |
| 72 ;; given symbol foo, foo-p is the test function, foos is the set of | |
| 73 ;; Viper command keys | |
| 19078 | 74 ;; (macroexpand '(viper-test-com-defun foo)) |
| 18129 | 75 ;; (defun foo-p (com) (consp (memq (if (< com 0) (- com) com) foos))) |
| 76 | |
| 19078 | 77 (defmacro viper-test-com-defun (name) |
| 18129 | 78 (let* ((snm (symbol-name name)) |
| 79 (nm-p (intern (concat snm "-p"))) | |
| 80 (nms (intern (concat snm "s")))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
81 `(defun ,nm-p (com) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
82 (consp (viper-memq-char |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
83 (if (and (viper-characterp com) (< com 0)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
84 (- com) com) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
85 ,nms) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
86 )))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
87 |
| 18129 | 88 ;; Variables for defining VI commands |
| 89 | |
| 90 ;; Modifying commands that can be prefixes to movement commands | |
| 19078 | 91 (defconst viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\")) |
| 92 ;; define viper-prefix-command-p | |
| 93 (viper-test-com-defun viper-prefix-command) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
94 |
| 18129 | 95 ;; Commands that are pairs eg. dd. r and R here are a hack |
| 19078 | 96 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R)) |
| 97 ;; define viper-charpair-command-p | |
| 98 (viper-test-com-defun viper-charpair-command) | |
| 99 | |
| 100 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l | |
| 18129 | 101 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?% |
| 102 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?` | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
103 ?\; ?, ?0 ?? ?/ ?\ ?\C-m |
| 19078 | 104 space return |
| 105 delete backspace | |
| 18129 | 106 ) |
| 107 "Movement commands") | |
| 19078 | 108 ;; define viper-movement-command-p |
| 109 (viper-test-com-defun viper-movement-command) | |
| 18129 | 110 |
| 18839 | 111 ;; Vi digit commands |
| 19078 | 112 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)) |
| 113 | |
| 114 ;; define viper-digit-command-p | |
| 115 (viper-test-com-defun viper-digit-command) | |
| 18129 | 116 |
| 117 ;; Commands that can be repeated by . (dotted) | |
| 19078 | 118 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<)) |
| 119 ;; define viper-dotable-command-p | |
| 120 (viper-test-com-defun viper-dotable-command) | |
| 18129 | 121 |
| 122 ;; Commands that can follow a # | |
| 19078 | 123 (defconst viper-hash-commands '(?c ?C ?g ?q ?s)) |
| 124 ;; define viper-hash-command-p | |
| 125 (viper-test-com-defun viper-hash-command) | |
| 18129 | 126 |
| 127 ;; Commands that may have registers as prefix | |
| 19078 | 128 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X)) |
| 129 ;; define viper-regsuffix-command-p | |
| 130 (viper-test-com-defun viper-regsuffix-command) | |
| 131 | |
| 132 (defconst viper-vi-commands (append viper-movement-commands | |
| 133 viper-digit-commands | |
| 134 viper-dotable-commands | |
| 135 viper-charpair-commands | |
| 136 viper-hash-commands | |
| 137 viper-prefix-commands | |
| 138 viper-regsuffix-commands) | |
| 18129 | 139 "The list of all commands in Vi-state.") |
| 19078 | 140 ;; define viper-vi-command-p |
| 141 (viper-test-com-defun viper-vi-command) | |
| 18129 | 142 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
143 ;; Where viper saves mark. This mark is resurrected by m^ |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
144 (defvar viper-saved-mark nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
145 |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
146 |
| 18129 | 147 |
| 148 ;;; CODE | |
| 149 | |
| 150 ;; sentinels | |
| 151 | |
| 19078 | 152 ;; Runs viper-after-change-functions inside after-change-functions |
| 153 (defun viper-after-change-sentinel (beg end len) | |
| 21940 | 154 (run-hook-with-args 'viper-after-change-functions beg end len)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
155 |
| 19078 | 156 ;; Runs viper-before-change-functions inside before-change-functions |
| 157 (defun viper-before-change-sentinel (beg end) | |
| 21940 | 158 (run-hook-with-args 'viper-before-change-functions beg end)) |
| 18129 | 159 |
| 19078 | 160 (defsubst viper-post-command-sentinel () |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
161 (run-hooks 'viper-post-command-hooks) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
162 (if (eq viper-current-state 'vi-state) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
163 (viper-restore-cursor-color 'after-insert-mode))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
164 |
| 19078 | 165 (defsubst viper-pre-command-sentinel () |
| 166 (run-hooks 'viper-pre-command-hooks)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
167 |
| 18129 | 168 ;; Needed so that Viper will be able to figure the last inserted |
| 169 ;; chunk of text with reasonable accuracy. | |
| 19078 | 170 (defsubst viper-insert-state-post-command-sentinel () |
| 171 (if (and (memq viper-current-state '(insert-state replace-state)) | |
| 172 viper-insert-point | |
| 173 (>= (point) viper-insert-point)) | |
| 174 (setq viper-last-posn-while-in-insert-state (point-marker))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
175 (or (viper-overlay-p viper-replace-overlay) |
| 18129 | 176 (progn |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
177 (viper-set-replace-overlay (point-min) (point-min)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
178 (viper-hide-replace-overlay))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
179 (if (eq viper-current-state 'insert-state) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
180 (let ((has-saved-cursor-color-in-insert-mode |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
181 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
182 (or has-saved-cursor-color-in-insert-mode |
| 19078 | 183 (string= (viper-get-cursor-color) viper-insert-state-cursor-color) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
184 ;; save current color, if not already saved |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
185 (viper-save-cursor-color 'before-insert-mode)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
186 ;; set insert mode cursor color |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
187 (viper-change-cursor-color viper-insert-state-cursor-color))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
188 |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
189 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
| 19078 | 190 (integerp viper-pre-command-point) |
| 19756 | 191 (markerp viper-insert-point) |
| 192 (marker-position viper-insert-point) | |
| 19078 | 193 (> viper-insert-point viper-pre-command-point)) |
| 19756 | 194 (viper-move-marker-locally viper-insert-point viper-pre-command-point)) |
| 18129 | 195 ) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
196 |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
197 (defsubst viper-preserve-cursor-color () |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
198 (or (memq this-command '(self-insert-command |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
199 viper-del-backward-char-in-insert |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
200 viper-del-backward-char-in-replace |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
201 viper-delete-backward-char |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
202 viper-join-lines |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
203 viper-delete-char)) |
| 19078 | 204 (memq (viper-event-key last-command-event) |
| 18129 | 205 '(up down left right (meta f) (meta b) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
206 (control n) (control p) (control f) (control b))))) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
207 |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
208 (defsubst viper-insert-state-pre-command-sentinel () |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
209 (or (viper-preserve-cursor-color) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
210 (viper-restore-cursor-color 'after-insert-mode)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
211 (if (and (memq this-command '(dabbrev-expand hippie-expand)) |
| 19078 | 212 (markerp viper-insert-point) |
| 213 (marker-position viper-insert-point)) | |
| 214 (setq viper-pre-command-point (marker-position viper-insert-point)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
215 |
| 19078 | 216 (defsubst viper-R-state-post-command-sentinel () |
| 18129 | 217 ;; Restoring cursor color is needed despite |
| 19078 | 218 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer |
| 219 ;; in another frame, the pre-command hook won't change cursor color to | |
| 220 ;; default in that other frame. So, if the second frame cursor was red and | |
| 221 ;; we set the point outside the replacement region, then the cursor color | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
222 ;; will remain red. Restoring the default, below, prevents this. |
| 19078 | 223 (if (and (<= (viper-replace-start) (point)) |
| 224 (<= (point) (viper-replace-end))) | |
| 225 (viper-change-cursor-color viper-replace-overlay-cursor-color) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
226 (viper-restore-cursor-color 'after-replace-mode) |
| 18129 | 227 )) |
| 228 | |
| 229 ;; to speed up, don't change cursor color before self-insert | |
| 230 ;; and common move commands | |
| 19078 | 231 (defsubst viper-replace-state-pre-command-sentinel () |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
232 (or (viper-preserve-cursor-color) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
233 (viper-restore-cursor-color 'after-replace-mode))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
234 |
|
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
235 |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
236 ;; Make sure we don't delete more than needed. |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
237 ;; This is executed at viper-last-posn-in-replace-region |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
238 (defsubst viper-trim-replace-chars-to-delete-if-necessary () |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
239 (setq viper-replace-chars-to-delete |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
240 (max 0 |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
241 (min viper-replace-chars-to-delete |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
242 ;; Don't delete more than to the end of repl overlay |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
243 (viper-chars-in-region |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
244 (viper-replace-end) viper-last-posn-in-replace-region) |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
245 ;; point is viper-last-posn-in-replace-region now |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
246 ;; So, this limits deletion to the end of line |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
247 (viper-chars-in-region (point) (viper-line-pos 'end)) |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
248 )))) |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
249 |
|
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
250 |
| 19078 | 251 (defun viper-replace-state-post-command-sentinel () |
| 18129 | 252 ;; Restoring cursor color is needed despite |
| 19078 | 253 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer |
| 18129 | 254 ;; in another frame, the pre-command hook won't change cursor color to |
| 255 ;; default in that other frame. So, if the second frame cursor was red and | |
| 256 ;; we set the point outside the replacement region, then the cursor color | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
257 ;; will remain red. Restoring the default, below, fixes this problem. |
| 18129 | 258 ;; |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
259 ;; We optimize for some commands, like self-insert-command, |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
260 ;; viper-delete-backward-char, etc., since they either don't change |
| 18129 | 261 ;; cursor color or, if they terminate replace mode, the color will be changed |
| 19078 | 262 ;; in viper-finish-change |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
263 (or (viper-preserve-cursor-color) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
264 (viper-restore-cursor-color 'after-replace-mode)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
265 (cond |
| 19078 | 266 ((eq viper-current-state 'replace-state) |
| 18129 | 267 ;; delete characters to compensate for inserted chars. |
| 19078 | 268 (let ((replace-boundary (viper-replace-end))) |
| 18129 | 269 (save-excursion |
| 19078 | 270 (goto-char viper-last-posn-in-replace-region) |
| 19462 | 271 (viper-trim-replace-chars-to-delete-if-necessary) |
| 19078 | 272 (delete-char viper-replace-chars-to-delete) |
| 19462 | 273 (setq viper-replace-chars-to-delete 0) |
| 18129 | 274 ;; terminate replace mode if reached replace limit |
| 19462 | 275 (if (= viper-last-posn-in-replace-region (viper-replace-end)) |
| 276 (viper-finish-change))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
277 |
| 19462 | 278 (if (viper-pos-within-region |
| 279 (point) (viper-replace-start) replace-boundary) | |
| 18129 | 280 (progn |
| 19078 | 281 ;; the state may have changed in viper-finish-change above |
| 282 (if (eq viper-current-state 'replace-state) | |
| 283 (viper-change-cursor-color viper-replace-overlay-cursor-color)) | |
| 284 (setq viper-last-posn-in-replace-region (point-marker)))) | |
| 18129 | 285 )) |
| 19462 | 286 ;; terminate replace mode if changed Viper states. |
| 287 (t (viper-finish-change)))) | |
| 18129 | 288 |
| 289 | |
| 290 ;; changing mode | |
| 291 | |
| 292 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state. | |
| 19078 | 293 (defun viper-change-state (new-state) |
| 294 ;; Keep viper-post/pre-command-hooks fresh. | |
| 295 ;; We remove then add viper-post/pre-command-sentinel since it is very | |
| 296 ;; desirable that viper-pre-command-sentinel is the last hook and | |
| 297 ;; viper-post-command-sentinel is the first hook. | |
| 21940 | 298 |
| 299 (make-local-hook 'viper-after-change-functions) | |
| 300 (make-local-hook 'viper-before-change-functions) | |
| 301 (make-local-hook 'viper-post-command-hooks) | |
| 302 (make-local-hook 'viper-pre-command-hooks) | |
| 303 | |
| 19078 | 304 (remove-hook 'post-command-hook 'viper-post-command-sentinel) |
| 305 (add-hook 'post-command-hook 'viper-post-command-sentinel) | |
| 306 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel) | |
| 307 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t) | |
| 18129 | 308 ;; These hooks will be added back if switching to insert/replace mode |
| 21940 | 309 (remove-hook 'viper-post-command-hooks |
| 310 'viper-insert-state-post-command-sentinel 'local) | |
| 311 (remove-hook 'viper-pre-command-hooks | |
| 312 'viper-insert-state-pre-command-sentinel 'local) | |
| 19078 | 313 (setq viper-intermediate-command nil) |
| 18129 | 314 (cond ((eq new-state 'vi-state) |
| 19078 | 315 (cond ((member viper-current-state '(insert-state replace-state)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
316 |
| 19078 | 317 ;; move viper-last-posn-while-in-insert-state |
| 18129 | 318 ;; This is a normal hook that is executed in insert/replace |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
319 ;; states after each command. In Vi/Emacs state, it does |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
320 ;; nothing. We need to execute it here to make sure that |
| 18129 | 321 ;; the last posn was recorded when we hit ESC. |
| 322 ;; It may be left unrecorded if the last thing done in | |
| 323 ;; insert/repl state was dabbrev-expansion or abbrev | |
| 324 ;; expansion caused by hitting ESC | |
| 19078 | 325 (viper-insert-state-post-command-sentinel) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
326 |
| 18129 | 327 (condition-case conds |
| 328 (progn | |
| 19078 | 329 (viper-save-last-insertion |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
330 viper-insert-point |
| 19078 | 331 viper-last-posn-while-in-insert-state) |
| 332 (if viper-began-as-replace | |
| 333 (setq viper-began-as-replace nil) | |
| 18129 | 334 ;; repeat insert commands if numerical arg > 1 |
| 335 (save-excursion | |
| 19078 | 336 (viper-repeat-insert-command)))) |
| 18129 | 337 (error |
| 19078 | 338 (viper-message-conditions conds))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
339 |
| 19078 | 340 (if (> (length viper-last-insertion) 0) |
| 341 (viper-push-onto-ring viper-last-insertion | |
| 342 'viper-insertion-ring)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
343 |
|
26702
8be2b52389a5
* viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26588
diff
changeset
|
344 (if viper-ESC-moves-cursor-back |
| 18129 | 345 (or (bolp) (backward-char 1)))) |
| 346 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
347 |
| 18129 | 348 ;; insert or replace |
| 349 ((memq new-state '(insert-state replace-state)) | |
| 19078 | 350 (if (memq viper-current-state '(emacs-state vi-state)) |
| 351 (viper-move-marker-locally 'viper-insert-point (point))) | |
| 352 (viper-move-marker-locally | |
| 353 'viper-last-posn-while-in-insert-state (point)) | |
| 21940 | 354 (add-hook 'viper-post-command-hooks |
| 355 'viper-insert-state-post-command-sentinel t 'local) | |
| 356 (add-hook 'viper-pre-command-hooks | |
| 357 'viper-insert-state-pre-command-sentinel t 'local)) | |
| 18129 | 358 ) ; outermost cond |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
359 |
| 18129 | 360 ;; Nothing needs to be done to switch to emacs mode! Just set some |
| 19078 | 361 ;; variables, which is already done in viper-change-state-to-emacs! |
| 362 | |
| 19462 | 363 ;; ISO accents |
| 364 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to | |
| 365 ;; use the keys `,',^ , as they will do accents instead of Vi actions. | |
| 366 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off | |
| 367 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on | |
| 368 (t (viper-set-iso-accents-mode nil))) | |
| 369 ;; Always turn off quail mode in vi state | |
| 370 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off | |
| 371 (viper-special-input-method (viper-set-input-method t)) ;intl input on | |
| 372 (t (viper-set-input-method nil))) | |
| 373 | |
| 19078 | 374 (setq viper-current-state new-state) |
| 19462 | 375 |
| 376 (viper-update-syntax-classes) | |
| 19078 | 377 (viper-normalize-minor-mode-map-alist) |
| 378 (viper-adjust-keys-for new-state) | |
| 379 (viper-set-mode-vars-for new-state) | |
| 380 (viper-refresh-mode-line) | |
| 18129 | 381 ) |
| 382 | |
| 383 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
384 |
| 19078 | 385 (defun viper-adjust-keys-for (state) |
| 18129 | 386 "Make necessary adjustments to keymaps before entering STATE." |
| 387 (cond ((memq state '(insert-state replace-state)) | |
| 19078 | 388 (if viper-auto-indent |
| 18129 | 389 (progn |
| 19078 | 390 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent) |
| 391 (if viper-want-emacs-keys-in-insert | |
| 18129 | 392 ;; expert |
| 19078 | 393 (define-key viper-insert-basic-map "\C-j" nil) |
| 18129 | 394 ;; novice |
| 19078 | 395 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent))) |
| 396 (define-key viper-insert-basic-map "\C-m" nil) | |
| 397 (define-key viper-insert-basic-map "\C-j" nil)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
398 |
| 19078 | 399 (setq viper-insert-diehard-minor-mode |
| 400 (not viper-want-emacs-keys-in-insert)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
401 |
| 19078 | 402 (if viper-want-ctl-h-help |
| 19891 | 403 (progn |
| 404 (define-key viper-insert-basic-map "\C-h" 'help-command) | |
| 405 (define-key viper-replace-map "\C-h" 'help-command)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
406 (define-key viper-insert-basic-map |
| 19891 | 407 "\C-h" 'viper-del-backward-char-in-insert) |
| 19462 | 408 (define-key viper-replace-map |
| 19891 | 409 "\C-h" 'viper-del-backward-char-in-replace)) |
| 410 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
| 411 (define-key viper-insert-basic-map | |
| 412 [backspace] 'viper-del-backward-char-in-insert) | |
| 413 (define-key viper-replace-map | |
| 414 [backspace] 'viper-del-backward-char-in-replace) | |
| 415 ) ; end insert/replace case | |
| 18129 | 416 (t ; Vi state |
| 19078 | 417 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi)) |
| 418 (if viper-want-ctl-h-help | |
| 19891 | 419 (define-key viper-vi-basic-map "\C-h" 'help-command) |
| 420 (define-key viper-vi-basic-map "\C-h" 'viper-backward-char)) | |
| 421 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't. | |
| 422 (define-key viper-vi-basic-map [backspace] 'viper-backward-char)) | |
| 18129 | 423 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
424 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
425 |
| 18129 | 426 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first. |
| 427 ;; This ensures that Viper bindings are in effect, regardless of which minor | |
| 428 ;; modes were turned on by the user or by other packages. | |
| 19078 | 429 (defun viper-normalize-minor-mode-map-alist () |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
430 (setq minor-mode-map-alist |
| 19078 | 431 (viper-append-filter-alist |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
432 (list (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
433 (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map) |
| 19078 | 434 (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map) |
| 435 (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map) | |
| 436 (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map) | |
| 437 (cons 'viper-vi-state-modifier-minor-mode | |
| 18129 | 438 (if (keymapp |
| 19203 | 439 (cdr (assoc major-mode |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
440 viper-vi-state-modifier-alist))) |
| 19078 | 441 (cdr (assoc major-mode viper-vi-state-modifier-alist)) |
| 442 viper-empty-keymap)) | |
| 443 (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map) | |
| 444 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map) | |
| 19203 | 445 (cons 'viper-insert-intercept-minor-mode |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
446 viper-insert-intercept-map) |
| 19078 | 447 (cons 'viper-replace-minor-mode viper-replace-map) |
| 448 ;; viper-insert-minibuffer-minor-mode must come after | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
449 ;; viper-replace-minor-mode |
| 19078 | 450 (cons 'viper-insert-minibuffer-minor-mode |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
451 viper-minibuffer-map) |
| 19078 | 452 (cons 'viper-insert-local-user-minor-mode |
| 453 viper-insert-local-user-map) | |
| 454 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map) | |
| 455 (cons 'viper-insert-global-user-minor-mode | |
| 456 viper-insert-global-user-map) | |
| 457 (cons 'viper-insert-state-modifier-minor-mode | |
| 18129 | 458 (if (keymapp |
| 19203 | 459 (cdr (assoc major-mode |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
460 viper-insert-state-modifier-alist))) |
| 19203 | 461 (cdr (assoc major-mode |
| 462 viper-insert-state-modifier-alist)) | |
| 19078 | 463 viper-empty-keymap)) |
| 464 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map) | |
| 465 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map) | |
| 466 (cons 'viper-emacs-intercept-minor-mode | |
| 467 viper-emacs-intercept-map) | |
| 468 (cons 'viper-emacs-local-user-minor-mode | |
| 469 viper-emacs-local-user-map) | |
| 470 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map) | |
| 471 (cons 'viper-emacs-global-user-minor-mode | |
| 472 viper-emacs-global-user-map) | |
| 473 (cons 'viper-emacs-state-modifier-minor-mode | |
| 18129 | 474 (if (keymapp |
| 475 (cdr | |
| 19078 | 476 (assoc major-mode viper-emacs-state-modifier-alist))) |
| 18129 | 477 (cdr |
| 19078 | 478 (assoc major-mode viper-emacs-state-modifier-alist)) |
| 479 viper-empty-keymap)) | |
| 18129 | 480 ) |
| 481 minor-mode-map-alist))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
482 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
483 |
| 18129 | 484 |
| 485 ;; Viper mode-changing commands and utilities | |
| 486 | |
| 487 ;; Modifies mode-line-buffer-identification. | |
| 19078 | 488 (defun viper-refresh-mode-line () |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
489 (setq viper-mode-string |
| 19078 | 490 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id) |
| 491 ((eq viper-current-state 'vi-state) viper-vi-state-id) | |
| 492 ((eq viper-current-state 'replace-state) viper-replace-state-id) | |
| 493 ((eq viper-current-state 'insert-state) viper-insert-state-id))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
494 |
| 18129 | 495 ;; Sets Viper mode string in global-mode-string |
| 496 (force-mode-line-update)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
497 |
| 18129 | 498 |
| 499 ;; Switch from Insert state to Vi state. | |
| 19078 | 500 (defun viper-exit-insert-state () |
| 18129 | 501 (interactive) |
| 19078 | 502 (viper-change-state-to-vi)) |
| 503 | |
| 504 (defun viper-set-mode-vars-for (state) | |
| 18129 | 505 "Sets Viper minor mode variables to put Viper's state STATE in effect." |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
506 |
| 18129 | 507 ;; Emacs state |
| 19078 | 508 (setq viper-vi-minibuffer-minor-mode nil |
| 509 viper-insert-minibuffer-minor-mode nil | |
| 510 viper-vi-intercept-minor-mode nil | |
| 511 viper-insert-intercept-minor-mode nil | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
512 |
| 19078 | 513 viper-vi-local-user-minor-mode nil |
| 514 viper-vi-kbd-minor-mode nil | |
| 515 viper-vi-global-user-minor-mode nil | |
| 516 viper-vi-state-modifier-minor-mode nil | |
| 517 viper-vi-diehard-minor-mode nil | |
| 518 viper-vi-basic-minor-mode nil | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
519 |
| 19078 | 520 viper-replace-minor-mode nil |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
521 |
| 19078 | 522 viper-insert-local-user-minor-mode nil |
| 523 viper-insert-kbd-minor-mode nil | |
| 524 viper-insert-global-user-minor-mode nil | |
| 525 viper-insert-state-modifier-minor-mode nil | |
| 526 viper-insert-diehard-minor-mode nil | |
| 527 viper-insert-basic-minor-mode nil | |
| 528 viper-emacs-intercept-minor-mode t | |
| 529 viper-emacs-local-user-minor-mode t | |
| 530 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
| 531 viper-emacs-global-user-minor-mode t | |
| 532 viper-emacs-state-modifier-minor-mode t | |
| 18129 | 533 ) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
534 |
| 18129 | 535 ;; Vi state |
| 536 (if (eq state 'vi-state) ; adjust for vi-state | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
537 (setq |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
538 viper-vi-intercept-minor-mode t |
| 19078 | 539 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer) |
| 540 viper-vi-local-user-minor-mode t | |
| 541 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
| 542 viper-vi-global-user-minor-mode t | |
| 543 viper-vi-state-modifier-minor-mode t | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
544 ;; don't let the diehard keymap block command completion |
| 18129 | 545 ;; and other things in the minibuffer |
| 19078 | 546 viper-vi-diehard-minor-mode (not |
| 547 (or viper-want-emacs-keys-in-vi | |
| 548 (viper-is-in-minibuffer))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
549 viper-vi-basic-minor-mode t |
| 19078 | 550 viper-emacs-intercept-minor-mode nil |
| 551 viper-emacs-local-user-minor-mode nil | |
| 552 viper-emacs-kbd-minor-mode nil | |
| 553 viper-emacs-global-user-minor-mode nil | |
| 554 viper-emacs-state-modifier-minor-mode nil | |
| 18129 | 555 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
556 |
| 18129 | 557 ;; Insert and Replace states |
| 558 (if (member state '(insert-state replace-state)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
559 (setq |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
560 viper-insert-intercept-minor-mode t |
| 19078 | 561 viper-replace-minor-mode (eq state 'replace-state) |
| 562 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer) | |
| 563 viper-insert-local-user-minor-mode t | |
| 564 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
| 565 viper-insert-global-user-minor-mode t | |
| 566 viper-insert-state-modifier-minor-mode t | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
567 ;; don't let the diehard keymap block command completion |
| 18129 | 568 ;; and other things in the minibuffer |
| 19078 | 569 viper-insert-diehard-minor-mode (not |
| 570 (or | |
| 571 viper-want-emacs-keys-in-insert | |
| 572 (viper-is-in-minibuffer))) | |
| 573 viper-insert-basic-minor-mode t | |
| 574 viper-emacs-intercept-minor-mode nil | |
| 575 viper-emacs-local-user-minor-mode nil | |
| 576 viper-emacs-kbd-minor-mode nil | |
| 577 viper-emacs-global-user-minor-mode nil | |
| 578 viper-emacs-state-modifier-minor-mode nil | |
| 18129 | 579 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
580 |
| 18129 | 581 ;; minibuffer faces |
| 19078 | 582 (if (viper-has-face-support-p) |
| 583 (setq viper-minibuffer-current-face | |
| 584 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face) | |
| 585 ((eq state 'vi-state) viper-minibuffer-vi-face) | |
| 18129 | 586 ((memq state '(insert-state replace-state)) |
| 19078 | 587 viper-minibuffer-insert-face)))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
588 |
| 19078 | 589 (if (viper-is-in-minibuffer) |
| 590 (viper-set-minibuffer-overlay)) | |
| 18129 | 591 ) |
| 592 | |
| 593 ;; This also takes care of the annoying incomplete lines in files. | |
| 594 ;; Also, this fixes `undo' to work vi-style for complex commands. | |
| 19078 | 595 (defun viper-change-state-to-vi () |
| 18129 | 596 "Change Viper state to Vi." |
| 597 (interactive) | |
| 19078 | 598 (if (and viper-first-time (not (viper-is-in-minibuffer))) |
| 18129 | 599 (viper-mode) |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
600 (if overwrite-mode (overwrite-mode -1)) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
601 (or (viper-overlay-p viper-replace-overlay) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
602 (viper-set-replace-overlay (point-min) (point-min))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
603 (viper-hide-replace-overlay) |
| 18129 | 604 (if abbrev-mode (expand-abbrev)) |
| 605 (if (and auto-fill-function (> (current-column) fill-column)) | |
| 606 (funcall auto-fill-function)) | |
| 607 ;; don't leave whitespace lines around | |
| 608 (if (and (memq last-command | |
| 19078 | 609 '(viper-autoindent |
| 610 viper-open-line viper-Open-line | |
| 611 viper-replace-state-exit-cmd)) | |
| 612 (viper-over-whitespace-line)) | |
| 18129 | 613 (indent-to-left-margin)) |
| 19078 | 614 (viper-add-newline-at-eob-if-necessary) |
| 19462 | 615 (viper-adjust-undo) |
| 19078 | 616 (viper-change-state 'vi-state) |
| 18129 | 617 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
618 (viper-restore-cursor-color 'after-insert-mode) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
619 |
| 19462 | 620 ;; Protect against user errors in hooks |
| 18129 | 621 (condition-case conds |
| 19078 | 622 (run-hooks 'viper-vi-state-hook) |
| 18129 | 623 (error |
| 19078 | 624 (viper-message-conditions conds))))) |
| 625 | |
| 626 (defun viper-change-state-to-insert () | |
| 18129 | 627 "Change Viper state to Insert." |
| 628 (interactive) | |
| 19078 | 629 (viper-change-state 'insert-state) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
630 |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
631 (or (viper-overlay-p viper-replace-overlay) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
632 (viper-set-replace-overlay (point-min) (point-min))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
633 (viper-hide-replace-overlay) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
634 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
635 (let ((has-saved-cursor-color-in-insert-mode |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
636 (stringp (viper-get-saved-cursor-color-in-insert-mode)))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
637 (or has-saved-cursor-color-in-insert-mode |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
638 (string= (viper-get-cursor-color) viper-insert-state-cursor-color) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
639 (viper-save-cursor-color 'before-insert-mode)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
640 (viper-change-cursor-color viper-insert-state-cursor-color)) |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
641 |
| 19462 | 642 ;; Protect against user errors in hooks |
| 18129 | 643 (condition-case conds |
| 19078 | 644 (run-hooks 'viper-insert-state-hook) |
| 18129 | 645 (error |
| 19078 | 646 (viper-message-conditions conds)))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
647 |
| 19078 | 648 (defsubst viper-downgrade-to-insert () |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
649 ;; Protect against user errors in hooks |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
650 (condition-case conds |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
651 (run-hooks 'viper-insert-state-hook) |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
652 (error |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
653 (viper-message-conditions conds))) |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
654 (setq viper-current-state 'insert-state |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
655 viper-replace-minor-mode nil)) |
| 18129 | 656 |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
657 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
658 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
659 ;; Change to replace state. When the end of replacement region is reached, |
| 18129 | 660 ;; replace state changes to insert state. |
| 19078 | 661 (defun viper-change-state-to-replace (&optional non-R-cmd) |
| 662 (viper-change-state 'replace-state) | |
| 18129 | 663 ;; Run insert-state-hook |
| 664 (condition-case conds | |
| 19078 | 665 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook) |
| 18129 | 666 (error |
| 19078 | 667 (viper-message-conditions conds))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
668 |
| 18129 | 669 (if non-R-cmd |
| 19078 | 670 (viper-start-replace) |
| 18129 | 671 ;; 'R' is implemented using Emacs's overwrite-mode |
| 19078 | 672 (viper-start-R-mode)) |
| 18129 | 673 ) |
| 674 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
675 |
| 19078 | 676 (defun viper-change-state-to-emacs () |
| 18129 | 677 "Change Viper state to Emacs." |
| 678 (interactive) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
679 (or (viper-overlay-p viper-replace-overlay) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
680 (viper-set-replace-overlay (point-min) (point-min))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
681 (viper-hide-replace-overlay) |
| 19078 | 682 (viper-change-state 'emacs-state) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
683 |
| 19462 | 684 ;; Protect agains user errors in hooks |
| 18129 | 685 (condition-case conds |
| 19078 | 686 (run-hooks 'viper-emacs-state-hook) |
| 18129 | 687 (error |
| 19078 | 688 (viper-message-conditions conds)))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
689 |
| 18129 | 690 ;; escape to emacs mode termporarily |
| 19078 | 691 (defun viper-escape-to-emacs (arg &optional events) |
| 18129 | 692 "Escape to Emacs state from Vi state for one Emacs command. |
| 693 ARG is used as the prefix value for the executed command. If | |
| 694 EVENTS is a list of events, which become the beginning of the command." | |
| 695 (interactive "P") | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
696 (if (viper= last-command-char ?\\) |
| 18129 | 697 (message "Switched to EMACS state for the next command...")) |
| 19078 | 698 (viper-escape-to-state arg events 'emacs-state)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
699 |
| 18129 | 700 ;; escape to Vi mode termporarily |
| 19078 | 701 (defun viper-escape-to-vi (arg) |
| 18129 | 702 "Escape from Emacs state to Vi state for one Vi 1-character command. |
| 703 If the Vi command that the user types has a prefix argument, e.g., `d2w', then | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
704 Vi's prefix argument will be used. Otherwise, the prefix argument passed to |
| 19078 | 705 `viper-escape-to-vi' is used." |
| 18129 | 706 (interactive "P") |
| 707 (message "Switched to VI state for the next command...") | |
| 19078 | 708 (viper-escape-to-state arg nil 'vi-state)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
709 |
| 18129 | 710 ;; Escape to STATE mode for one Emacs command. |
| 19078 | 711 (defun viper-escape-to-state (arg events state) |
| 18129 | 712 ;;(let (com key prefix-arg) |
| 713 (let (com key) | |
| 714 ;; this temporarily turns off Viper's minor mode keymaps | |
| 19078 | 715 (viper-set-mode-vars-for state) |
| 716 (viper-normalize-minor-mode-map-alist) | |
| 717 (if events (viper-set-unread-command-events events)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
718 |
| 18129 | 719 ;; protect against keyboard quit and other errors |
| 720 (condition-case nil | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
721 (let (viper-vi-kbd-minor-mode |
| 19078 | 722 viper-insert-kbd-minor-mode |
| 723 viper-emacs-kbd-minor-mode) | |
| 18129 | 724 (unwind-protect |
| 725 (progn | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
726 (setq com (key-binding (setq key |
| 19078 | 727 (if viper-xemacs-p |
| 18129 | 728 (read-key-sequence nil) |
| 729 (read-key-sequence nil t))))) | |
| 730 ;; In case of binding indirection--chase definitions. | |
| 731 ;; Have to do it here because we execute this command under | |
| 732 ;; different keymaps, so command-execute may not do the | |
| 733 ;; right thing there | |
| 734 (while (vectorp com) (setq com (key-binding com)))) | |
| 735 nil) | |
| 736 ;; Execute command com in the original Viper state, not in state | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
737 ;; `state'. Otherwise, if we switch buffers while executing the |
| 18129 | 738 ;; escaped to command, Viper's mode vars will remain those of |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
739 ;; `state'. When we return to the orig buffer, the bindings will be |
| 18129 | 740 ;; screwed up. |
| 19078 | 741 (viper-set-mode-vars-for viper-current-state) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
742 |
| 18129 | 743 ;; this-command, last-command-char, last-command-event |
| 744 (setq this-command com) | |
| 19078 | 745 (if viper-xemacs-p ; XEmacs represents key sequences as vectors |
| 746 (setq last-command-event | |
| 747 (viper-copy-event (viper-seq-last-elt key)) | |
| 18129 | 748 last-command-char (event-to-character last-command-event)) |
| 749 ;; Emacs represents them as sequences (str or vec) | |
| 19078 | 750 (setq last-command-event |
| 751 (viper-copy-event (viper-seq-last-elt key)) | |
| 18129 | 752 last-command-char last-command-event)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
753 |
| 18129 | 754 (if (commandp com) |
| 755 (progn | |
| 756 (setq prefix-arg (or prefix-arg arg)) | |
| 757 (command-execute com))) | |
| 758 ) | |
| 759 (quit (ding)) | |
| 760 (error (beep 1)))) | |
| 761 ;; set state in the new buffer | |
| 19078 | 762 (viper-set-mode-vars-for viper-current-state)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
763 |
| 19078 | 764 (defun viper-exec-form-in-vi (form) |
| 18129 | 765 "Execute FORM in Vi state, regardless of the Ccurrent Vi state." |
| 766 (let ((buff (current-buffer)) | |
| 767 result) | |
| 19078 | 768 (viper-set-mode-vars-for 'vi-state) |
| 18129 | 769 |
| 770 (condition-case nil | |
| 19078 | 771 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros |
| 772 (setq result (eval form)) | |
| 773 ) | |
| 18129 | 774 (error |
| 775 (signal 'quit nil))) | |
| 776 | |
| 777 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
| 778 (save-excursion | |
| 779 (set-buffer buff) | |
| 19078 | 780 (viper-set-mode-vars-for viper-current-state))) |
| 781 (viper-set-mode-vars-for viper-current-state) | |
| 18129 | 782 result)) |
| 783 | |
| 19078 | 784 (defun viper-exec-form-in-emacs (form) |
| 18129 | 785 "Execute FORM in Emacs, temporarily disabling Viper's minor modes. |
| 19078 | 786 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes." |
| 18129 | 787 (let ((buff (current-buffer)) |
| 788 result) | |
| 19078 | 789 (viper-set-mode-vars-for 'emacs-state) |
| 18129 | 790 (setq result (eval form)) |
| 791 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
| 792 (save-excursion | |
| 793 (set-buffer buff) | |
| 19078 | 794 (viper-set-mode-vars-for viper-current-state))) |
| 795 (viper-set-mode-vars-for viper-current-state) | |
| 18129 | 796 result)) |
| 797 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
798 |
| 18129 | 799 ;; This is needed because minor modes sometimes override essential Viper |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
800 ;; bindings. By letting Viper know which files these modes are in, it will |
| 18129 | 801 ;; arrange to reorganize minor-mode-map-alist so that things will work right. |
| 19078 | 802 (defun viper-harness-minor-mode (load-file) |
| 18129 | 803 "Familiarize Viper with a minor mode defined in LOAD_FILE. |
| 804 Minor modes that have their own keymaps may overshadow Viper keymaps. | |
| 805 This function is designed to make Viper aware of the packages that define | |
| 806 such minor modes. | |
| 807 Usage: | |
| 19078 | 808 (viper-harness-minor-mode load-file) |
| 18129 | 809 |
| 810 LOAD-FILE is a name of the file where the specific minor mode is defined. | |
| 811 Suffixes such as .el or .elc should be stripped." | |
| 812 | |
| 813 (interactive "sEnter name of the load file: ") | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
814 |
| 19078 | 815 (eval-after-load load-file '(viper-normalize-minor-mode-map-alist)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
816 |
| 18129 | 817 ;; Change the default for minor-mode-map-alist each time a harnessed minor |
| 818 ;; mode adds its own keymap to the a-list. | |
| 19078 | 819 (eval-after-load |
| 18129 | 820 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist)) |
| 821 ) | |
| 822 | |
| 823 | |
| 19078 | 824 (defun viper-ESC (arg) |
| 18129 | 825 "Emulate ESC key in Emacs. |
| 19078 | 826 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. |
| 827 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. | |
| 18129 | 828 Other ESC sequences are emulated via the current Emacs's major mode |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
829 keymap. This is more convenient on TTYs, since this won't block |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
830 function keys such as up,down, etc. ESC will also will also work as |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
831 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions |
| 18129 | 832 as a Meta key and any number of multiple escapes is allowed." |
| 833 (interactive "P") | |
| 834 (let (char) | |
| 19078 | 835 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) |
| 836 (setq char (viper-read-char-exclusive)) | |
| 837 (viper-escape-to-emacs arg (list ?\e char) )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
838 ((and (eq viper-no-multiple-ESC 'twice) |
| 19078 | 839 (eq viper-current-state 'vi-state)) |
| 840 (setq char (viper-read-char-exclusive)) | |
| 841 (if (= char (string-to-char viper-ESC-key)) | |
| 18129 | 842 (ding) |
| 19078 | 843 (viper-escape-to-emacs arg (list ?\e char) ))) |
| 18129 | 844 (t (ding))) |
| 845 )) | |
| 846 | |
| 19078 | 847 (defun viper-alternate-Meta-key (arg) |
| 18129 | 848 "Simulate Emacs Meta key." |
| 849 (interactive "P") | |
| 850 (sit-for 1) (message "ESC-") | |
| 19078 | 851 (viper-escape-to-emacs arg '(?\e))) |
| 852 | |
| 853 (defun viper-toggle-key-action () | |
| 854 "Action bound to `viper-toggle-key'." | |
| 18129 | 855 (interactive) |
| 19078 | 856 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z")) |
| 857 (if (viper-window-display-p) | |
| 858 (viper-iconify) | |
| 18129 | 859 (suspend-emacs)) |
| 19078 | 860 (viper-change-state-to-emacs))) |
| 18129 | 861 |
| 862 | |
| 863 ;; Intercept ESC sequences on dumb terminals. | |
| 864 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es> | |
| 865 | |
| 866 ;; Check if last key was ESC and if so try to reread it as a function key. | |
| 867 ;; But only if there are characters to read during a very short time. | |
| 868 ;; Returns the last event, if any. | |
| 19078 | 869 (defun viper-envelop-ESC-key () |
| 18129 | 870 (let ((event last-input-event) |
| 871 (keyseq [nil]) | |
| 872 inhibit-quit) | |
| 19078 | 873 (if (viper-ESC-event-p event) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
874 (progn |
| 19078 | 875 (if (viper-fast-keysequence-p) |
| 18129 | 876 (progn |
| 877 (let (minor-mode-map-alist) | |
| 19078 | 878 (viper-set-unread-command-events event) |
| 18129 | 879 (setq keyseq |
| 880 (funcall | |
| 881 (ad-get-orig-definition 'read-key-sequence) nil)) | |
| 882 ) ; let | |
| 883 ;; If keyseq translates into something that still has ESC | |
| 884 ;; at the beginning, separate ESC from the rest of the seq. | |
| 885 ;; In XEmacs we check for events that are keypress meta-key | |
| 886 ;; and convert them into [escape key] | |
| 887 ;; | |
| 888 ;; This is needed for the following reason: | |
| 889 ;; If ESC is the first symbol, we interpret it as if the | |
| 890 ;; user typed ESC and then quickly some other symbols. | |
| 891 ;; If ESC is not the first one, then the key sequence | |
| 892 ;; entered was apparently translated into a function key or | |
| 893 ;; something (e.g., one may have | |
| 894 ;; (define-key function-key-map "\e[192z" [f11]) | |
| 895 ;; which would translate the escape-sequence generated by | |
| 896 ;; f11 in an xterm window into the symbolic key f11. | |
| 897 ;; | |
| 898 ;; If `first-key' is not an ESC event, we make it into the | |
| 899 ;; last-command-event in order to pretend that this key was | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
900 ;; pressed. This is needed to allow arrow keys to be bound to |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
901 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think |
| 19078 | 902 ;; that the last event was ESC and so it'll execute whatever is |
| 18129 | 903 ;; bound to ESC. (Viper macros can't be bound to |
| 904 ;; ESC-sequences). | |
| 905 (let* ((first-key (elt keyseq 0)) | |
| 906 (key-mod (event-modifiers first-key))) | |
|
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
907 (cond ((and (viper-ESC-event-p first-key) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
908 (not viper-translate-all-ESC-keysequences)) |
| 18129 | 909 ;; put keys following ESC on the unread list |
| 910 ;; and return ESC as the key-sequence | |
| 19078 | 911 (viper-set-unread-command-events (subseq keyseq 1)) |
| 18129 | 912 (setq last-input-event event |
| 19078 | 913 keyseq (if viper-emacs-p |
| 18129 | 914 "\e" |
| 915 (vector (character-to-event ?\e))))) | |
| 19078 | 916 ((and viper-xemacs-p |
| 18129 | 917 (key-press-event-p first-key) |
| 918 (equal '(meta) key-mod)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
919 (viper-set-unread-command-events |
| 18129 | 920 (vconcat (vector |
| 921 (character-to-event (event-key first-key))) | |
| 922 (subseq keyseq 1))) | |
| 923 (setq last-input-event event | |
| 924 keyseq (vector (character-to-event ?\e)))) | |
| 925 ((eventp first-key) | |
| 19078 | 926 (setq last-command-event |
| 927 (viper-copy-event first-key))) | |
| 18129 | 928 )) |
| 929 ) ; end progn | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
930 |
| 18129 | 931 ;; this is escape event with nothing after it |
| 932 ;; put in unread-command-event and then re-read | |
| 19078 | 933 (viper-set-unread-command-events event) |
| 18129 | 934 (setq keyseq |
| 935 (funcall (ad-get-orig-definition 'read-key-sequence) nil)) | |
| 936 )) | |
| 937 ;; not an escape event | |
| 938 (setq keyseq (vector event))) | |
| 939 keyseq)) | |
| 940 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
941 |
| 18129 | 942 |
| 943 ;; Listen to ESC key. | |
| 944 ;; If a sequence of keys starting with ESC is issued with very short delays, | |
| 945 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key. | |
| 19078 | 946 (defun viper-intercept-ESC-key () |
| 18129 | 947 "Function that implements ESC key in Viper emulation of Vi." |
| 948 (interactive) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
949 (let ((cmd (or (key-binding (viper-envelop-ESC-key)) |
| 18129 | 950 '(lambda () (interactive) (error ""))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
951 |
| 18129 | 952 ;; call the actual function to execute ESC (if no other symbols followed) |
| 953 ;; or the key bound to the ESC sequence (if the sequence was issued | |
| 954 ;; with very short delay between characters. | |
| 19078 | 955 (if (eq cmd 'viper-intercept-ESC-key) |
| 18129 | 956 (setq cmd |
| 19078 | 957 (cond ((eq viper-current-state 'vi-state) |
| 958 'viper-ESC) | |
| 959 ((eq viper-current-state 'insert-state) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
960 'viper-exit-insert-state) |
| 19078 | 961 ((eq viper-current-state 'replace-state) |
| 962 'viper-replace-state-exit-cmd) | |
| 963 (t 'viper-change-state-to-vi) | |
| 18129 | 964 ))) |
| 965 (call-interactively cmd))) | |
| 966 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
967 |
| 18129 | 968 |
| 969 | |
| 970 ;; prefix argument for Vi mode | |
| 971 | |
| 972 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM | |
| 973 ;; represents the numeric value of the prefix argument and COM represents | |
| 974 ;; command prefix such as "c", "d", "m" and "y". | |
| 975 | |
| 976 ;; Get value part of prefix-argument ARG. | |
| 19078 | 977 (defsubst viper-p-val (arg) |
| 18129 | 978 (cond ((null arg) 1) |
| 979 ((consp arg) | |
| 980 (if (or (null (car arg)) (equal (car arg) '(nil))) | |
| 981 1 (car arg))) | |
| 982 (t arg))) | |
| 983 | |
| 984 ;; Get raw value part of prefix-argument ARG. | |
| 19078 | 985 (defsubst viper-P-val (arg) |
| 18129 | 986 (cond ((consp arg) (car arg)) |
| 987 (t arg))) | |
| 988 | |
| 989 ;; Get com part of prefix-argument ARG. | |
| 19078 | 990 (defsubst viper-getcom (arg) |
| 18129 | 991 (cond ((null arg) nil) |
| 992 ((consp arg) (cdr arg)) | |
| 993 (t nil))) | |
| 994 | |
| 995 ;; Get com part of prefix-argument ARG and modify it. | |
| 19078 | 996 (defun viper-getCom (arg) |
| 997 (let ((com (viper-getcom arg))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
998 (cond ((viper= com ?c) ?c) |
| 19078 | 999 ;; Previously, ?c was being converted to ?C, but this prevented |
| 1000 ;; multiline replace regions. | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1001 ;;((viper= com ?c) ?C) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1002 ((viper= com ?d) ?D) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1003 ((viper= com ?y) ?Y) |
| 18129 | 1004 (t com)))) |
| 1005 | |
| 1006 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1007 ;; Compute numeric prefix arg value. |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1008 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far. |
| 21940 | 1009 (defun viper-prefix-arg-value (event-char com) |
| 19078 | 1010 (let ((viper-intermediate-command 'viper-digit-argument) |
| 1011 value func) | |
| 18129 | 1012 ;; read while number |
| 21940 | 1013 (while (and (viper-characterp event-char) |
| 1014 (>= event-char ?0) (<= event-char ?9)) | |
| 1015 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0))) | |
| 1016 (setq event-char (viper-read-event-convert-to-char))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1017 |
| 18129 | 1018 (setq prefix-arg value) |
| 1019 (if com (setq prefix-arg (cons prefix-arg com))) | |
| 21940 | 1020 (while (eq event-char ?U) |
| 19078 | 1021 (viper-describe-arg prefix-arg) |
| 21940 | 1022 (setq event-char (viper-read-event-convert-to-char))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1023 |
| 19078 | 1024 (if (or com (and (not (eq viper-current-state 'vi-state)) |
| 18129 | 1025 ;; make sure it is a Vi command |
| 21940 | 1026 (viper-characterp event-char) |
| 1027 (viper-vi-command-p event-char) | |
| 18129 | 1028 )) |
| 1029 ;; If appears to be one of the vi commands, | |
| 1030 ;; then execute it with funcall and clear prefix-arg in order to not | |
| 1031 ;; confuse subsequent commands | |
| 1032 (progn | |
| 1033 ;; last-command-char is the char we want emacs to think was typed | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1034 ;; last. If com is not nil, the viper-digit-argument command was |
| 19078 | 1035 ;; called from within viper-prefix-arg command, such as `d', `w', |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1036 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be |
| 19078 | 1037 ;; `d', `w', etc. If viper-digit-argument was invoked by |
| 1038 ;; viper-escape-to-vi (which is indicated by the fact that the | |
| 21940 | 1039 ;; current state is not vi-state), then `event-char' represents the |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1040 ;; vi command to be executed (e.g., `d', `w', etc). Again, |
| 19078 | 1041 ;; last-command-char must make emacs believe that this is the command |
| 1042 ;; we typed. | |
| 21940 | 1043 (cond ((eq event-char 'return) (setq event-char ?\C-m)) |
| 1044 ((eq event-char 'delete) (setq event-char ?\C-?)) | |
| 1045 ((eq event-char 'backspace) (setq event-char ?\C-h)) | |
| 1046 ((eq event-char 'space) (setq event-char ?\ ))) | |
| 1047 (setq last-command-char (or com event-char)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1048 (setq func (viper-exec-form-in-vi |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1049 `(key-binding (char-to-string ,event-char)))) |
| 18129 | 1050 (funcall func prefix-arg) |
| 1051 (setq prefix-arg nil)) | |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1052 ;; some other command -- let emacs do it in its own way |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1053 (viper-set-unread-command-events event-char)) |
| 18129 | 1054 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1055 |
| 18129 | 1056 |
| 1057 ;; Vi operator as prefix argument." | |
| 19078 | 1058 (defun viper-prefix-arg-com (char value com) |
| 18129 | 1059 (let ((cont t) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1060 cmd-info |
| 18958 | 1061 cmd-to-exec-at-end) |
| 18129 | 1062 (while (and cont |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1063 (viper-memq-char char |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1064 (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\" |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1065 viper-buffer-search-char))) |
| 18129 | 1066 (if com |
| 1067 ;; this means that we already have a command character, so we | |
| 1068 ;; construct a com list and exit while. however, if char is " | |
| 1069 ;; it is an error. | |
| 1070 (progn | |
| 1071 ;; new com is (CHAR . OLDCOM) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1072 (if (viper-memq-char char '(?# ?\")) (error "")) |
| 18129 | 1073 (setq com (cons char com)) |
| 1074 (setq cont nil)) | |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1075 ;; If com is nil we set com as char, and read more. Again, if char is |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1076 ;; ", we read the name of register and store it in viper-use-register. |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1077 ;; if char is !, =, or #, a complete com is formed so we exit the while |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1078 ;; loop. |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1079 (cond ((viper-memq-char char '(?! ?=)) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1080 (setq com char) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1081 (setq char (read-char)) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1082 (setq cont nil)) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1083 ((viper= char ?#) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1084 ;; read a char and encode it as com |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1085 (setq com (+ 128 (read-char))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1086 (setq char (read-char))) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1087 ((viper= char ?\") |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1088 (let ((reg (read-char))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1089 (if (viper-valid-register reg) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1090 (setq viper-use-register reg) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1091 (error "")) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1092 (setq char (read-char)))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1093 (t |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1094 (setq com char) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1095 (setq char (read-char)))))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1096 |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1097 (if (atom com) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1098 ;; `com' is a single char, so we construct the command argument |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1099 ;; and if `char' is `?', we describe the arg; otherwise |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1100 ;; we prepare the command that will be executed at the end. |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1101 (progn |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1102 (setq cmd-info (cons value com)) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1103 (while (viper= char ?U) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1104 (viper-describe-arg cmd-info) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1105 (setq char (read-char))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1106 ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so we |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1107 ;; execute it at the very end |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1108 (or (viper-movement-command-p char) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1109 (viper-digit-command-p char) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1110 (viper-regsuffix-command-p char) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1111 (viper= char ?!) ; bang command |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1112 (error "")) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1113 (setq cmd-to-exec-at-end |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1114 (viper-exec-form-in-vi |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1115 `(key-binding (char-to-string ,char))))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1116 |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1117 ;; as com is non-nil, this means that we have a command to execute |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1118 (if (viper-memq-char (car com) '(?r ?R)) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1119 ;; execute apropriate region command. |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1120 (let ((char (car com)) (com (cdr com))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1121 (setq prefix-arg (cons value com)) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1122 (if (viper= char ?r) (viper-region prefix-arg) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1123 (viper-Region prefix-arg)) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1124 ;; reset prefix-arg |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1125 (setq prefix-arg nil)) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1126 ;; otherwise, reset prefix arg and call appropriate command |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1127 (setq value (if (null value) 1 value)) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1128 (setq prefix-arg nil) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1129 (cond |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1130 ;; If we change ?C to ?c here, then cc will enter replacement mode |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1131 ;; rather than deleting lines. However, it will affect 1 less line than |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1132 ;; normal. We decided to not use replacement mode here and follow Vi, |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1133 ;; since replacement mode on n full lines can be achieved with nC. |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1134 ((equal com '(?c . ?c)) (viper-line (cons value ?C))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1135 ((equal com '(?d . ?d)) (viper-line (cons value ?D))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1136 ((equal com '(?d . ?y)) (viper-yank-defun)) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1137 ((equal com '(?y . ?y)) (viper-line (cons value ?Y))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1138 ((equal com '(?< . ?<)) (viper-line (cons value ?<))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1139 ((equal com '(?> . ?>)) (viper-line (cons value ?>))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1140 ((equal com '(?! . ?!)) (viper-line (cons value ?!))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1141 ((equal com '(?= . ?=)) (viper-line (cons value ?=))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1142 (t (error ""))))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1143 |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1144 (if cmd-to-exec-at-end |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1145 (progn |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1146 (setq last-command-char char) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1147 (setq last-command-event |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1148 (viper-copy-event |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1149 (if viper-xemacs-p (character-to-event char) char))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1150 (condition-case nil |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1151 (funcall cmd-to-exec-at-end cmd-info) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1152 (error |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1153 (error ""))))) |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1154 )) |
| 18129 | 1155 |
| 19078 | 1156 (defun viper-describe-arg (arg) |
| 18129 | 1157 (let (val com) |
| 19078 | 1158 (setq val (viper-P-val arg) |
| 1159 com (viper-getcom arg)) | |
| 18129 | 1160 (if (null val) |
| 1161 (if (null com) | |
| 1162 (message "Value is nil, and command is nil") | |
| 1163 (message "Value is nil, and command is `%c'" com)) | |
| 1164 (if (null com) | |
| 1165 (message "Value is `%d', and command is nil" val) | |
| 1166 (message "Value is `%d', and command is `%c'" val com))))) | |
| 1167 | |
| 19078 | 1168 (defun viper-digit-argument (arg) |
| 18129 | 1169 "Begin numeric argument for the next command." |
| 1170 (interactive "P") | |
| 19078 | 1171 (viper-leave-region-active) |
| 1172 (viper-prefix-arg-value | |
| 18129 | 1173 last-command-char (if (consp arg) (cdr arg) nil))) |
| 1174 | |
| 19078 | 1175 (defun viper-command-argument (arg) |
| 18129 | 1176 "Accept a motion command as an argument." |
| 1177 (interactive "P") | |
| 19078 | 1178 (let ((viper-intermediate-command 'viper-command-argument)) |
| 18129 | 1179 (condition-case nil |
| 19078 | 1180 (viper-prefix-arg-com |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1181 last-command-char |
| 18129 | 1182 (cond ((null arg) nil) |
| 1183 ((consp arg) (car arg)) | |
| 1184 ((integerp arg) arg) | |
| 19078 | 1185 (t (error viper-InvalidCommandArgument))) |
| 18129 | 1186 (cond ((null arg) nil) |
| 1187 ((consp arg) (cdr arg)) | |
| 1188 ((integerp arg) nil) | |
| 19078 | 1189 (t (error viper-InvalidCommandArgument)))) |
| 1190 (quit (setq viper-use-register nil) | |
| 18129 | 1191 (signal 'quit nil))) |
| 19078 | 1192 (viper-deactivate-mark))) |
| 18129 | 1193 |
| 1194 | |
| 1195 ;; repeat last destructive command | |
| 1196 | |
| 1197 ;; Append region to text in register REG. | |
| 1198 ;; START and END are buffer positions indicating what to append. | |
| 19078 | 1199 (defsubst viper-append-to-register (reg start end) |
| 18129 | 1200 (set-register reg (concat (if (stringp (get-register reg)) |
| 1201 (get-register reg) "") | |
| 1202 (buffer-substring start end)))) | |
| 1203 | |
| 19078 | 1204 ;; Saves last inserted text for possible use by viper-repeat command. |
| 1205 (defun viper-save-last-insertion (beg end) | |
| 19756 | 1206 (condition-case nil |
| 1207 (setq viper-last-insertion (buffer-substring beg end)) | |
| 1208 (error | |
| 1209 ;; beg or end marker are somehow screwed up | |
| 1210 (setq viper-last-insertion nil))) | |
| 19078 | 1211 (setq viper-last-insertion (buffer-substring beg end)) |
| 1212 (or (< (length viper-d-com) 5) | |
| 1213 (setcar (nthcdr 4 viper-d-com) viper-last-insertion)) | |
| 1214 (or (null viper-command-ring) | |
| 1215 (ring-empty-p viper-command-ring) | |
| 18129 | 1216 (progn |
| 19078 | 1217 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring)) |
| 1218 viper-last-insertion) | |
| 18129 | 1219 ;; del most recent elt, if identical to the second most-recent |
| 19078 | 1220 (viper-cleanup-ring viper-command-ring))) |
| 18129 | 1221 ) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1222 |
| 19078 | 1223 (defsubst viper-yank-last-insertion () |
| 1224 "Inserts the text saved by the previous viper-save-last-insertion command." | |
| 18129 | 1225 (condition-case nil |
| 19078 | 1226 (insert viper-last-insertion) |
| 18129 | 1227 (error nil))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1228 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1229 |
| 18129 | 1230 ;; define functions to be executed |
| 1231 | |
| 1232 ;; invoked by the `C' command | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1233 (defun viper-exec-change (m-com com) |
| 19078 | 1234 (or (and (markerp viper-com-point) (marker-position viper-com-point)) |
| 1235 (set-marker viper-com-point (point) (current-buffer))) | |
| 18129 | 1236 ;; handle C cmd at the eol and at eob. |
| 19078 | 1237 (if (or (and (eolp) (= viper-com-point (point))) |
| 1238 (= viper-com-point (point-max))) | |
| 18129 | 1239 (progn |
| 1240 (insert " ")(backward-char 1))) | |
| 19078 | 1241 (if (= viper-com-point (point)) |
| 1242 (viper-forward-char-carefully)) | |
| 1243 (set-mark viper-com-point) | |
| 1244 (if (eq m-com 'viper-next-line-at-bol) | |
| 1245 (viper-enlarge-region (mark t) (point))) | |
| 1246 (if (< (point) (mark t)) | |
| 1247 (exchange-point-and-mark)) | |
| 1248 (if (eq (preceding-char) ?\n) | |
| 1249 (viper-backward-char-carefully)) ; give back the newline | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1250 (if (viper= com ?c) |
| 19078 | 1251 (viper-change (mark t) (point)) |
| 1252 (viper-change-subr (mark t) (point)))) | |
| 1253 | |
| 1254 ;; this is invoked by viper-substitute-line | |
| 1255 (defun viper-exec-Change (m-com com) | |
| 18129 | 1256 (save-excursion |
| 19078 | 1257 (set-mark viper-com-point) |
| 1258 (viper-enlarge-region (mark t) (point)) | |
| 1259 (if viper-use-register | |
| 18129 | 1260 (progn |
| 19078 | 1261 (cond ((viper-valid-register viper-use-register '(letter digit)) |
| 18129 | 1262 (copy-to-register |
| 19078 | 1263 viper-use-register (mark t) (point) nil)) |
| 1264 ((viper-valid-register viper-use-register '(Letter)) | |
| 1265 (viper-append-to-register | |
| 1266 (downcase viper-use-register) (mark t) (point))) | |
| 1267 (t (setq viper-use-register nil) | |
| 1268 (error viper-InvalidRegister viper-use-register))) | |
| 1269 (setq viper-use-register nil))) | |
| 18129 | 1270 (delete-region (mark t) (point))) |
| 1271 (open-line 1) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1272 (if (viper= com ?C) |
| 19078 | 1273 (viper-change-state-to-insert) |
| 1274 (viper-yank-last-insertion))) | |
| 1275 | |
| 1276 (defun viper-exec-delete (m-com com) | |
| 1277 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
| 1278 (set-marker viper-com-point (point) (current-buffer))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1279 (let (chars-deleted) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1280 (if viper-use-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1281 (progn |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1282 (cond ((viper-valid-register viper-use-register '(letter digit)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1283 (copy-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1284 viper-use-register viper-com-point (point) nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1285 ((viper-valid-register viper-use-register '(Letter)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1286 (viper-append-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1287 (downcase viper-use-register) viper-com-point (point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1288 (t (setq viper-use-register nil) |
| 19078 | 1289 (error viper-InvalidRegister viper-use-register))) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1290 (setq viper-use-register nil))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1291 (setq last-command |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1292 (if (eq last-command 'd-command) 'kill-region nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1293 (setq chars-deleted (abs (- (point) viper-com-point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1294 (if (> chars-deleted viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1295 (message "Deleted %d characters" chars-deleted)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1296 (kill-region viper-com-point (point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1297 (setq this-command 'd-command) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1298 (if viper-ex-style-motion |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1299 (if (and (eolp) (not (bolp))) (backward-char 1))))) |
| 18129 | 1300 |
| 19078 | 1301 (defun viper-exec-Delete (m-com com) |
| 18129 | 1302 (save-excursion |
| 19078 | 1303 (set-mark viper-com-point) |
| 1304 (viper-enlarge-region (mark t) (point)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1305 (let (lines-deleted) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1306 (if viper-use-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1307 (progn |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1308 (cond ((viper-valid-register viper-use-register '(letter digit)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1309 (copy-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1310 viper-use-register (mark t) (point) nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1311 ((viper-valid-register viper-use-register '(Letter)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1312 (viper-append-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1313 (downcase viper-use-register) (mark t) (point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1314 (t (setq viper-use-register nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1315 (error viper-InvalidRegister viper-use-register))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1316 (setq viper-use-register nil))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1317 (setq last-command |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1318 (if (eq last-command 'D-command) 'kill-region nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1319 (setq lines-deleted (count-lines (point) viper-com-point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1320 (if (> lines-deleted viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1321 (message "Deleted %d lines" lines-deleted)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1322 (kill-region (mark t) (point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1323 (if (eq m-com 'viper-line) (setq this-command 'D-command))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1324 (back-to-indentation))) |
| 18129 | 1325 |
| 21940 | 1326 ;; save region |
| 19078 | 1327 (defun viper-exec-yank (m-com com) |
| 1328 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
| 1329 (set-marker viper-com-point (point) (current-buffer))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1330 (let (chars-saved) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1331 (if viper-use-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1332 (progn |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1333 (cond ((viper-valid-register viper-use-register '(letter digit)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1334 (copy-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1335 viper-use-register viper-com-point (point) nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1336 ((viper-valid-register viper-use-register '(Letter)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1337 (viper-append-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1338 (downcase viper-use-register) viper-com-point (point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1339 (t (setq viper-use-register nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1340 (error viper-InvalidRegister viper-use-register))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1341 (setq viper-use-register nil))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1342 (setq last-command nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1343 (copy-region-as-kill viper-com-point (point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1344 (setq chars-saved (abs (- (point) viper-com-point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1345 (if (> chars-saved viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1346 (message "Saved %d characters" chars-saved)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1347 (goto-char viper-com-point))) |
| 19078 | 1348 |
| 21940 | 1349 ;; save lines |
| 19078 | 1350 (defun viper-exec-Yank (m-com com) |
| 18129 | 1351 (save-excursion |
| 19078 | 1352 (set-mark viper-com-point) |
| 1353 (viper-enlarge-region (mark t) (point)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1354 (let (lines-saved) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1355 (if viper-use-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1356 (progn |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1357 (cond ((viper-valid-register viper-use-register '(letter digit)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1358 (copy-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1359 viper-use-register (mark t) (point) nil)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1360 ((viper-valid-register viper-use-register '(Letter)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1361 (viper-append-to-register |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1362 (downcase viper-use-register) (mark t) (point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1363 (t (setq viper-use-register nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1364 (error viper-InvalidRegister viper-use-register))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1365 (setq viper-use-register nil))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1366 (setq last-command nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1367 (copy-region-as-kill (mark t) (point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1368 (setq lines-saved (count-lines (mark t) (point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1369 (if (> lines-saved viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1370 (message "Saved %d lines" lines-saved)))) |
| 19078 | 1371 (viper-deactivate-mark) |
| 1372 (goto-char viper-com-point)) | |
| 1373 | |
| 1374 (defun viper-exec-bang (m-com com) | |
| 18129 | 1375 (save-excursion |
| 19078 | 1376 (set-mark viper-com-point) |
| 1377 (viper-enlarge-region (mark t) (point)) | |
| 18958 | 1378 (exchange-point-and-mark) |
| 18129 | 1379 (shell-command-on-region |
| 1380 (mark t) (point) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1381 (if (viper= com ?!) |
| 19078 | 1382 (setq viper-last-shell-com |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1383 (viper-read-string-with-history |
| 18129 | 1384 "!" |
| 1385 nil | |
| 19078 | 1386 'viper-shell-history |
| 1387 (car viper-shell-history) | |
| 18129 | 1388 )) |
| 19078 | 1389 viper-last-shell-com) |
| 18129 | 1390 t))) |
| 1391 | |
| 19078 | 1392 (defun viper-exec-equals (m-com com) |
| 18129 | 1393 (save-excursion |
| 19078 | 1394 (set-mark viper-com-point) |
| 1395 (viper-enlarge-region (mark t) (point)) | |
| 18129 | 1396 (if (> (mark t) (point)) (exchange-point-and-mark)) |
| 1397 (indent-region (mark t) (point) nil))) | |
| 1398 | |
| 19078 | 1399 (defun viper-exec-shift (m-com com) |
| 18129 | 1400 (save-excursion |
| 19078 | 1401 (set-mark viper-com-point) |
| 1402 (viper-enlarge-region (mark t) (point)) | |
| 18129 | 1403 (if (> (mark t) (point)) (exchange-point-and-mark)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1404 (indent-rigidly (mark t) (point) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1405 (if (viper= com ?>) |
| 19078 | 1406 viper-shift-width |
| 1407 (- viper-shift-width)))) | |
| 18129 | 1408 ;; return point to where it was before shift |
| 19078 | 1409 (goto-char viper-com-point)) |
| 18129 | 1410 |
| 1411 ;; this is needed because some commands fake com by setting it to ?r, which | |
| 1412 ;; denotes repeated insert command. | |
| 19078 | 1413 (defsubst viper-exec-dummy (m-com com) |
| 18129 | 1414 nil) |
| 1415 | |
| 19078 | 1416 (defun viper-exec-buffer-search (m-com com) |
| 1417 (setq viper-s-string (buffer-substring (point) viper-com-point)) | |
| 1418 (setq viper-s-forward t) | |
| 1419 (setq viper-search-history (cons viper-s-string viper-search-history)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1420 (setq viper-intermediate-command 'viper-exec-buffer-search) |
| 19078 | 1421 (viper-search viper-s-string viper-s-forward 1)) |
| 1422 | |
| 1423 (defvar viper-exec-array (make-vector 128 nil)) | |
| 18129 | 1424 |
| 1425 ;; Using a dispatch array allows adding functions like buffer search | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1426 ;; without affecting other functions. Buffer search can now be bound |
| 18129 | 1427 ;; to any character. |
| 1428 | |
| 19078 | 1429 (aset viper-exec-array ?c 'viper-exec-change) |
| 1430 (aset viper-exec-array ?C 'viper-exec-Change) | |
| 1431 (aset viper-exec-array ?d 'viper-exec-delete) | |
| 1432 (aset viper-exec-array ?D 'viper-exec-Delete) | |
| 1433 (aset viper-exec-array ?y 'viper-exec-yank) | |
| 1434 (aset viper-exec-array ?Y 'viper-exec-Yank) | |
| 1435 (aset viper-exec-array ?r 'viper-exec-dummy) | |
| 1436 (aset viper-exec-array ?! 'viper-exec-bang) | |
| 1437 (aset viper-exec-array ?< 'viper-exec-shift) | |
| 1438 (aset viper-exec-array ?> 'viper-exec-shift) | |
| 1439 (aset viper-exec-array ?= 'viper-exec-equals) | |
| 18129 | 1440 |
| 1441 | |
| 1442 | |
| 1443 ;; This function is called by various movement commands to execute a | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1444 ;; destructive command on the region specified by the movement command. For |
| 19078 | 1445 ;; instance, if the user types cw, then the command viper-forward-word will |
| 1446 ;; call viper-execute-com to execute viper-exec-change, which eventually will | |
| 1447 ;; call viper-change to invoke the replace mode on the region. | |
| 18129 | 1448 ;; |
| 19078 | 1449 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) |
| 1450 ;; via a call to viper-set-destructive-command, for later use by viper-repeat. | |
| 1451 (defun viper-execute-com (m-com val com) | |
| 1452 (let ((reg viper-use-register)) | |
| 18129 | 1453 ;; this is the special command `#' |
| 1454 (if (> com 128) | |
| 19078 | 1455 (viper-special-prefix-com (- com 128)) |
| 1456 (let ((fn (aref viper-exec-array (if (< com 0) (- com) com)))) | |
| 18129 | 1457 (if (null fn) |
| 19078 | 1458 (error "%c: %s" com viper-InvalidViCommand) |
| 18129 | 1459 (funcall fn m-com com)))) |
| 19078 | 1460 (if (viper-dotable-command-p com) |
| 1461 (viper-set-destructive-command | |
| 18129 | 1462 (list m-com val |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1463 (if (viper-memq-char com (list ?c ?C ?!)) (- com) com) |
| 18129 | 1464 reg nil nil))) |
| 1465 )) | |
| 1466 | |
| 1467 | |
| 19078 | 1468 (defun viper-repeat (arg) |
| 18129 | 1469 "Re-execute last destructive command. |
| 19078 | 1470 Use the info in viper-d-com, which has the form |
| 18129 | 1471 \(com val ch reg inserted-text command-keys\), |
| 1472 where `com' is the command to be re-executed, `val' is the | |
| 1473 argument to `com', `ch' is a flag for repeat, and `reg' is optional; | |
| 1474 if it exists, it is the name of the register for `com'. | |
| 1475 If the prefix argument, ARG, is non-nil, it is used instead of `val'." | |
| 1476 (interactive "P") | |
| 1477 (let ((save-point (point)) ; save point before repeating prev cmd | |
| 1478 ;; Pass along that we are repeating a destructive command | |
| 19078 | 1479 ;; This tells viper-set-destructive-command not to update |
| 1480 ;; viper-command-ring | |
| 1481 (viper-intermediate-command 'viper-repeat)) | |
| 1482 (if (eq last-command 'viper-undo) | |
| 1483 ;; if the last command was viper-undo, then undo-more | |
| 1484 (viper-undo-more) | |
| 1485 ;; otherwise execute the command stored in viper-d-com. if arg is | |
| 1486 ;; non-nil its prefix value is used as new prefix value for the command. | |
| 1487 (let ((m-com (car viper-d-com)) | |
| 1488 (val (viper-P-val arg)) | |
| 1489 (com (nth 2 viper-d-com)) | |
| 1490 (reg (nth 3 viper-d-com))) | |
| 1491 (if (null val) (setq val (nth 1 viper-d-com))) | |
| 18129 | 1492 (if (null m-com) (error "No previous command to repeat.")) |
| 19078 | 1493 (setq viper-use-register reg) |
| 1494 (if (nth 4 viper-d-com) ; text inserted by command | |
| 1495 (setq viper-last-insertion (nth 4 viper-d-com) | |
| 1496 viper-d-char (nth 4 viper-d-com))) | |
| 18129 | 1497 (funcall m-com (cons val com)) |
| 19078 | 1498 (cond ((and (< save-point (point)) viper-keep-point-on-repeat) |
| 18839 | 1499 (goto-char save-point)) ; go back to before repeat. |
| 19462 | 1500 ((and (< save-point (point)) viper-ex-style-editing) |
| 18839 | 1501 (or (bolp) (backward-char 1)))) |
| 18129 | 1502 (if (and (eolp) (not (bolp))) |
| 1503 (backward-char 1)) | |
| 1504 )) | |
| 19462 | 1505 (viper-adjust-undo) ; take care of undo |
| 18129 | 1506 ;; If the prev cmd was rotating the command ring, this means that `.' has |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1507 ;; just executed a command from that ring. So, push it on the ring again. |
| 19078 | 1508 ;; If we are just executing previous command , then don't push viper-d-com |
| 1509 ;; because viper-d-com is not fully constructed in this case (its keys and | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1510 ;; the inserted text may be nil). Besides, in this case, the command |
| 18129 | 1511 ;; executed by `.' is already on the ring. |
| 19078 | 1512 (if (eq last-command 'viper-display-current-destructive-command) |
| 1513 (viper-push-onto-ring viper-d-com 'viper-command-ring)) | |
| 1514 (viper-deactivate-mark) | |
| 18129 | 1515 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1516 |
| 19078 | 1517 (defun viper-repeat-from-history () |
| 18129 | 1518 "Repeat a destructive command from history. |
| 19078 | 1519 Doesn't change viper-command-ring in any way, so `.' will work as before |
| 18129 | 1520 executing this command. |
| 1521 This command is supposed to be bound to a two-character Vi macro where | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1522 the second character is a digit 0 to 9. The digit indicates which |
| 18129 | 1523 history command to execute. `<char>0' is equivalent to `.', `<char>1' |
| 1524 invokes the command before that, etc." | |
| 1525 (interactive) | |
| 19078 | 1526 (let* ((viper-intermediate-command 'repeating-display-destructive-command) |
| 1527 (idx (cond (viper-this-kbd-macro | |
| 18129 | 1528 (string-to-number |
| 19078 | 1529 (symbol-name (elt viper-this-kbd-macro 1)))) |
| 18129 | 1530 (t 0))) |
| 1531 (num idx) | |
| 19078 | 1532 (viper-d-com viper-d-com)) |
| 18129 | 1533 |
| 1534 (or (and (numberp num) (<= 0 num) (<= num 9)) | |
| 1535 (progn | |
| 1536 (setq idx 0 | |
| 1537 num 0) | |
| 1538 (message | |
| 19078 | 1539 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'"))) |
| 18129 | 1540 (while (< 0 num) |
| 19078 | 1541 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1)) |
| 18129 | 1542 (setq num (1- num))) |
| 19078 | 1543 (viper-repeat nil) |
| 18129 | 1544 (while (> idx num) |
| 19078 | 1545 (viper-special-ring-rotate1 viper-command-ring 1) |
| 18129 | 1546 (setq num (1+ num))) |
| 1547 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1548 |
| 18129 | 1549 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1550 ;; The hash-command. It is invoked interactively by the key sequence #<char>. |
| 19078 | 1551 ;; The chars that can follow `#' are determined by viper-hash-command-p |
| 1552 (defun viper-special-prefix-com (char) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1553 (cond ((viper= char ?c) |
| 19078 | 1554 (downcase-region (min viper-com-point (point)) |
| 1555 (max viper-com-point (point)))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1556 ((viper= char ?C) |
| 19078 | 1557 (upcase-region (min viper-com-point (point)) |
| 1558 (max viper-com-point (point)))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1559 ((viper= char ?g) |
| 19078 | 1560 (push-mark viper-com-point t) |
| 1561 (viper-global-execute)) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1562 ((viper= char ?q) |
| 19078 | 1563 (push-mark viper-com-point t) |
| 1564 (viper-quote-region)) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1565 ((viper= char ?s) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1566 (funcall viper-spell-function viper-com-point (point))) |
| 19078 | 1567 (t (error "#%c: %s" char viper-InvalidViCommand)))) |
| 18129 | 1568 |
| 1569 | |
| 1570 ;; undoing | |
| 1571 | |
| 19078 | 1572 (defun viper-undo () |
| 18129 | 1573 "Undo previous change." |
| 1574 (interactive) | |
| 1575 (message "undo!") | |
| 1576 (let ((modified (buffer-modified-p)) | |
| 1577 (before-undo-pt (point-marker)) | |
| 1578 (after-change-functions after-change-functions) | |
| 1579 undo-beg-posn undo-end-posn) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1580 |
| 18129 | 1581 ;; no need to remove this hook, since this var has scope inside a let. |
| 1582 (add-hook 'after-change-functions | |
| 1583 '(lambda (beg end len) | |
| 1584 (setq undo-beg-posn beg | |
| 1585 undo-end-posn (or end beg)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1586 |
| 18129 | 1587 (undo-start) |
| 1588 (undo-more 2) | |
| 1589 (setq undo-beg-posn (or undo-beg-posn before-undo-pt) | |
| 1590 undo-end-posn (or undo-end-posn undo-beg-posn)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1591 |
| 18129 | 1592 (goto-char undo-beg-posn) |
| 1593 (sit-for 0) | |
| 19078 | 1594 (if (and viper-keep-point-on-undo |
| 18129 | 1595 (pos-visible-in-window-p before-undo-pt)) |
| 1596 (progn | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1597 (push-mark (point-marker) t) |
| 19078 | 1598 (viper-sit-for-short 300) |
| 18129 | 1599 (goto-char undo-end-posn) |
| 19078 | 1600 (viper-sit-for-short 300) |
| 19462 | 1601 (if (and (> (viper-chars-in-region undo-beg-posn before-undo-pt) 1) |
| 1602 (> (viper-chars-in-region undo-end-posn before-undo-pt) 1)) | |
| 18129 | 1603 (goto-char before-undo-pt) |
| 1604 (goto-char undo-beg-posn))) | |
| 1605 (push-mark before-undo-pt t)) | |
| 1606 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
| 1607 (if (not modified) (set-buffer-modified-p t))) | |
| 19078 | 1608 (setq this-command 'viper-undo)) |
| 18129 | 1609 |
| 1610 ;; Continue undoing previous changes. | |
| 19078 | 1611 (defun viper-undo-more () |
| 18129 | 1612 (message "undo more!") |
| 1613 (condition-case nil | |
| 1614 (undo-more 1) | |
| 1615 (error (beep) | |
| 1616 (message "No further undo information in this buffer"))) | |
| 1617 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
| 19078 | 1618 (setq this-command 'viper-undo)) |
| 18129 | 1619 |
| 1620 ;; The following two functions are used to set up undo properly. | |
| 1621 ;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines, | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1622 ;; they are undone all at once. |
| 19078 | 1623 (defun viper-adjust-undo () |
| 19462 | 1624 (if viper-undo-needs-adjustment |
| 1625 (let ((inhibit-quit t) | |
| 1626 tmp tmp2) | |
| 1627 (setq viper-undo-needs-adjustment nil) | |
| 1628 (if (listp buffer-undo-list) | |
| 1629 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list)) | |
| 1630 (progn | |
| 1631 (setq tmp2 (cdr tmp)) ; the part after mark | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1632 |
| 19462 | 1633 ;; cut tail from buffer-undo-list temporarily by direct |
| 1634 ;; manipulation with pointers in buffer-undo-list | |
| 1635 (setcdr tmp nil) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1636 |
| 19462 | 1637 (setq buffer-undo-list (delq nil buffer-undo-list)) |
| 1638 (setq buffer-undo-list | |
| 1639 (delq viper-buffer-undo-list-mark buffer-undo-list)) | |
| 1640 ;; restore tail of buffer-undo-list | |
| 1641 (setq buffer-undo-list (nconc buffer-undo-list tmp2))) | |
| 1642 (setq buffer-undo-list (delq nil buffer-undo-list))))) | |
| 1643 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1644 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1645 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1646 (defun viper-set-complex-command-for-undo () |
| 18129 | 1647 (if (listp buffer-undo-list) |
| 19078 | 1648 (if (not viper-undo-needs-adjustment) |
| 18129 | 1649 (let ((inhibit-quit t)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1650 (setq buffer-undo-list |
| 19078 | 1651 (cons viper-buffer-undo-list-mark buffer-undo-list)) |
| 1652 (setq viper-undo-needs-adjustment t))))) | |
| 18129 | 1653 |
| 1654 | |
| 1655 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1656 |
| 19078 | 1657 (defun viper-display-current-destructive-command () |
| 1658 (let ((text (nth 4 viper-d-com)) | |
| 1659 (keys (nth 5 viper-d-com)) | |
| 18129 | 1660 (max-text-len 30)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1661 |
| 19078 | 1662 (setq this-command 'viper-display-current-destructive-command) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1663 |
| 18129 | 1664 (message " `.' runs %s%s" |
| 19078 | 1665 (concat "`" (viper-array-to-string keys) "'") |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1666 (viper-abbreviate-string |
| 19079 | 1667 (if viper-xemacs-p |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1668 (replace-in-string |
| 19462 | 1669 (cond ((characterp text) (char-to-string text)) |
| 1670 ((stringp text) text) | |
| 1671 (t "")) | |
| 1672 "\n" "^J") | |
| 19079 | 1673 text) |
| 1674 max-text-len | |
| 1675 " inserting `" "'" " .......")) | |
| 18129 | 1676 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1677 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1678 |
| 19078 | 1679 ;; don't change viper-d-com if it was viper-repeat command invoked with `.' |
| 18129 | 1680 ;; or in some other way (non-interactively). |
| 19078 | 1681 (defun viper-set-destructive-command (list) |
| 1682 (or (eq viper-intermediate-command 'viper-repeat) | |
| 18129 | 1683 (progn |
| 19078 | 1684 (setq viper-d-com list) |
| 1685 (setcar (nthcdr 5 viper-d-com) | |
| 1686 (viper-array-to-string (if (arrayp viper-this-command-keys) | |
| 1687 viper-this-command-keys | |
| 1688 (this-command-keys)))) | |
| 1689 (viper-push-onto-ring viper-d-com 'viper-command-ring))) | |
| 1690 (setq viper-this-command-keys nil)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1691 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1692 |
| 19078 | 1693 (defun viper-prev-destructive-command (next) |
| 18129 | 1694 "Find previous destructive command in the history of destructive commands. |
| 1695 With prefix argument, find next destructive command." | |
| 1696 (interactive "P") | |
| 19078 | 1697 (let (cmd viper-intermediate-command) |
| 1698 (if (eq last-command 'viper-display-current-destructive-command) | |
| 18129 | 1699 ;; repeated search through command history |
| 19078 | 1700 (setq viper-intermediate-command |
| 1701 'repeating-display-destructive-command) | |
| 18129 | 1702 ;; first search through command history--set temp ring |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1703 (setq viper-temp-command-ring (copy-list viper-command-ring))) |
| 18129 | 1704 (setq cmd (if next |
| 19078 | 1705 (viper-special-ring-rotate1 viper-temp-command-ring 1) |
| 1706 (viper-special-ring-rotate1 viper-temp-command-ring -1))) | |
| 18129 | 1707 (if (null cmd) |
| 1708 () | |
| 19078 | 1709 (setq viper-d-com cmd)) |
| 1710 (viper-display-current-destructive-command))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1711 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1712 |
| 19078 | 1713 (defun viper-next-destructive-command () |
| 18129 | 1714 "Find next destructive command in the history of destructive commands." |
| 1715 (interactive) | |
| 19078 | 1716 (viper-prev-destructive-command 'next)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1717 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1718 |
| 19078 | 1719 (defun viper-insert-prev-from-insertion-ring (arg) |
| 18129 | 1720 "Cycle through insertion ring in the direction of older insertions. |
| 1721 Undoes previous insertion and inserts new. | |
| 1722 With prefix argument, cycles in the direction of newer elements. | |
| 1723 In minibuffer, this command executes whatever the invocation key is bound | |
| 1724 to in the global map, instead of cycling through the insertion ring." | |
| 1725 (interactive "P") | |
| 19078 | 1726 (let (viper-intermediate-command) |
| 1727 (if (eq last-command 'viper-insert-from-insertion-ring) | |
| 18129 | 1728 (progn ; repeated search through insertion history |
| 19078 | 1729 (setq viper-intermediate-command 'repeating-insertion-from-ring) |
| 1730 (if (eq viper-current-state 'replace-state) | |
| 18129 | 1731 (undo 1) |
| 19078 | 1732 (if viper-last-inserted-string-from-insertion-ring |
| 18129 | 1733 (backward-delete-char |
| 19078 | 1734 (length viper-last-inserted-string-from-insertion-ring)))) |
| 18129 | 1735 ) |
| 1736 ;;first search through insertion history | |
| 19078 | 1737 (setq viper-temp-insertion-ring (copy-list viper-insertion-ring))) |
| 1738 (setq this-command 'viper-insert-from-insertion-ring) | |
| 18129 | 1739 ;; so that things will be undone properly |
| 1740 (setq buffer-undo-list (cons nil buffer-undo-list)) | |
| 19078 | 1741 (setq viper-last-inserted-string-from-insertion-ring |
| 1742 (viper-special-ring-rotate1 viper-temp-insertion-ring (if arg 1 -1))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1743 |
| 19078 | 1744 ;; this change of viper-intermediate-command must come after |
| 1745 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the | |
| 18129 | 1746 ;; insertion. |
| 19078 | 1747 (setq viper-intermediate-command nil) |
| 1748 (if viper-last-inserted-string-from-insertion-ring | |
| 1749 (insert viper-last-inserted-string-from-insertion-ring)) | |
| 18129 | 1750 )) |
| 1751 | |
| 19078 | 1752 (defun viper-insert-next-from-insertion-ring () |
| 18129 | 1753 "Cycle through insertion ring in the direction of older insertions. |
| 1754 Undo previous insertion and inserts new." | |
| 1755 (interactive) | |
| 19078 | 1756 (viper-insert-prev-from-insertion-ring 'next)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1757 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1758 |
| 18129 | 1759 |
| 1760 ;; some region utilities | |
| 1761 | |
| 1762 ;; If at the last line of buffer, add \\n before eob, if newline is missing. | |
| 19078 | 1763 (defun viper-add-newline-at-eob-if-necessary () |
| 18129 | 1764 (save-excursion |
| 1765 (end-of-line) | |
| 1766 ;; make sure all lines end with newline, unless in the minibuffer or | |
| 1767 ;; when requested otherwise (require-final-newline is nil) | |
| 1768 (if (and (eobp) | |
| 1769 (not (bolp)) | |
| 1770 require-final-newline | |
| 19078 | 1771 (not (viper-is-in-minibuffer)) |
| 18129 | 1772 (not buffer-read-only)) |
| 1773 (insert "\n")))) | |
| 1774 | |
| 19078 | 1775 (defun viper-yank-defun () |
| 18129 | 1776 (mark-defun) |
| 1777 (copy-region-as-kill (point) (mark t))) | |
| 1778 | |
| 1779 ;; Enlarge region between BEG and END. | |
| 19078 | 1780 (defun viper-enlarge-region (beg end) |
| 18129 | 1781 (or beg (setq beg end)) ; if beg is nil, set to end |
| 1782 (or end (setq end beg)) ; if end is nil, set to beg | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1783 |
| 18129 | 1784 (if (< beg end) |
| 1785 (progn (goto-char beg) (set-mark end)) | |
| 1786 (goto-char end) | |
| 1787 (set-mark beg)) | |
| 1788 (beginning-of-line) | |
| 1789 (exchange-point-and-mark) | |
| 1790 (if (or (not (eobp)) (not (bolp))) (forward-line 1)) | |
| 1791 (if (not (eobp)) (beginning-of-line)) | |
| 1792 (if (> beg end) (exchange-point-and-mark))) | |
| 1793 | |
| 1794 | |
| 1795 ;; Quote region by each line with a user supplied string. | |
| 19078 | 1796 (defun viper-quote-region () |
| 20343 | 1797 (let ((quote-str viper-quote-string) |
| 1798 (donot-change-dafault t)) | |
| 1799 (setq quote-str | |
| 1800 (viper-read-string-with-history | |
| 1801 "Quote string: " | |
| 1802 nil | |
| 1803 'viper-quote-region-history | |
| 1804 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%") | |
| 1805 ((string-match "java.*-mode" (symbol-name major-mode)) "//") | |
| 1806 ((string-match "perl.*-mode" (symbol-name major-mode)) "#") | |
| 1807 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | |
| 1808 ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | |
| 1809 ((memq major-mode '(sh-mode shell-mode)) "#") | |
| 1810 (t (setq donot-change-dafault nil) | |
| 1811 quote-str)))) | |
| 1812 (or donot-change-dafault | |
| 1813 (setq viper-quote-string quote-str)) | |
| 1814 (viper-enlarge-region (point) (mark t)) | |
| 1815 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
| 1816 (insert quote-str) | |
| 18129 | 1817 (beginning-of-line) |
| 20343 | 1818 (forward-line 1) |
| 1819 (while (and (< (point) (mark t)) (bolp)) | |
| 1820 (insert quote-str) | |
| 1821 (beginning-of-line) | |
| 1822 (forward-line 1)))) | |
| 18129 | 1823 |
| 1824 ;; Tells whether BEG is on the same line as END. | |
| 1825 ;; If one of the args is nil, it'll return nil. | |
| 19078 | 1826 (defun viper-same-line (beg end) |
| 18129 | 1827 (let ((selective-display nil) |
| 1828 (incr 0) | |
| 1829 temp) | |
| 1830 (if (and beg end (> beg end)) | |
| 1831 (setq temp beg | |
| 1832 beg end | |
| 1833 end temp)) | |
| 1834 (if (and beg end) | |
| 1835 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range | |
| 1836 nil) | |
| 1837 (t | |
| 1838 ;; This 'if' is needed because Emacs treats the next empty line | |
| 1839 ;; as part of the previous line. | |
| 19078 | 1840 (if (= (viper-line-pos 'start) end) |
| 18129 | 1841 (setq incr 1)) |
| 1842 (<= (+ incr (count-lines beg end)) 1)))) | |
| 1843 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1844 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1845 |
| 18129 | 1846 ;; Check if the string ends with a newline. |
| 19078 | 1847 (defun viper-end-with-a-newline-p (string) |
| 18129 | 1848 (or (string= string "") |
| 19078 | 1849 (= (viper-seq-last-elt string) ?\n))) |
| 1850 | |
| 1851 (defun viper-tmp-insert-at-eob (msg) | |
| 18129 | 1852 (let ((savemax (point-max))) |
| 1853 (goto-char savemax) | |
| 1854 (insert msg) | |
| 1855 (sit-for 2) | |
| 1856 (goto-char savemax) (delete-region (point) (point-max)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1857 )) |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1858 |
| 18129 | 1859 |
| 1860 | |
| 1861 ;;; Minibuffer business | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1862 |
| 19078 | 1863 (defsubst viper-set-minibuffer-style () |
| 1864 (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1865 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1866 |
| 19078 | 1867 (defun viper-minibuffer-setup-sentinel () |
| 1868 (let ((hook (if viper-vi-style-in-minibuffer | |
| 1869 'viper-change-state-to-insert | |
| 1870 'viper-change-state-to-emacs))) | |
| 18129 | 1871 (funcall hook) |
| 1872 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1873 |
|
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1874 ;; Thie is a temp hook that uses free variables init-message and initial. |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1875 ;; A dirty feature, but it is the simplest way to have it do the right thing. |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1876 ;; The INIT-MESSAGE and INITIAL vars come from the scope set by |
|
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
1877 ;; viper-read-string-with-history |
|
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1878 (defun viper-minibuffer-standard-hook () |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1879 (if (stringp init-message) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1880 (viper-tmp-insert-at-eob init-message)) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1881 (if (stringp initial) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1882 (progn |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1883 ;; don't wait if we have unread events or in kbd macro |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1884 (or unread-command-events |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1885 executing-kbd-macro |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1886 (sit-for 840)) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1887 (if (fboundp 'minibuffer-prompt-end) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1888 (delete-region (minibuffer-prompt-end) (point-max)) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1889 (erase-buffer)) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1890 (insert initial))) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1891 (viper-minibuffer-setup-sentinel)) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1892 |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1893 (defsubst viper-minibuffer-real-start () |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1894 (if (fboundp 'minibuffer-prompt-end) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1895 (minibuffer-prompt-end) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1896 (point-min))) |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1897 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1898 |
| 19756 | 1899 ;; Interpret last event in the local map first; if fails, use exit-minibuffer. |
| 1900 ;; Run viper-minibuffer-exit-hook before exiting. | |
| 19078 | 1901 (defun viper-exit-minibuffer () |
| 19756 | 1902 "Exit minibuffer Viper way." |
| 18129 | 1903 (interactive) |
| 1904 (let (command) | |
| 1905 (setq command (local-key-binding (char-to-string last-command-char))) | |
| 19756 | 1906 (run-hooks 'viper-minibuffer-exit-hook) |
| 18129 | 1907 (if command |
| 1908 (command-execute command) | |
| 1909 (exit-minibuffer)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1910 |
| 19756 | 1911 |
| 1912 (defcustom viper-smart-suffix-list | |
|
29412
ecd388a0937d
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
1913 '("" "tex" "c" "cc" "C" "java" "el" "html" "htm" "xml" |
|
ecd388a0937d
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
1914 "pl" "flr" "P" "p" "h" "H") |
|
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
1915 "*List of suffixes that Viper tries to append to filenames ending with a `.'. |
| 19756 | 1916 This is useful when you the current directory contains files with the same |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1917 prefix and many different suffixes. Usually, only one of the suffixes |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1918 represents an editable file. However, file completion will stop at the `.' |
| 19756 | 1919 The smart suffix feature lets you hit RET in such a case, and Viper will |
| 1920 select the appropriate suffix. | |
| 1921 | |
| 1922 Suffixes are tried in the order given and the first suffix for which a | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1923 corresponding file exists is selected. If no file exists for any of the |
| 19756 | 1924 suffixes, the user is asked to confirm. |
| 1925 | |
| 1926 To turn this feature off, set this variable to nil." | |
|
19905
9a4cdbf423ea
(viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19891
diff
changeset
|
1927 :type '(repeat string) |
| 20003 | 1928 :group 'viper-misc) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1929 |
| 19756 | 1930 |
| 1931 ;; Try to add a suitable suffix to files whose name ends with a `.' | |
| 1932 ;; Useful when the user hits RET on a non-completed file name. | |
| 1933 ;; Used as a minibuffer exit hook in read-file-name | |
| 1934 (defun viper-file-add-suffix () | |
| 1935 (let ((count 0) | |
| 1936 (len (length viper-smart-suffix-list)) | |
|
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1937 (file (buffer-substring-no-properties |
|
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1938 (viper-minibuffer-real-start) (point-max))) |
| 19756 | 1939 found key cmd suff) |
| 1940 (goto-char (point-max)) | |
| 1941 (if (and viper-smart-suffix-list (string-match "\\.$" file)) | |
| 1942 (progn | |
| 1943 (while (and (not found) (< count len)) | |
| 1944 (setq suff (nth count viper-smart-suffix-list) | |
| 1945 count (1+ count)) | |
| 1946 (if (file-exists-p | |
| 1947 (format "%s%s" (substitute-in-file-name file) suff)) | |
| 1948 (progn | |
| 1949 (setq found t) | |
| 1950 (insert suff)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1951 |
| 19756 | 1952 (if found |
| 1953 () | |
| 1954 (viper-tmp-insert-at-eob " [Please complete file name]") | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1955 (unwind-protect |
| 19756 | 1956 (while (not (memq cmd |
| 1957 '(exit-minibuffer viper-exit-minibuffer))) | |
| 1958 (setq cmd | |
| 1959 (key-binding (setq key (read-key-sequence nil)))) | |
| 1960 (cond ((eq cmd 'self-insert-command) | |
| 1961 (if viper-xemacs-p | |
| 1962 (insert (events-to-keys key)) | |
| 1963 (insert key))) | |
| 1964 ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) | |
| 1965 nil) | |
| 1966 (t (command-execute cmd))) | |
| 1967 ))) | |
| 1968 )))) | |
| 1969 | |
| 1970 | |
| 1971 (defun viper-minibuffer-trim-tail () | |
| 1972 "Delete junk at the end of the first line of the minibuffer input. | |
| 1973 Remove this function from `viper-minibuffer-exit-hook', if this causes | |
| 1974 problems." | |
| 1975 (if (viper-is-in-minibuffer) | |
| 1976 (progn | |
|
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1977 (goto-char (viper-minibuffer-real-start)) |
| 19756 | 1978 (end-of-line) |
| 1979 (delete-region (point) (point-max))))) | |
| 1980 | |
| 18129 | 1981 |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1982 ;;; Reading string with history |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1983 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1984 (defun viper-read-string-with-history (prompt &optional initial |
| 20343 | 1985 history-var default keymap |
| 1986 init-message) | |
| 18129 | 1987 ;; Read string, prompting with PROMPT and inserting the INITIAL |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1988 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the |
| 20343 | 1989 ;; input is an empty string. |
| 18129 | 1990 ;; Default value is displayed until the user types something in the |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1991 ;; minibuffer. |
| 20343 | 1992 ;; KEYMAP is used, if given, instead of minibuffer-local-map. |
| 1993 ;; INIT-MESSAGE is the message temporarily displayed after entering the | |
| 1994 ;; minibuffer. | |
|
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
1995 (let ((minibuffer-setup-hook 'viper-minibuffer-standard-hook) |
| 18129 | 1996 (val "") |
| 1997 (padding "") | |
| 1998 temp-msg) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1999 |
| 18129 | 2000 (setq keymap (or keymap minibuffer-local-map) |
| 2001 initial (or initial "") | |
| 2002 temp-msg (if default | |
| 2003 (format "(default: %s) " default) | |
| 2004 "")) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2005 |
| 19078 | 2006 (setq viper-incomplete-ex-cmd nil) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2007 (setq val (read-from-minibuffer prompt |
| 18129 | 2008 (concat temp-msg initial val padding) |
| 2009 keymap nil history-var)) | |
| 2010 (setq minibuffer-setup-hook nil | |
| 19078 | 2011 padding (viper-array-to-string (this-command-keys)) |
| 18129 | 2012 temp-msg "") |
| 2013 ;; the following tries to be smart about what to put in history | |
| 2014 (if (not (string= val (car (eval history-var)))) | |
| 2015 (set history-var (cons val (eval history-var)))) | |
| 2016 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var))) | |
| 2017 (string= (nth 0 (eval history-var)) "")) | |
| 2018 (set history-var (cdr (eval history-var)))) | |
| 19078 | 2019 ;; If the user enters nothing but the prev cmd wasn't viper-ex, |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2020 ;; viper-command-argument, or `! shell-command', this probably means |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2021 ;; that the user typed something then erased. Return "" in this case, not |
| 18129 | 2022 ;; the default---the default is too confusing in this case. |
| 2023 (cond ((and (string= val "") | |
| 2024 (not (string= prompt "!")) ; was a `! shell-command' | |
| 2025 (not (memq last-command | |
| 19078 | 2026 '(viper-ex |
| 2027 viper-command-argument | |
| 18129 | 2028 t) |
| 2029 ))) | |
| 2030 "") | |
| 2031 ((string= val "") (or default "")) | |
| 2032 (t val)) | |
| 2033 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2034 |
| 18129 | 2035 |
| 2036 | |
| 2037 ;; insertion commands | |
| 2038 | |
| 2039 ;; Called when state changes from Insert Vi command mode. | |
| 2040 ;; Repeats the insertion command if Insert state was entered with prefix | |
| 2041 ;; argument > 1. | |
| 19078 | 2042 (defun viper-repeat-insert-command () |
| 2043 (let ((i-com (car viper-d-com)) | |
| 2044 (val (nth 1 viper-d-com)) | |
| 2045 (char (nth 2 viper-d-com))) | |
| 18129 | 2046 (if (and val (> val 1)) ; first check that val is non-nil |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2047 (progn |
| 19078 | 2048 (setq viper-d-com (list i-com (1- val) ?r nil nil nil)) |
| 2049 (viper-repeat nil) | |
| 2050 (setq viper-d-com (list i-com val char nil nil nil)) | |
| 18129 | 2051 )))) |
| 2052 | |
| 19078 | 2053 (defun viper-insert (arg) |
| 18129 | 2054 "Insert before point." |
| 2055 (interactive "P") | |
| 19078 | 2056 (viper-set-complex-command-for-undo) |
| 2057 (let ((val (viper-p-val arg)) | |
| 2058 (com (viper-getcom arg))) | |
| 2059 (viper-set-destructive-command (list 'viper-insert val ?r nil nil nil)) | |
| 18129 | 2060 (if com |
| 19078 | 2061 (viper-loop val (viper-yank-last-insertion)) |
| 2062 (viper-change-state-to-insert)))) | |
| 2063 | |
| 2064 (defun viper-append (arg) | |
| 18129 | 2065 "Append after point." |
| 2066 (interactive "P") | |
| 19078 | 2067 (viper-set-complex-command-for-undo) |
| 2068 (let ((val (viper-p-val arg)) | |
| 2069 (com (viper-getcom arg))) | |
| 2070 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil)) | |
| 18129 | 2071 (if (not (eolp)) (forward-char)) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2072 (if (viper= com ?r) |
| 19078 | 2073 (viper-loop val (viper-yank-last-insertion)) |
| 2074 (viper-change-state-to-insert)))) | |
| 2075 | |
| 2076 (defun viper-Append (arg) | |
| 18129 | 2077 "Append at end of line." |
| 2078 (interactive "P") | |
| 19078 | 2079 (viper-set-complex-command-for-undo) |
| 2080 (let ((val (viper-p-val arg)) | |
| 2081 (com (viper-getcom arg))) | |
| 2082 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil)) | |
| 18129 | 2083 (end-of-line) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2084 (if (viper= com ?r) |
| 19078 | 2085 (viper-loop val (viper-yank-last-insertion)) |
| 2086 (viper-change-state-to-insert)))) | |
| 2087 | |
| 2088 (defun viper-Insert (arg) | |
| 18129 | 2089 "Insert before first non-white." |
| 2090 (interactive "P") | |
| 19078 | 2091 (viper-set-complex-command-for-undo) |
| 2092 (let ((val (viper-p-val arg)) | |
| 2093 (com (viper-getcom arg))) | |
| 2094 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil)) | |
| 18129 | 2095 (back-to-indentation) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2096 (if (viper= com ?r) |
| 19078 | 2097 (viper-loop val (viper-yank-last-insertion)) |
| 2098 (viper-change-state-to-insert)))) | |
| 2099 | |
| 2100 (defun viper-open-line (arg) | |
| 18129 | 2101 "Open line below." |
| 2102 (interactive "P") | |
| 19078 | 2103 (viper-set-complex-command-for-undo) |
| 2104 (let ((val (viper-p-val arg)) | |
| 2105 (com (viper-getcom arg))) | |
| 2106 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil)) | |
| 18129 | 2107 (let ((col (current-indentation))) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2108 (if (viper= com ?r) |
| 19078 | 2109 (viper-loop val |
| 18129 | 2110 (end-of-line) |
| 2111 (newline 1) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2112 (if viper-auto-indent |
| 18129 | 2113 (progn |
| 19078 | 2114 (setq viper-cted t) |
| 2115 (if viper-electric-mode | |
| 18129 | 2116 (indent-according-to-mode) |
| 2117 (indent-to col)) | |
| 2118 )) | |
| 19462 | 2119 (viper-yank-last-insertion)) |
| 18129 | 2120 (end-of-line) |
| 2121 (newline 1) | |
| 19078 | 2122 (if viper-auto-indent |
| 18129 | 2123 (progn |
| 19078 | 2124 (setq viper-cted t) |
| 2125 (if viper-electric-mode | |
| 18129 | 2126 (indent-according-to-mode) |
| 2127 (indent-to col)))) | |
| 19078 | 2128 (viper-change-state-to-insert))))) |
| 2129 | |
| 2130 (defun viper-Open-line (arg) | |
| 18129 | 2131 "Open line above." |
| 2132 (interactive "P") | |
| 19078 | 2133 (viper-set-complex-command-for-undo) |
| 2134 (let ((val (viper-p-val arg)) | |
| 2135 (com (viper-getcom arg))) | |
| 2136 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil)) | |
| 18129 | 2137 (let ((col (current-indentation))) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2138 (if (viper= com ?r) |
| 19078 | 2139 (viper-loop val |
| 18129 | 2140 (beginning-of-line) |
| 2141 (open-line 1) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2142 (if viper-auto-indent |
| 18129 | 2143 (progn |
| 19078 | 2144 (setq viper-cted t) |
| 2145 (if viper-electric-mode | |
| 18129 | 2146 (indent-according-to-mode) |
| 2147 (indent-to col)) | |
| 2148 )) | |
| 19462 | 2149 (viper-yank-last-insertion)) |
| 18129 | 2150 (beginning-of-line) |
| 2151 (open-line 1) | |
| 19078 | 2152 (if viper-auto-indent |
| 18129 | 2153 (progn |
| 19078 | 2154 (setq viper-cted t) |
| 2155 (if viper-electric-mode | |
| 18129 | 2156 (indent-according-to-mode) |
| 2157 (indent-to col)) | |
| 2158 )) | |
| 19078 | 2159 (viper-change-state-to-insert))))) |
| 2160 | |
| 2161 (defun viper-open-line-at-point (arg) | |
| 18129 | 2162 "Open line at point." |
| 2163 (interactive "P") | |
| 19078 | 2164 (viper-set-complex-command-for-undo) |
| 2165 (let ((val (viper-p-val arg)) | |
| 2166 (com (viper-getcom arg))) | |
| 2167 (viper-set-destructive-command | |
| 2168 (list 'viper-open-line-at-point val ?r nil nil nil)) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2169 (if (viper= com ?r) |
| 19078 | 2170 (viper-loop val |
| 18129 | 2171 (open-line 1) |
| 19462 | 2172 (viper-yank-last-insertion)) |
| 18129 | 2173 (open-line 1) |
| 19078 | 2174 (viper-change-state-to-insert)))) |
| 2175 | |
| 2176 (defun viper-substitute (arg) | |
| 18129 | 2177 "Substitute characters." |
| 2178 (interactive "P") | |
| 19078 | 2179 (let ((val (viper-p-val arg)) |
| 2180 (com (viper-getcom arg))) | |
| 18129 | 2181 (push-mark nil t) |
| 2182 (forward-char val) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2183 (if (viper= com ?r) |
| 19078 | 2184 (viper-change-subr (mark t) (point)) |
| 2185 (viper-change (mark t) (point))) | |
| 2186 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) | |
| 18129 | 2187 )) |
| 2188 | |
| 19078 | 2189 ;; Command bound to S |
| 2190 (defun viper-substitute-line (arg) | |
| 18129 | 2191 "Substitute lines." |
| 2192 (interactive "p") | |
| 19078 | 2193 (viper-set-complex-command-for-undo) |
| 2194 (viper-line (cons arg ?C))) | |
| 18129 | 2195 |
| 2196 ;; Prepare for replace | |
| 19078 | 2197 (defun viper-start-replace () |
| 2198 (setq viper-began-as-replace t | |
| 2199 viper-sitting-in-replace t | |
| 19462 | 2200 viper-replace-chars-to-delete 0) |
| 21940 | 2201 (add-hook |
| 2202 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local) | |
| 2203 (add-hook | |
| 2204 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local) | |
| 18129 | 2205 ;; this will get added repeatedly, but no harm |
| 19078 | 2206 (add-hook 'after-change-functions 'viper-after-change-sentinel t) |
| 2207 (add-hook 'before-change-functions 'viper-before-change-sentinel t) | |
| 21940 | 2208 (viper-move-marker-locally |
| 2209 'viper-last-posn-in-replace-region (viper-replace-start)) | |
| 2210 (add-hook | |
| 2211 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel | |
| 2212 t 'local) | |
| 2213 (add-hook | |
| 2214 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
| 18129 | 2215 ;; guard against a smartie who switched from R-replace to normal replace |
| 21940 | 2216 (remove-hook |
| 2217 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
2218 (if overwrite-mode (overwrite-mode -1)) |
| 18129 | 2219 ) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2220 |
| 18129 | 2221 |
| 19078 | 2222 (defun viper-replace-mode-spy-before (beg end) |
| 19462 | 2223 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end)) |
| 2224 ) | |
| 2225 | |
| 2226 ;; Invoked as an after-change-function to calculate how many chars have to be | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2227 ;; deleted. This function may be called several times within a single command, |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2228 ;; if this command performs several separate buffer changes. Therefore, if |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2229 ;; adds up the number of chars inserted and subtracts the number of chars |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2230 ;; deleted. |
| 19078 | 2231 (defun viper-replace-mode-spy-after (beg end length) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2232 (if (memq viper-intermediate-command |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2233 '(dabbrev-expand hippie-expand repeating-insertion-from-ring)) |
| 19462 | 2234 ;; Take special care of text insertion from insertion ring inside |
| 2235 ;; replacement overlays. | |
| 18129 | 2236 (progn |
| 19078 | 2237 (setq viper-replace-chars-to-delete 0) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2238 (viper-move-marker-locally |
| 19078 | 2239 'viper-last-posn-in-replace-region (point))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2240 |
| 19462 | 2241 (let* ((real-end (min end (viper-replace-end))) |
| 2242 (column-shift (- (save-excursion (goto-char real-end) | |
| 2243 (current-column)) | |
| 2244 (save-excursion (goto-char beg) | |
| 2245 (current-column)))) | |
| 2246 (chars-deleted 0)) | |
| 2247 | |
| 2248 (if (> length 0) | |
| 2249 (setq chars-deleted viper-replace-region-chars-deleted)) | |
| 2250 (setq viper-replace-region-chars-deleted 0) | |
| 2251 (setq viper-replace-chars-to-delete | |
| 2252 (+ viper-replace-chars-to-delete | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2253 (- |
| 19462 | 2254 ;; if column shift is bigger, due to a TAB insertion, take |
| 2255 ;; column-shift instead of the number of inserted chars | |
| 2256 (max (viper-chars-in-region beg real-end) | |
| 2257 ;; This test accounts for Chinese/Japanese/... chars, | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2258 ;; which occupy 2 columns instead of one. If we use |
| 19462 | 2259 ;; column-shift here, we may delete two chars instead of |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2260 ;; one when the user types one Chinese character. |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2261 ;; Deleting two would be OK, if they were European chars, |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2262 ;; but it is not OK if they are Chinese chars. |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2263 ;; Since it is hard to |
| 19462 | 2264 ;; figure out which characters are being deleted in any |
| 2265 ;; given region, we decided to treat Eastern and European | |
| 2266 ;; characters equally, even though Eastern chars may | |
| 2267 ;; occupy more columns. | |
| 2268 (if (memq this-command '(self-insert-command | |
| 2269 quoted-insert viper-insert-tab)) | |
| 2270 column-shift | |
| 2271 0)) | |
| 2272 ;; the number of deleted chars | |
| 2273 chars-deleted))) | |
| 2274 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2275 (viper-move-marker-locally |
| 19078 | 2276 'viper-last-posn-in-replace-region |
| 19462 | 2277 (max (if (> end (viper-replace-end)) (viper-replace-end) end) |
| 19078 | 2278 (or (marker-position viper-last-posn-in-replace-region) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2279 (viper-replace-start)) |
| 18129 | 2280 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2281 |
| 18129 | 2282 ))) |
| 2283 | |
| 19462 | 2284 |
| 2285 ;; Delete stuff between viper-last-posn-in-replace-region and the end of | |
| 2286 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within | |
| 2287 ;; the overlay and current point is before the end of the overlay. | |
| 2288 ;; Don't delete anything if current point is past the end of the overlay. | |
| 2289 (defun viper-finish-change () | |
| 21940 | 2290 (remove-hook |
| 2291 'viper-after-change-functions 'viper-replace-mode-spy-after 'local) | |
| 2292 (remove-hook | |
| 2293 'viper-before-change-functions 'viper-replace-mode-spy-before 'local) | |
| 2294 (remove-hook | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2295 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) |
| 21940 | 2296 (remove-hook |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2297 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2298 (viper-restore-cursor-color 'after-replace-mode) |
| 19078 | 2299 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it |
| 18129 | 2300 (save-excursion |
| 19462 | 2301 (if (and viper-replace-overlay |
| 2302 (viper-pos-within-region viper-last-posn-in-replace-region | |
| 2303 (viper-replace-start) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2304 (viper-replace-end)) |
| 19462 | 2305 (< (point) (viper-replace-end))) |
| 2306 (delete-region | |
| 2307 viper-last-posn-in-replace-region (viper-replace-end)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2308 |
| 19078 | 2309 (if (eq viper-current-state 'replace-state) |
| 2310 (viper-downgrade-to-insert)) | |
| 2311 ;; replace mode ended => nullify viper-last-posn-in-replace-region | |
| 2312 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil) | |
| 2313 (viper-hide-replace-overlay) | |
| 2314 (viper-refresh-mode-line) | |
| 2315 (viper-put-string-on-kill-ring viper-last-replace-region) | |
| 18129 | 2316 ) |
| 2317 | |
| 2318 ;; Make STRING be the first element of the kill ring. | |
| 19078 | 2319 (defun viper-put-string-on-kill-ring (string) |
| 18129 | 2320 (setq kill-ring (cons string kill-ring)) |
| 2321 (if (> (length kill-ring) kill-ring-max) | |
| 2322 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)) | |
| 2323 (setq kill-ring-yank-pointer kill-ring)) | |
| 2324 | |
| 19078 | 2325 (defun viper-finish-R-mode () |
| 21940 | 2326 (remove-hook |
| 2327 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
| 2328 (remove-hook | |
| 2329 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) | |
| 19078 | 2330 (viper-downgrade-to-insert)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2331 |
| 19078 | 2332 (defun viper-start-R-mode () |
| 18129 | 2333 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number |
| 2334 (overwrite-mode 1) | |
| 21940 | 2335 (add-hook |
| 2336 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) | |
| 2337 (add-hook | |
| 2338 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
| 18129 | 2339 ;; guard against a smartie who switched from R-replace to normal replace |
| 21940 | 2340 (remove-hook |
| 2341 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) | |
| 18129 | 2342 ) |
| 2343 | |
| 2344 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2345 |
| 19078 | 2346 (defun viper-replace-state-exit-cmd () |
| 18129 | 2347 "Binding for keys that cause Replace state to switch to Vi or to Insert. |
| 2348 These keys are ESC, RET, and LineFeed" | |
| 2349 (interactive) | |
| 19462 | 2350 (if overwrite-mode ; if in replace mode invoked via 'R' |
| 19078 | 2351 (viper-finish-R-mode) |
| 19462 | 2352 (viper-finish-change)) |
| 18129 | 2353 (let (com) |
| 19078 | 2354 (if (eq this-command 'viper-intercept-ESC-key) |
| 2355 (setq com 'viper-exit-insert-state) | |
| 2356 (viper-set-unread-command-events last-input-char) | |
| 18129 | 2357 (setq com (key-binding (read-key-sequence nil)))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2358 |
| 18129 | 2359 (condition-case conds |
| 2360 (command-execute com) | |
| 2361 (error | |
| 19078 | 2362 (viper-message-conditions conds))) |
| 18129 | 2363 ) |
| 19078 | 2364 (viper-hide-replace-overlay)) |
| 2365 | |
| 2366 | |
| 2367 (defun viper-replace-state-carriage-return () | |
| 2368 "Carriage return in Viper replace state." | |
| 18129 | 2369 (interactive) |
| 2370 ;; If Emacs start supporting overlay maps, as it currently supports | |
| 19078 | 2371 ;; text-property maps, we could do away with viper-replace-minor-mode and |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2372 ;; just have keymap attached to replace overlay. Then the "if part" of this |
| 18129 | 2373 ;; statement can be deleted. |
| 19078 | 2374 (if (or (< (point) (viper-replace-start)) |
| 2375 (> (point) (viper-replace-end))) | |
| 2376 (let (viper-replace-minor-mode com) | |
| 2377 (viper-set-unread-command-events last-input-char) | |
| 18129 | 2378 (setq com (key-binding (read-key-sequence nil))) |
| 2379 (condition-case conds | |
| 2380 (command-execute com) | |
| 2381 (error | |
| 19078 | 2382 (viper-message-conditions conds)))) |
| 2383 (if (not viper-allow-multiline-replace-regions) | |
| 2384 (viper-replace-state-exit-cmd) | |
| 2385 (if (viper-same-line (point) (viper-replace-end)) | |
| 2386 (viper-replace-state-exit-cmd) | |
| 2387 ;; delete the rest of line | |
| 2388 (delete-region (point) (viper-line-pos 'end)) | |
| 2389 (save-excursion | |
| 2390 (end-of-line) | |
| 2391 (if (eobp) (error "Last line in buffer"))) | |
| 2392 ;; skip to the next line | |
| 2393 (forward-line 1) | |
| 2394 (back-to-indentation) | |
| 2395 )))) | |
| 18129 | 2396 |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2397 |
| 18129 | 2398 ;; This is the function bound to 'R'---unlimited replace. |
| 2399 ;; Similar to Emacs's own overwrite-mode. | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2400 (defun viper-overwrite (arg) |
| 18129 | 2401 "Begin overwrite mode." |
| 2402 (interactive "P") | |
| 19078 | 2403 (let ((val (viper-p-val arg)) |
| 2404 (com (viper-getcom arg)) (len)) | |
| 2405 (viper-set-destructive-command (list 'viper-overwrite val ?r nil nil nil)) | |
| 18129 | 2406 (if com |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2407 (progn |
| 19078 | 2408 ;; Viper saves inserted text in viper-last-insertion |
| 2409 (setq len (length viper-last-insertion)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2410 (delete-char len) |
| 19078 | 2411 (viper-loop val (viper-yank-last-insertion))) |
| 2412 (setq last-command 'viper-overwrite) | |
| 2413 (viper-set-complex-command-for-undo) | |
| 2414 (viper-set-replace-overlay (point) (viper-line-pos 'end)) | |
| 2415 (viper-change-state-to-replace) | |
| 18129 | 2416 ))) |
| 2417 | |
| 2418 | |
| 2419 ;; line commands | |
| 2420 | |
| 19078 | 2421 (defun viper-line (arg) |
| 18129 | 2422 (let ((val (car arg)) |
| 2423 (com (cdr arg))) | |
| 19078 | 2424 (viper-move-marker-locally 'viper-com-point (point)) |
| 18129 | 2425 (if (not (eobp)) |
| 19078 | 2426 (viper-next-line-carefully (1- val))) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2427 ;; the following ensures that dd, cc, D, yy will do the right thing on the |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2428 ;; last line of buffer when this line has no \n. |
| 19078 | 2429 (viper-add-newline-at-eob-if-necessary) |
| 2430 (viper-execute-com 'viper-line val com)) | |
| 18129 | 2431 (if (and (eobp) (not (bobp))) (forward-line -1)) |
| 2432 ) | |
| 2433 | |
| 19078 | 2434 (defun viper-yank-line (arg) |
| 18129 | 2435 "Yank ARG lines (in Vi's sense)." |
| 2436 (interactive "P") | |
| 19078 | 2437 (let ((val (viper-p-val arg))) |
| 2438 (viper-line (cons val ?Y)))) | |
| 18129 | 2439 |
| 2440 | |
| 2441 ;; region commands | |
| 2442 | |
| 19078 | 2443 (defun viper-region (arg) |
| 18129 | 2444 "Execute command on a region." |
| 2445 (interactive "P") | |
| 19078 | 2446 (let ((val (viper-P-val arg)) |
| 2447 (com (viper-getcom arg))) | |
| 2448 (viper-move-marker-locally 'viper-com-point (point)) | |
| 18129 | 2449 (exchange-point-and-mark) |
| 19078 | 2450 (viper-execute-com 'viper-region val com))) |
| 2451 | |
| 2452 (defun viper-Region (arg) | |
| 18129 | 2453 "Execute command on a Region." |
| 2454 (interactive "P") | |
| 19078 | 2455 (let ((val (viper-P-val arg)) |
| 2456 (com (viper-getCom arg))) | |
| 2457 (viper-move-marker-locally 'viper-com-point (point)) | |
| 18129 | 2458 (exchange-point-and-mark) |
| 19078 | 2459 (viper-execute-com 'viper-Region val com))) |
| 2460 | |
| 2461 (defun viper-replace-char (arg) | |
| 18129 | 2462 "Replace the following ARG chars by the character read." |
| 2463 (interactive "P") | |
| 2464 (if (and (eolp) (bolp)) (error "No character to replace here")) | |
| 19078 | 2465 (let ((val (viper-p-val arg)) |
| 2466 (com (viper-getcom arg))) | |
| 2467 (viper-replace-char-subr com val) | |
| 18129 | 2468 (if (and (eolp) (not (bolp))) (forward-char 1)) |
| 19462 | 2469 (setq viper-this-command-keys |
| 2470 (format "%sr" (if (integerp arg) arg ""))) | |
| 19078 | 2471 (viper-set-destructive-command |
| 2472 (list 'viper-replace-char val ?r nil viper-d-char nil)) | |
| 18129 | 2473 )) |
| 2474 | |
| 19078 | 2475 (defun viper-replace-char-subr (com arg) |
| 19462 | 2476 (let (char) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2477 (setq char (if (viper= com ?r) |
| 19078 | 2478 viper-d-char |
| 18129 | 2479 (read-char))) |
| 19462 | 2480 (let (inhibit-quit) ; preserve consistency of undo-list and iso-accents |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2481 (if (and viper-automatic-iso-accents |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2482 (viper-memq-char char '(?' ?\" ?^ ?~))) |
| 19462 | 2483 ;; get European characters |
| 2484 (progn | |
| 2485 (viper-set-iso-accents-mode t) | |
| 2486 (viper-set-unread-command-events char) | |
| 2487 (setq char (aref (read-key-sequence nil) 0)) | |
| 2488 (viper-set-iso-accents-mode nil))) | |
| 2489 (viper-set-complex-command-for-undo) | |
| 2490 (if (eq char ?\C-m) (setq char ?\n)) | |
| 2491 (if (and viper-special-input-method (fboundp 'quail-start-translation)) | |
| 2492 ;; get Intl. characters | |
| 2493 (progn | |
| 2494 (viper-set-input-method t) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2495 (setq last-command-event |
| 19462 | 2496 (viper-copy-event |
| 2497 (if viper-xemacs-p (character-to-event char) char))) | |
| 2498 (delete-char 1 t) | |
| 2499 (condition-case nil | |
| 2500 (if com | |
| 2501 (insert char) | |
| 2502 (if viper-emacs-p | |
| 2503 (quail-start-translation 1) | |
| 2504 (quail-start-translation))) | |
| 2505 (error)) | |
| 2506 ;; quail translation failed | |
| 2507 (if (and (not (stringp quail-current-str)) | |
| 2508 (not (viper-characterp quail-current-str))) | |
| 2509 (progn | |
| 2510 (viper-adjust-undo) | |
| 2511 (undo-start) | |
| 2512 (undo-more 1) | |
| 2513 (viper-set-input-method nil) | |
| 2514 (error "Composing character failed, changes undone"))) | |
| 2515 ;; quail translation seems ok | |
| 2516 (or com | |
| 2517 ;;(setq char quail-current-str)) | |
| 2518 (setq char (viper-char-at-pos 'backward))) | |
| 2519 (setq viper-d-char char) | |
| 2520 (viper-loop (1- (if (> arg 0) arg (- arg))) | |
| 2521 (delete-char 1 t) | |
| 2522 (insert char)) | |
| 2523 (viper-set-input-method nil)) | |
| 2524 (delete-char arg t) | |
| 2525 (setq viper-d-char char) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2526 (viper-loop (if (> arg 0) arg (- arg)) |
| 19462 | 2527 (insert char))) |
| 2528 (viper-adjust-undo) | |
| 2529 (backward-char arg)))) | |
| 18129 | 2530 |
| 2531 | |
| 2532 ;; basic cursor movement. j, k, l, h commands. | |
| 2533 | |
| 19078 | 2534 (defun viper-forward-char (arg) |
| 18129 | 2535 "Move point right ARG characters (left if ARG negative). |
| 2536 On reaching end of line, stop and signal error." | |
| 2537 (interactive "P") | |
| 19078 | 2538 (viper-leave-region-active) |
| 2539 (let ((val (viper-p-val arg)) | |
| 2540 (com (viper-getcom arg))) | |
| 2541 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2542 (if viper-ex-style-motion | |
| 18129 | 2543 (progn |
| 2544 ;; the boundary condition check gets weird here because | |
| 2545 ;; forward-char may be the parameter of a delete, and 'dl' works | |
| 2546 ;; just like 'x' for the last char on a line, so we have to allow | |
| 19078 | 2547 ;; the forward motion before the 'viper-execute-com', but, of |
| 18129 | 2548 ;; course, 'dl' doesn't work on an empty line, so we have to |
| 19078 | 2549 ;; catch that condition before 'viper-execute-com' |
| 18129 | 2550 (if (and (eolp) (bolp)) (error "") (forward-char val)) |
| 19078 | 2551 (if com (viper-execute-com 'viper-forward-char val com)) |
| 18129 | 2552 (if (eolp) (progn (backward-char 1) (error "")))) |
| 2553 (forward-char val) | |
| 19078 | 2554 (if com (viper-execute-com 'viper-forward-char val com))))) |
| 2555 | |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2556 |
| 19078 | 2557 (defun viper-backward-char (arg) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2558 "Move point left ARG characters (right if ARG negative). |
| 18129 | 2559 On reaching beginning of line, stop and signal error." |
| 2560 (interactive "P") | |
| 19078 | 2561 (viper-leave-region-active) |
| 2562 (let ((val (viper-p-val arg)) | |
| 2563 (com (viper-getcom arg))) | |
| 2564 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2565 (if viper-ex-style-motion | |
| 18129 | 2566 (progn |
| 2567 (if (bolp) (error "") (backward-char val)) | |
| 19078 | 2568 (if com (viper-execute-com 'viper-backward-char val com))) |
| 18129 | 2569 (backward-char val) |
| 19078 | 2570 (if com (viper-execute-com 'viper-backward-char val com))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2571 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2572 |
| 18129 | 2573 ;; Like forward-char, but doesn't move at end of buffer. |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2574 ;; Returns distance traveled |
| 19462 | 2575 ;; (positive or 0, if arg positive; negative if arg negative). |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2576 (defun viper-forward-char-carefully (&optional arg) |
| 18129 | 2577 (setq arg (or arg 1)) |
| 19462 | 2578 (let ((pt (point))) |
| 2579 (condition-case nil | |
| 2580 (forward-char arg) | |
| 2581 (error)) | |
| 2582 (if (< (point) pt) ; arg was negative | |
| 2583 (- (viper-chars-in-region pt (point))) | |
| 2584 (viper-chars-in-region pt (point))))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2585 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2586 |
| 19462 | 2587 ;; Like backward-char, but doesn't move at beg of buffer. |
| 2588 ;; Returns distance traveled | |
| 2589 ;; (negative or 0, if arg positive; positive if arg negative). | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2590 (defun viper-backward-char-carefully (&optional arg) |
| 18129 | 2591 (setq arg (or arg 1)) |
| 19462 | 2592 (let ((pt (point))) |
| 2593 (condition-case nil | |
| 2594 (backward-char arg) | |
| 2595 (error)) | |
| 2596 (if (> (point) pt) ; arg was negative | |
| 2597 (viper-chars-in-region pt (point)) | |
| 2598 (- (viper-chars-in-region pt (point)))))) | |
| 18129 | 2599 |
| 19078 | 2600 (defun viper-next-line-carefully (arg) |
| 18129 | 2601 (condition-case nil |
| 2602 (next-line arg) | |
| 2603 (error nil))) | |
| 2604 | |
| 2605 | |
| 2606 | |
| 2607 ;;; Word command | |
| 2608 | |
| 19078 | 2609 ;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators for |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2610 ;; word movement. When executed with a destructive command, \n is usually left |
| 19078 | 2611 ;; untouched for the last word. Viper uses syntax table to determine what is a |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2612 ;; word and what is a separator. However, \n is always a separator. Also, if |
| 19078 | 2613 ;; viper-syntax-preference is 'vi, then `_' is part of the word. |
| 18129 | 2614 |
| 2615 ;; skip only one \n | |
| 19078 | 2616 (defun viper-skip-separators (forward) |
| 18129 | 2617 (if forward |
| 2618 (progn | |
| 19078 | 2619 (viper-skip-all-separators-forward 'within-line) |
| 18129 | 2620 (if (looking-at "\n") |
| 2621 (progn | |
| 2622 (forward-char) | |
| 19078 | 2623 (viper-skip-all-separators-forward 'within-line)))) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2624 ;; check for eob and white space before it. move off of eob |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2625 (if (and (eobp) (save-excursion |
|
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2626 (viper-backward-char-carefully) |
|
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2627 (viper-looking-at-separator))) |
|
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2628 (viper-backward-char-carefully)) |
| 19078 | 2629 (viper-skip-all-separators-backward 'within-line) |
| 19462 | 2630 (viper-backward-char-carefully) |
| 18129 | 2631 (if (looking-at "\n") |
| 19078 | 2632 (viper-skip-all-separators-backward 'within-line) |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2633 (or (bobp) (forward-char))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2634 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2635 |
| 19078 | 2636 (defun viper-forward-word-kernel (val) |
| 18129 | 2637 (while (> val 0) |
| 19078 | 2638 (cond ((viper-looking-at-alpha) |
| 2639 (viper-skip-alpha-forward "_") | |
| 2640 (viper-skip-separators t)) | |
| 2641 ((viper-looking-at-separator) | |
| 2642 (viper-skip-separators t)) | |
| 2643 ((not (viper-looking-at-alphasep)) | |
| 2644 (viper-skip-nonalphasep-forward) | |
| 2645 (viper-skip-separators t))) | |
| 18129 | 2646 (setq val (1- val)))) |
| 2647 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2648 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is |
| 19462 | 2649 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM. |
| 2650 (defun viper-separator-skipback-special (twice lim) | |
| 2651 (let ((prev-char (viper-char-at-pos 'backward)) | |
| 2652 (saved-point (point))) | |
| 2653 ;; skip non-newline separators backward | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2654 (while (and (not (viper-memq-char prev-char '(nil \n))) |
| 19462 | 2655 (< lim (point)) |
| 2656 ;; must be non-newline separator | |
| 2657 (if (eq viper-syntax-preference 'strict-vi) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2658 (viper-memq-char prev-char '(?\ ?\t)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2659 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
| 19462 | 2660 (viper-backward-char-carefully) |
| 2661 (setq prev-char (viper-char-at-pos 'backward))) | |
| 2662 | |
| 2663 (if (and (< lim (point)) (eq prev-char ?\n)) | |
| 2664 (backward-char) | |
| 2665 ;; If we skipped to the next word and the prefix of this line doesn't | |
| 2666 ;; consist of separators preceded by a newline, then don't skip backwards | |
| 2667 ;; at all. | |
| 2668 (goto-char saved-point)) | |
| 2669 (setq prev-char (viper-char-at-pos 'backward)) | |
| 2670 | |
| 2671 ;; skip again, but make sure we don't overshoot the limit | |
| 2672 (if twice | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2673 (while (and (not (viper-memq-char prev-char '(nil \n))) |
| 19462 | 2674 (< lim (point)) |
| 2675 ;; must be non-newline separator | |
| 2676 (if (eq viper-syntax-preference 'strict-vi) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2677 (viper-memq-char prev-char '(?\ ?\t)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2678 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
| 19462 | 2679 (viper-backward-char-carefully) |
| 2680 (setq prev-char (viper-char-at-pos 'backward)))) | |
| 2681 | |
| 2682 (if (= (point) lim) | |
| 2683 (viper-forward-char-carefully)) | |
| 2684 )) | |
| 18129 | 2685 |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2686 |
| 19078 | 2687 (defun viper-forward-word (arg) |
| 18129 | 2688 "Forward word." |
| 2689 (interactive "P") | |
| 19078 | 2690 (viper-leave-region-active) |
| 2691 (let ((val (viper-p-val arg)) | |
| 2692 (com (viper-getcom arg))) | |
| 2693 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2694 (viper-forward-word-kernel val) | |
| 18129 | 2695 (if com (progn |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2696 (cond ((viper-memq-char com (list ?c (- ?c))) |
| 19462 | 2697 (viper-separator-skipback-special 'twice viper-com-point)) |
| 18129 | 2698 ;; Yank words including the whitespace, but not newline |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2699 ((viper-memq-char com (list ?y (- ?y))) |
| 19462 | 2700 (viper-separator-skipback-special nil viper-com-point)) |
| 19078 | 2701 ((viper-dotable-command-p com) |
| 19462 | 2702 (viper-separator-skipback-special nil viper-com-point))) |
| 19078 | 2703 (viper-execute-com 'viper-forward-word val com))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2704 |
| 18129 | 2705 |
| 19078 | 2706 (defun viper-forward-Word (arg) |
| 18129 | 2707 "Forward word delimited by white characters." |
| 2708 (interactive "P") | |
| 19078 | 2709 (viper-leave-region-active) |
| 2710 (let ((val (viper-p-val arg)) | |
| 2711 (com (viper-getcom arg))) | |
| 2712 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2713 (viper-loop val | |
| 2714 (viper-skip-nonseparators 'forward) | |
| 19462 | 2715 (viper-skip-separators t)) |
| 18129 | 2716 (if com (progn |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2717 (cond ((viper-memq-char com (list ?c (- ?c))) |
| 19462 | 2718 (viper-separator-skipback-special 'twice viper-com-point)) |
| 18129 | 2719 ;; Yank words including the whitespace, but not newline |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2720 ((viper-memq-char com (list ?y (- ?y))) |
| 19462 | 2721 (viper-separator-skipback-special nil viper-com-point)) |
| 19078 | 2722 ((viper-dotable-command-p com) |
| 19462 | 2723 (viper-separator-skipback-special nil viper-com-point))) |
| 19078 | 2724 (viper-execute-com 'viper-forward-Word val com))))) |
| 18129 | 2725 |
| 2726 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2727 ;; this is a bit different from Vi, but Vi's end of word |
| 18129 | 2728 ;; makes no sense whatsoever |
| 19078 | 2729 (defun viper-end-of-word-kernel () |
| 2730 (if (viper-end-of-word-p) (forward-char)) | |
| 2731 (if (viper-looking-at-separator) | |
| 2732 (viper-skip-all-separators-forward)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2733 |
| 19078 | 2734 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_")) |
| 2735 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward))) | |
| 2736 (viper-backward-char-carefully)) | |
| 2737 | |
| 2738 (defun viper-end-of-word-p () | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2739 (or (eobp) |
| 18129 | 2740 (save-excursion |
| 19078 | 2741 (cond ((viper-looking-at-alpha) |
| 18129 | 2742 (forward-char) |
| 19078 | 2743 (not (viper-looking-at-alpha))) |
| 2744 ((not (viper-looking-at-alphasep)) | |
| 18129 | 2745 (forward-char) |
| 19078 | 2746 (viper-looking-at-alphasep)))))) |
| 2747 | |
| 2748 | |
| 2749 (defun viper-end-of-word (arg &optional careful) | |
| 18129 | 2750 "Move point to end of current word." |
| 2751 (interactive "P") | |
| 19078 | 2752 (viper-leave-region-active) |
| 2753 (let ((val (viper-p-val arg)) | |
| 2754 (com (viper-getcom arg))) | |
| 2755 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2756 (viper-loop val (viper-end-of-word-kernel)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2757 (if com |
| 18129 | 2758 (progn |
| 2759 (forward-char) | |
| 19078 | 2760 (viper-execute-com 'viper-end-of-word val com))))) |
| 2761 | |
| 2762 (defun viper-end-of-Word (arg) | |
| 18129 | 2763 "Forward to end of word delimited by white character." |
| 2764 (interactive "P") | |
| 19078 | 2765 (viper-leave-region-active) |
| 2766 (let ((val (viper-p-val arg)) | |
| 2767 (com (viper-getcom arg))) | |
| 2768 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 2769 (viper-loop val | |
| 2770 (viper-end-of-word-kernel) | |
| 2771 (viper-skip-nonseparators 'forward) | |
| 19462 | 2772 (backward-char)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2773 (if com |
| 18129 | 2774 (progn |
| 2775 (forward-char) | |
| 19078 | 2776 (viper-execute-com 'viper-end-of-Word val com))))) |
| 2777 | |
| 2778 (defun viper-backward-word-kernel (val) | |
| 18129 | 2779 (while (> val 0) |
| 19462 | 2780 (viper-backward-char-carefully) |
| 19078 | 2781 (cond ((viper-looking-at-alpha) |
| 2782 (viper-skip-alpha-backward "_")) | |
| 2783 ((viper-looking-at-separator) | |
| 18129 | 2784 (forward-char) |
| 19078 | 2785 (viper-skip-separators nil) |
| 19462 | 2786 (viper-backward-char-carefully) |
| 19078 | 2787 (cond ((viper-looking-at-alpha) |
| 2788 (viper-skip-alpha-backward "_")) | |
| 2789 ((not (viper-looking-at-alphasep)) | |
| 2790 (viper-skip-nonalphasep-backward)) | |
| 19462 | 2791 ((bobp)) ; could still be at separator, but at beg of buffer |
| 18129 | 2792 (t (forward-char)))) |
| 19078 | 2793 ((not (viper-looking-at-alphasep)) |
| 2794 (viper-skip-nonalphasep-backward))) | |
| 18129 | 2795 (setq val (1- val)))) |
| 2796 | |
| 19078 | 2797 (defun viper-backward-word (arg) |
| 18129 | 2798 "Backward word." |
| 2799 (interactive "P") | |
| 19078 | 2800 (viper-leave-region-active) |
| 2801 (let ((val (viper-p-val arg)) | |
| 2802 (com (viper-getcom arg))) | |
| 18129 | 2803 (if com |
| 2804 (let (i) | |
| 2805 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
| 2806 (backward-char)) | |
| 19078 | 2807 (viper-move-marker-locally 'viper-com-point (point)) |
| 18129 | 2808 (if i (forward-char)))) |
| 19078 | 2809 (viper-backward-word-kernel val) |
| 2810 (if com (viper-execute-com 'viper-backward-word val com)))) | |
| 2811 | |
| 2812 (defun viper-backward-Word (arg) | |
| 18129 | 2813 "Backward word delimited by white character." |
| 2814 (interactive "P") | |
| 19078 | 2815 (viper-leave-region-active) |
| 2816 (let ((val (viper-p-val arg)) | |
| 2817 (com (viper-getcom arg))) | |
| 18129 | 2818 (if com |
| 2819 (let (i) | |
| 2820 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
| 2821 (backward-char)) | |
| 19078 | 2822 (viper-move-marker-locally 'viper-com-point (point)) |
| 18129 | 2823 (if i (forward-char)))) |
| 19078 | 2824 (viper-loop val |
| 19462 | 2825 (viper-skip-separators nil) ; nil means backward here |
| 2826 (viper-skip-nonseparators 'backward)) | |
| 19078 | 2827 (if com (viper-execute-com 'viper-backward-Word val com)))) |
| 18129 | 2828 |
| 2829 | |
| 2830 | |
| 2831 ;; line commands | |
| 2832 | |
| 19078 | 2833 (defun viper-beginning-of-line (arg) |
| 18129 | 2834 "Go to beginning of line." |
| 2835 (interactive "P") | |
| 19078 | 2836 (viper-leave-region-active) |
| 2837 (let ((val (viper-p-val arg)) | |
| 2838 (com (viper-getcom arg))) | |
| 2839 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2840 (beginning-of-line val) |
| 19078 | 2841 (if com (viper-execute-com 'viper-beginning-of-line val com)))) |
| 2842 | |
| 2843 (defun viper-bol-and-skip-white (arg) | |
| 18129 | 2844 "Beginning of line at first non-white character." |
| 2845 (interactive "P") | |
| 19078 | 2846 (viper-leave-region-active) |
| 2847 (let ((val (viper-p-val arg)) | |
| 2848 (com (viper-getcom arg))) | |
| 2849 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2850 (forward-to-indentation (1- val)) |
| 19078 | 2851 (if com (viper-execute-com 'viper-bol-and-skip-white val com)))) |
| 2852 | |
| 2853 (defun viper-goto-eol (arg) | |
| 18129 | 2854 "Go to end of line." |
| 2855 (interactive "P") | |
| 19078 | 2856 (viper-leave-region-active) |
| 2857 (let ((val (viper-p-val arg)) | |
| 2858 (com (viper-getcom arg))) | |
| 2859 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2860 (end-of-line val) |
| 19078 | 2861 (if com (viper-execute-com 'viper-goto-eol val com)) |
| 2862 (if viper-ex-style-motion | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2863 (if (and (eolp) (not (bolp)) |
| 19078 | 2864 ;; a fix for viper-change-to-eol |
| 2865 (not (equal viper-current-state 'insert-state))) | |
| 18129 | 2866 (backward-char 1) |
| 2867 )))) | |
| 2868 | |
| 2869 | |
| 19078 | 2870 (defun viper-goto-col (arg) |
| 18129 | 2871 "Go to ARG's column." |
| 2872 (interactive "P") | |
| 19078 | 2873 (viper-leave-region-active) |
| 2874 (let ((val (viper-p-val arg)) | |
| 2875 (com (viper-getcom arg)) | |
| 18129 | 2876 line-len) |
| 19462 | 2877 (setq line-len |
| 2878 (viper-chars-in-region | |
| 2879 (viper-line-pos 'start) (viper-line-pos 'end))) | |
| 19078 | 2880 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 18129 | 2881 (beginning-of-line) |
| 2882 (forward-char (1- (min line-len val))) | |
| 2883 (while (> (current-column) (1- val)) | |
| 2884 (backward-char 1)) | |
| 19078 | 2885 (if com (viper-execute-com 'viper-goto-col val com)) |
| 18129 | 2886 (save-excursion |
| 2887 (end-of-line) | |
| 2888 (if (> val (current-column)) (error ""))) | |
| 2889 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2890 |
| 18129 | 2891 |
| 19078 | 2892 (defun viper-next-line (arg) |
| 18129 | 2893 "Go to next line." |
| 2894 (interactive "P") | |
| 19078 | 2895 (viper-leave-region-active) |
| 2896 (let ((val (viper-p-val arg)) | |
| 2897 (com (viper-getCom arg))) | |
| 2898 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2899 (next-line val) |
| 19078 | 2900 (if viper-ex-style-motion |
| 18129 | 2901 (if (and (eolp) (not (bolp))) (backward-char 1))) |
| 2902 (setq this-command 'next-line) | |
| 19078 | 2903 (if com (viper-execute-com 'viper-next-line val com)))) |
| 2904 | |
| 2905 (defun viper-next-line-at-bol (arg) | |
| 18129 | 2906 "Next line at beginning of line." |
| 2907 (interactive "P") | |
| 19078 | 2908 (viper-leave-region-active) |
| 18129 | 2909 (save-excursion |
| 2910 (end-of-line) | |
| 2911 (if (eobp) (error "Last line in buffer"))) | |
| 19078 | 2912 (let ((val (viper-p-val arg)) |
| 2913 (com (viper-getCom arg))) | |
| 2914 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2915 (forward-line val) |
| 2916 (back-to-indentation) | |
| 19078 | 2917 (if com (viper-execute-com 'viper-next-line-at-bol val com)))) |
| 2918 | |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2919 |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2920 (defun viper-previous-line (arg) |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2921 "Go to previous line." |
| 18129 | 2922 (interactive "P") |
| 19078 | 2923 (viper-leave-region-active) |
| 2924 (let ((val (viper-p-val arg)) | |
| 2925 (com (viper-getCom arg))) | |
| 2926 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2927 (previous-line val) |
| 19078 | 2928 (if viper-ex-style-motion |
| 18129 | 2929 (if (and (eolp) (not (bolp))) (backward-char 1))) |
| 2930 (setq this-command 'previous-line) | |
| 19078 | 2931 (if com (viper-execute-com 'viper-previous-line val com)))) |
| 2932 | |
| 2933 | |
| 2934 (defun viper-previous-line-at-bol (arg) | |
| 18129 | 2935 "Previous line at beginning of line." |
| 2936 (interactive "P") | |
| 19078 | 2937 (viper-leave-region-active) |
| 18129 | 2938 (save-excursion |
| 2939 (beginning-of-line) | |
| 2940 (if (bobp) (error "First line in buffer"))) | |
| 19078 | 2941 (let ((val (viper-p-val arg)) |
| 2942 (com (viper-getCom arg))) | |
| 2943 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 2944 (forward-line (- val)) |
| 2945 (back-to-indentation) | |
| 19078 | 2946 (if com (viper-execute-com 'viper-previous-line val com)))) |
| 2947 | |
| 2948 (defun viper-change-to-eol (arg) | |
| 18129 | 2949 "Change to end of line." |
| 2950 (interactive "P") | |
| 19078 | 2951 (viper-goto-eol (cons arg ?c))) |
| 2952 | |
| 2953 (defun viper-kill-line (arg) | |
| 18129 | 2954 "Delete line." |
| 2955 (interactive "P") | |
| 19078 | 2956 (viper-goto-eol (cons arg ?d))) |
| 2957 | |
| 2958 (defun viper-erase-line (arg) | |
| 18129 | 2959 "Erase line." |
| 2960 (interactive "P") | |
| 19078 | 2961 (viper-beginning-of-line (cons arg ?d))) |
| 18129 | 2962 |
| 2963 | |
| 2964 ;;; Moving around | |
| 2965 | |
| 19078 | 2966 (defun viper-goto-line (arg) |
| 18129 | 2967 "Go to ARG's line. Without ARG go to end of buffer." |
| 2968 (interactive "P") | |
| 19078 | 2969 (let ((val (viper-P-val arg)) |
| 2970 (com (viper-getCom arg))) | |
| 2971 (viper-move-marker-locally 'viper-com-point (point)) | |
| 2972 (viper-deactivate-mark) | |
| 18129 | 2973 (push-mark nil t) |
| 2974 (if (null val) | |
| 2975 (goto-char (point-max)) | |
| 2976 (goto-char (point-min)) | |
| 2977 (forward-line (1- val))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2978 |
| 18129 | 2979 ;; positioning is done twice: before and after command execution |
| 2980 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
| 2981 (back-to-indentation) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2982 |
| 19078 | 2983 (if com (viper-execute-com 'viper-goto-line val com)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2984 |
| 18129 | 2985 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
| 2986 (back-to-indentation) | |
| 2987 )) | |
| 2988 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2989 ;; Find ARG's occurrence of CHAR on the current line. |
| 18129 | 2990 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to |
| 2991 ;; adjust point after search. | |
| 19078 | 2992 (defun viper-find-char (arg char forward offset) |
| 18129 | 2993 (or (char-or-string-p char) (error "")) |
| 2994 (let ((arg (if forward arg (- arg))) | |
| 19078 | 2995 (cmd (if (eq viper-intermediate-command 'viper-repeat) |
| 2996 (nth 5 viper-d-com) | |
| 2997 (viper-array-to-string (this-command-keys)))) | |
| 21940 | 2998 point region-beg region-end) |
| 18129 | 2999 (save-excursion |
| 3000 (save-restriction | |
| 21940 | 3001 (if (> arg 0) ; forward |
| 3002 (progn | |
| 3003 (setq region-beg (point)) | |
| 3004 (if viper-allow-multiline-replace-regions | |
| 3005 (viper-forward-paragraph 1) | |
| 3006 (end-of-line)) | |
| 3007 (setq region-end (point))) | |
| 3008 (setq region-end (point)) | |
| 3009 (if viper-allow-multiline-replace-regions | |
| 3010 (viper-backward-paragraph 1) | |
| 3011 (beginning-of-line)) | |
| 3012 (setq region-beg (point))) | |
| 3013 (if (or (and (< arg 0) | |
| 3014 (< (- region-end region-beg) | |
| 3015 (if viper-allow-multiline-replace-regions | |
| 3016 2 1)) | |
| 3017 (bolp)) | |
| 3018 (and (> arg 0) | |
| 3019 (< (- region-end region-beg) | |
| 3020 (if viper-allow-multiline-replace-regions | |
| 3021 3 2)) | |
| 3022 (eolp))) | |
| 3023 (error "Command `%s': At %s of %s" | |
| 3024 cmd | |
| 3025 (if (> arg 0) "end" "beginning") | |
| 3026 (if viper-allow-multiline-replace-regions | |
| 3027 "paragraph" "line"))) | |
| 3028 (narrow-to-region region-beg region-end) | |
| 18129 | 3029 ;; if arg > 0, point is forwarded before search. |
| 3030 (if (> arg 0) (goto-char (1+ (point-min))) | |
| 3031 (goto-char (point-max))) | |
| 3032 (if (let ((case-fold-search nil)) | |
| 3033 (search-forward (char-to-string char) nil 0 arg)) | |
| 3034 (setq point (point)) | |
| 3035 (error "Command `%s': `%c' not found" cmd char)))) | |
| 19462 | 3036 (goto-char point) |
| 3037 (if (> arg 0) | |
| 3038 (backward-char (if offset 2 1)) | |
| 3039 (forward-char (if offset 1 0))))) | |
| 18129 | 3040 |
| 19078 | 3041 (defun viper-find-char-forward (arg) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3042 "Find char on the line. |
| 18129 | 3043 If called interactively read the char to find from the terminal, and if |
| 19078 | 3044 called from viper-repeat, the char last used is used. This behaviour is |
| 18129 | 3045 controlled by the sign of prefix numeric value." |
| 3046 (interactive "P") | |
| 19078 | 3047 (let ((val (viper-p-val arg)) |
| 3048 (com (viper-getcom arg)) | |
| 3049 (cmd-representation (nth 5 viper-d-com))) | |
| 18129 | 3050 (if (> val 0) |
| 3051 ;; this means that the function was called interactively | |
| 19078 | 3052 (setq viper-f-char (read-char) |
| 3053 viper-f-forward t | |
| 3054 viper-f-offset nil) | |
| 3055 ;; viper-repeat --- set viper-F-char from command-keys | |
| 3056 (setq viper-F-char (if (stringp cmd-representation) | |
| 3057 (viper-seq-last-elt cmd-representation) | |
| 3058 viper-F-char) | |
| 3059 viper-f-char viper-F-char) | |
| 18129 | 3060 (setq val (- val))) |
| 19078 | 3061 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 3062 (viper-find-char | |
| 3063 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil) | |
| 18129 | 3064 (setq val (- val)) |
| 3065 (if com | |
| 3066 (progn | |
| 19078 | 3067 (setq viper-F-char viper-f-char) ; set new viper-F-char |
| 18129 | 3068 (forward-char) |
| 19078 | 3069 (viper-execute-com 'viper-find-char-forward val com))))) |
| 3070 | |
| 3071 (defun viper-goto-char-forward (arg) | |
| 18129 | 3072 "Go up to char ARG forward on line." |
| 3073 (interactive "P") | |
| 19078 | 3074 (let ((val (viper-p-val arg)) |
| 3075 (com (viper-getcom arg)) | |
| 3076 (cmd-representation (nth 5 viper-d-com))) | |
| 18129 | 3077 (if (> val 0) |
| 3078 ;; this means that the function was called interactively | |
| 19078 | 3079 (setq viper-f-char (read-char) |
| 3080 viper-f-forward t | |
| 3081 viper-f-offset t) | |
| 3082 ;; viper-repeat --- set viper-F-char from command-keys | |
| 3083 (setq viper-F-char (if (stringp cmd-representation) | |
| 3084 (viper-seq-last-elt cmd-representation) | |
| 3085 viper-F-char) | |
| 3086 viper-f-char viper-F-char) | |
| 18129 | 3087 (setq val (- val))) |
| 19078 | 3088 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 3089 (viper-find-char | |
| 3090 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t) | |
| 18129 | 3091 (setq val (- val)) |
| 3092 (if com | |
| 3093 (progn | |
| 19078 | 3094 (setq viper-F-char viper-f-char) ; set new viper-F-char |
| 18129 | 3095 (forward-char) |
| 19078 | 3096 (viper-execute-com 'viper-goto-char-forward val com))))) |
| 3097 | |
| 3098 (defun viper-find-char-backward (arg) | |
| 18129 | 3099 "Find char ARG on line backward." |
| 3100 (interactive "P") | |
| 19078 | 3101 (let ((val (viper-p-val arg)) |
| 3102 (com (viper-getcom arg)) | |
| 3103 (cmd-representation (nth 5 viper-d-com))) | |
| 18129 | 3104 (if (> val 0) |
| 3105 ;; this means that the function was called interactively | |
| 19078 | 3106 (setq viper-f-char (read-char) |
| 3107 viper-f-forward nil | |
| 3108 viper-f-offset nil) | |
| 3109 ;; viper-repeat --- set viper-F-char from command-keys | |
| 3110 (setq viper-F-char (if (stringp cmd-representation) | |
| 3111 (viper-seq-last-elt cmd-representation) | |
| 3112 viper-F-char) | |
| 3113 viper-f-char viper-F-char) | |
| 18129 | 3114 (setq val (- val))) |
| 19078 | 3115 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 3116 (viper-find-char | |
| 3117 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil) | |
| 18129 | 3118 (setq val (- val)) |
| 3119 (if com | |
| 3120 (progn | |
| 19078 | 3121 (setq viper-F-char viper-f-char) ; set new viper-F-char |
| 3122 (viper-execute-com 'viper-find-char-backward val com))))) | |
| 3123 | |
| 3124 (defun viper-goto-char-backward (arg) | |
| 18129 | 3125 "Go up to char ARG backward on line." |
| 3126 (interactive "P") | |
| 19078 | 3127 (let ((val (viper-p-val arg)) |
| 3128 (com (viper-getcom arg)) | |
| 3129 (cmd-representation (nth 5 viper-d-com))) | |
| 18129 | 3130 (if (> val 0) |
| 3131 ;; this means that the function was called interactively | |
| 19078 | 3132 (setq viper-f-char (read-char) |
| 3133 viper-f-forward nil | |
| 3134 viper-f-offset t) | |
| 3135 ;; viper-repeat --- set viper-F-char from command-keys | |
| 3136 (setq viper-F-char (if (stringp cmd-representation) | |
| 3137 (viper-seq-last-elt cmd-representation) | |
| 3138 viper-F-char) | |
| 3139 viper-f-char viper-F-char) | |
| 18129 | 3140 (setq val (- val))) |
| 19078 | 3141 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 3142 (viper-find-char | |
| 3143 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t) | |
| 18129 | 3144 (setq val (- val)) |
| 3145 (if com | |
| 3146 (progn | |
| 19078 | 3147 (setq viper-F-char viper-f-char) ; set new viper-F-char |
| 3148 (viper-execute-com 'viper-goto-char-backward val com))))) | |
| 3149 | |
| 3150 (defun viper-repeat-find (arg) | |
| 18129 | 3151 "Repeat previous find command." |
| 3152 (interactive "P") | |
| 19078 | 3153 (let ((val (viper-p-val arg)) |
| 3154 (com (viper-getcom arg))) | |
| 3155 (viper-deactivate-mark) | |
| 3156 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 3157 (viper-find-char val viper-f-char viper-f-forward viper-f-offset) | |
| 18129 | 3158 (if com |
| 3159 (progn | |
| 19078 | 3160 (if viper-f-forward (forward-char)) |
| 3161 (viper-execute-com 'viper-repeat-find val com))))) | |
| 3162 | |
| 3163 (defun viper-repeat-find-opposite (arg) | |
| 18129 | 3164 "Repeat previous find command in the opposite direction." |
| 3165 (interactive "P") | |
| 19078 | 3166 (let ((val (viper-p-val arg)) |
| 3167 (com (viper-getcom arg))) | |
| 3168 (viper-deactivate-mark) | |
| 3169 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 3170 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset) | |
| 18129 | 3171 (if com |
| 3172 (progn | |
| 19078 | 3173 (if viper-f-forward (forward-char)) |
| 3174 (viper-execute-com 'viper-repeat-find-opposite val com))))) | |
| 18129 | 3175 |
| 3176 | |
| 3177 ;; window scrolling etc. | |
| 3178 | |
| 19078 | 3179 (defun viper-window-top (arg) |
| 18129 | 3180 "Go to home window line." |
| 3181 (interactive "P") | |
| 19078 | 3182 (let ((val (viper-p-val arg)) |
| 3183 (com (viper-getCom arg))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3184 (viper-leave-region-active) |
| 19078 | 3185 (if com (viper-move-marker-locally 'viper-com-point (point))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3186 (push-mark nil t) |
| 18129 | 3187 (move-to-window-line (1- val)) |
| 3188 | |
| 3189 ;; positioning is done twice: before and after command execution | |
| 3190 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
| 3191 (back-to-indentation) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3192 |
| 19078 | 3193 (if com (viper-execute-com 'viper-window-top val com)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3194 |
| 18129 | 3195 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
| 3196 (back-to-indentation) | |
| 3197 )) | |
| 3198 | |
| 19078 | 3199 (defun viper-window-middle (arg) |
| 18129 | 3200 "Go to middle window line." |
| 3201 (interactive "P") | |
| 19078 | 3202 (let ((val (viper-p-val arg)) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3203 (com (viper-getCom arg))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3204 (viper-leave-region-active) |
| 19078 | 3205 (if com (viper-move-marker-locally 'viper-com-point (point))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3206 (push-mark nil t) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3207 (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3208 |
| 18129 | 3209 ;; positioning is done twice: before and after command execution |
| 3210 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
| 3211 (back-to-indentation) | |
| 3212 | |
| 19078 | 3213 (if com (viper-execute-com 'viper-window-middle val com)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3214 |
| 18129 | 3215 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
| 3216 (back-to-indentation) | |
| 3217 )) | |
| 3218 | |
| 19078 | 3219 (defun viper-window-bottom (arg) |
| 18129 | 3220 "Go to last window line." |
| 3221 (interactive "P") | |
| 19078 | 3222 (let ((val (viper-p-val arg)) |
| 3223 (com (viper-getCom arg))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3224 (viper-leave-region-active) |
| 19078 | 3225 (if com (viper-move-marker-locally 'viper-com-point (point))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3226 (push-mark nil t) |
| 18129 | 3227 (move-to-window-line (- val)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3228 |
| 18129 | 3229 ;; positioning is done twice: before and after command execution |
| 3230 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
| 3231 (back-to-indentation) | |
| 3232 | |
| 19078 | 3233 (if com (viper-execute-com 'viper-window-bottom val com)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3234 |
| 18129 | 3235 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
| 3236 (back-to-indentation) | |
| 3237 )) | |
| 3238 | |
| 19078 | 3239 (defun viper-line-to-top (arg) |
| 18129 | 3240 "Put current line on the home line." |
| 3241 (interactive "p") | |
| 3242 (recenter (1- arg))) | |
| 3243 | |
| 19078 | 3244 (defun viper-line-to-middle (arg) |
| 18129 | 3245 "Put current line on the middle line." |
| 3246 (interactive "p") | |
| 3247 (recenter (+ (1- arg) (/ (1- (window-height)) 2)))) | |
| 3248 | |
| 19078 | 3249 (defun viper-line-to-bottom (arg) |
| 18129 | 3250 "Put current line on the last line." |
| 3251 (interactive "p") | |
| 3252 (recenter (- (window-height) (1+ arg)))) | |
| 3253 | |
| 19078 | 3254 ;; If point is within viper-search-scroll-threshold of window top or bottom, |
| 18129 | 3255 ;; scroll up or down 1/7 of window height, depending on whether we are at the |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3256 ;; bottom or at the top of the window. This function is called by viper-search |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3257 ;; (which is called from viper-search-forward/backward/next). If the value of |
| 19078 | 3258 ;; viper-search-scroll-threshold is negative - don't scroll. |
| 3259 (defun viper-adjust-window () | |
| 3260 (let ((win-height (if viper-emacs-p | |
| 18129 | 3261 (1- (window-height)) ; adjust for modeline |
| 3262 (window-displayed-height))) | |
| 3263 (pt (point)) | |
| 3264 at-top-p at-bottom-p | |
| 3265 min-scroll direction) | |
| 3266 (save-excursion | |
| 3267 (move-to-window-line 0) ; top | |
| 3268 (setq at-top-p | |
| 3269 (<= (count-lines pt (point)) | |
| 19078 | 3270 viper-search-scroll-threshold)) |
| 18129 | 3271 (move-to-window-line -1) ; bottom |
| 3272 (setq at-bottom-p | |
| 19078 | 3273 (<= (count-lines pt (point)) viper-search-scroll-threshold)) |
| 18129 | 3274 ) |
| 19078 | 3275 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold) |
| 18129 | 3276 direction 1)) |
| 19078 | 3277 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold) |
| 18129 | 3278 direction -1))) |
| 3279 (if min-scroll | |
| 3280 (recenter | |
| 3281 (* (max min-scroll (/ win-height 7)) direction))) | |
| 3282 )) | |
| 3283 | |
| 3284 | |
| 3285 ;; paren match | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3286 ;; must correct this to only match ( to ) etc. On the other hand |
| 18129 | 3287 ;; it is good that paren match gets confused, because that way you |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3288 ;; catch _all_ imbalances. |
| 18129 | 3289 |
| 19078 | 3290 (defun viper-paren-match (arg) |
| 18129 | 3291 "Go to the matching parenthesis." |
| 3292 (interactive "P") | |
| 19078 | 3293 (viper-leave-region-active) |
| 3294 (let ((com (viper-getcom arg)) | |
| 3295 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments) | |
| 18129 | 3296 anchor-point) |
| 3297 (if (integerp arg) | |
| 3298 (if (or (> arg 99) (< arg 1)) | |
| 3299 (error "Prefix must be between 1 and 99") | |
| 3300 (goto-char | |
| 3301 (if (> (point-max) 80000) | |
| 3302 (* (/ (point-max) 100) arg) | |
| 3303 (/ (* (point-max) arg) 100))) | |
| 3304 (back-to-indentation)) | |
| 3305 (let (beg-lim end-lim) | |
| 3306 (if (and (eolp) (not (bolp))) (forward-char -1)) | |
| 3307 (if (not (looking-at "[][(){}]")) | |
| 3308 (setq anchor-point (point))) | |
| 3309 (save-excursion | |
| 3310 (beginning-of-line) | |
| 3311 (setq beg-lim (point)) | |
| 3312 (end-of-line) | |
| 3313 (setq end-lim (point))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3314 (cond ((re-search-forward "[][(){}]" end-lim t) |
| 18129 | 3315 (backward-char) ) |
| 3316 ((re-search-backward "[][(){}]" beg-lim t)) | |
| 3317 (t | |
| 3318 (error "No matching character on line")))) | |
| 3319 (cond ((looking-at "[\(\[{]") | |
| 19078 | 3320 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 18129 | 3321 (forward-sexp 1) |
| 3322 (if com | |
| 19078 | 3323 (viper-execute-com 'viper-paren-match nil com) |
| 18129 | 3324 (backward-char))) |
| 3325 (anchor-point | |
| 3326 (if com | |
| 3327 (progn | |
| 19078 | 3328 (viper-move-marker-locally 'viper-com-point anchor-point) |
| 18129 | 3329 (forward-char 1) |
| 19078 | 3330 (viper-execute-com 'viper-paren-match nil com) |
| 18129 | 3331 ))) |
| 3332 ((looking-at "[])}]") | |
| 3333 (forward-char) | |
| 19078 | 3334 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 18129 | 3335 (backward-sexp 1) |
| 19078 | 3336 (if com (viper-execute-com 'viper-paren-match nil com))) |
| 18129 | 3337 (t (error "")))))) |
| 3338 | |
| 19078 | 3339 (defun viper-toggle-parse-sexp-ignore-comments () |
| 18129 | 3340 (interactive) |
| 19078 | 3341 (setq viper-parse-sexp-ignore-comments |
| 3342 (not viper-parse-sexp-ignore-comments)) | |
| 18839 | 3343 (princ (format |
| 3344 "From now on, `%%' will %signore parentheses inside comment fields" | |
| 19078 | 3345 (if viper-parse-sexp-ignore-comments "" "NOT ")))) |
| 18129 | 3346 |
| 3347 | |
| 21940 | 3348 ;; sentence, paragraph and heading |
| 18129 | 3349 |
| 19078 | 3350 (defun viper-forward-sentence (arg) |
| 18129 | 3351 "Forward sentence." |
| 3352 (interactive "P") | |
| 20003 | 3353 (or (eq last-command this-command) |
| 3354 (push-mark nil t)) | |
| 19078 | 3355 (let ((val (viper-p-val arg)) |
| 3356 (com (viper-getcom arg))) | |
| 3357 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 3358 (forward-sentence val) |
| 19078 | 3359 (if com (viper-execute-com 'viper-forward-sentence nil com)))) |
| 3360 | |
| 3361 (defun viper-backward-sentence (arg) | |
| 18129 | 3362 "Backward sentence." |
| 3363 (interactive "P") | |
| 20003 | 3364 (or (eq last-command this-command) |
| 3365 (push-mark nil t)) | |
| 19078 | 3366 (let ((val (viper-p-val arg)) |
| 3367 (com (viper-getcom arg))) | |
| 3368 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 3369 (backward-sentence val) |
| 19078 | 3370 (if com (viper-execute-com 'viper-backward-sentence nil com)))) |
| 3371 | |
| 3372 (defun viper-forward-paragraph (arg) | |
| 18129 | 3373 "Forward paragraph." |
| 3374 (interactive "P") | |
| 20003 | 3375 (or (eq last-command this-command) |
| 3376 (push-mark nil t)) | |
| 19078 | 3377 (let ((val (viper-p-val arg)) |
| 21940 | 3378 ;; if you want d} operate on whole lines, change viper-getcom to |
| 3379 ;; viper-getCom below | |
| 3380 (com (viper-getcom arg))) | |
| 19078 | 3381 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 18129 | 3382 (forward-paragraph val) |
| 3383 (if com | |
| 3384 (progn | |
| 3385 (backward-char 1) | |
| 19078 | 3386 (viper-execute-com 'viper-forward-paragraph nil com))))) |
| 3387 | |
| 3388 (defun viper-backward-paragraph (arg) | |
| 18129 | 3389 "Backward paragraph." |
| 3390 (interactive "P") | |
| 20003 | 3391 (or (eq last-command this-command) |
| 3392 (push-mark nil t)) | |
| 19078 | 3393 (let ((val (viper-p-val arg)) |
| 21940 | 3394 ;; if you want d{ operate on whole lines, change viper-getcom to |
| 3395 ;; viper-getCom below | |
| 3396 (com (viper-getcom arg))) | |
| 19078 | 3397 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 18129 | 3398 (backward-paragraph val) |
| 3399 (if com | |
| 3400 (progn | |
| 3401 (forward-char 1) | |
| 19078 | 3402 (viper-execute-com 'viper-backward-paragraph nil com) |
| 18129 | 3403 (backward-char 1))))) |
| 3404 | |
| 20003 | 3405 ;; should be mode-specific |
| 19078 | 3406 (defun viper-prev-heading (arg) |
| 18129 | 3407 (interactive "P") |
| 19078 | 3408 (let ((val (viper-p-val arg)) |
| 3409 (com (viper-getCom arg))) | |
| 3410 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 3411 (re-search-backward viper-heading-start nil t val) | |
| 18129 | 3412 (goto-char (match-beginning 0)) |
| 19078 | 3413 (if com (viper-execute-com 'viper-prev-heading nil com)))) |
| 3414 | |
| 3415 (defun viper-heading-end (arg) | |
| 18129 | 3416 (interactive "P") |
| 19078 | 3417 (let ((val (viper-p-val arg)) |
| 3418 (com (viper-getCom arg))) | |
| 3419 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 3420 (re-search-forward viper-heading-end nil t val) | |
| 18129 | 3421 (goto-char (match-beginning 0)) |
| 19078 | 3422 (if com (viper-execute-com 'viper-heading-end nil com)))) |
| 3423 | |
| 3424 (defun viper-next-heading (arg) | |
| 18129 | 3425 (interactive "P") |
| 19078 | 3426 (let ((val (viper-p-val arg)) |
| 3427 (com (viper-getCom arg))) | |
| 3428 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
| 18129 | 3429 (end-of-line) |
| 19078 | 3430 (re-search-forward viper-heading-start nil t val) |
| 18129 | 3431 (goto-char (match-beginning 0)) |
| 19078 | 3432 (if com (viper-execute-com 'viper-next-heading nil com)))) |
| 18129 | 3433 |
| 3434 | |
| 3435 ;; scrolling | |
| 3436 | |
| 19078 | 3437 (defun viper-scroll-screen (arg) |
| 18129 | 3438 "Scroll to next screen." |
| 3439 (interactive "p") | |
| 3440 (condition-case nil | |
| 3441 (if (> arg 0) | |
| 3442 (while (> arg 0) | |
| 3443 (scroll-up) | |
| 3444 (setq arg (1- arg))) | |
| 3445 (while (> 0 arg) | |
| 3446 (scroll-down) | |
| 3447 (setq arg (1+ arg)))) | |
| 3448 (error (beep 1) | |
| 3449 (if (> arg 0) | |
| 3450 (progn | |
| 3451 (message "End of buffer") | |
| 3452 (goto-char (point-max))) | |
| 3453 (message "Beginning of buffer") | |
| 3454 (goto-char (point-min)))) | |
| 3455 )) | |
| 3456 | |
| 19078 | 3457 (defun viper-scroll-screen-back (arg) |
| 18129 | 3458 "Scroll to previous screen." |
| 3459 (interactive "p") | |
| 19078 | 3460 (viper-scroll-screen (- arg))) |
| 3461 | |
| 3462 (defun viper-scroll-down (arg) | |
| 18129 | 3463 "Pull down half screen." |
| 3464 (interactive "P") | |
| 3465 (condition-case nil | |
| 3466 (if (null arg) | |
| 3467 (scroll-down (/ (window-height) 2)) | |
| 3468 (scroll-down arg)) | |
| 3469 (error (beep 1) | |
| 3470 (message "Beginning of buffer") | |
| 3471 (goto-char (point-min))))) | |
| 3472 | |
| 19078 | 3473 (defun viper-scroll-down-one (arg) |
| 18129 | 3474 "Scroll up one line." |
| 3475 (interactive "p") | |
| 3476 (scroll-down arg)) | |
| 3477 | |
| 19078 | 3478 (defun viper-scroll-up (arg) |
| 18129 | 3479 "Pull up half screen." |
| 3480 (interactive "P") | |
| 3481 (condition-case nil | |
| 3482 (if (null arg) | |
| 3483 (scroll-up (/ (window-height) 2)) | |
| 3484 (scroll-up arg)) | |
| 3485 (error (beep 1) | |
| 3486 (message "End of buffer") | |
| 3487 (goto-char (point-max))))) | |
| 3488 | |
| 19078 | 3489 (defun viper-scroll-up-one (arg) |
| 18129 | 3490 "Scroll down one line." |
| 3491 (interactive "p") | |
| 3492 (scroll-up arg)) | |
| 3493 | |
| 3494 | |
| 3495 ;; searching | |
| 3496 | |
| 19078 | 3497 (defun viper-if-string (prompt) |
| 3498 (if (memq viper-intermediate-command | |
| 3499 '(viper-command-argument viper-digit-argument viper-repeat)) | |
| 3500 (setq viper-this-command-keys (this-command-keys))) | |
| 3501 (let ((s (viper-read-string-with-history | |
| 18129 | 3502 prompt |
| 3503 nil ; no initial | |
| 19078 | 3504 'viper-search-history |
| 3505 (car viper-search-history)))) | |
| 18129 | 3506 (if (not (string= s "")) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3507 (setq viper-s-string s)))) |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3508 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3509 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3510 (defun viper-toggle-search-style (arg) |
| 19078 | 3511 "Toggle the value of viper-case-fold-search/viper-re-search. |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3512 Without prefix argument, will ask which search style to toggle. With prefix |
| 19078 | 3513 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
| 3514 | |
| 3515 Although this function is bound to \\[viper-toggle-search-style], the most | |
| 18129 | 3516 convenient way to use it is to bind `//' to the macro |
| 19078 | 3517 `1 M-x viper-toggle-search-style' and `///' to |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3518 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will |
| 18129 | 3519 toggle case-fold-search and hitting `/' three times witth toggle regexp |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3520 search. Macros are more convenient in this case because they don't affect |
| 18129 | 3521 the Emacs binding of `/'." |
| 3522 (interactive "P") | |
| 3523 (let (msg) | |
| 3524 (cond ((or (eq arg 1) | |
| 3525 (and (null arg) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3526 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
| 19078 | 3527 (if viper-case-fold-search |
| 18129 | 3528 "case-insensitive" "case-sensitive") |
| 19078 | 3529 (if viper-case-fold-search |
| 18129 | 3530 "case-sensitive" |
| 3531 "case-insensitive"))))) | |
| 19078 | 3532 (setq viper-case-fold-search (null viper-case-fold-search)) |
| 3533 (if viper-case-fold-search | |
| 18129 | 3534 (setq msg "Search becomes case-insensitive") |
| 3535 (setq msg "Search becomes case-sensitive"))) | |
| 3536 ((or (eq arg 2) | |
| 3537 (and (null arg) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3538 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
| 19078 | 3539 (if viper-re-search |
| 18129 | 3540 "regexp-search" "vanilla-search") |
| 19078 | 3541 (if viper-re-search |
| 18129 | 3542 "vanilla-search" |
| 3543 "regexp-search"))))) | |
| 19078 | 3544 (setq viper-re-search (null viper-re-search)) |
| 3545 (if viper-re-search | |
| 18129 | 3546 (setq msg "Search becomes regexp-style") |
| 3547 (setq msg "Search becomes vanilla-style"))) | |
| 3548 (t | |
| 3549 (setq msg "Search style remains unchanged"))) | |
| 18839 | 3550 (princ msg t))) |
| 3551 | |
| 19078 | 3552 (defun viper-set-searchstyle-toggling-macros (unset) |
| 18129 | 3553 "Set the macros for toggling the search style in Viper's vi-state. |
| 3554 The macro that toggles case sensitivity is bound to `//', and the one that | |
| 3555 toggles regexp search is bound to `///'. | |
| 3556 With a prefix argument, this function unsets the macros. " | |
| 3557 (interactive "P") | |
| 3558 (or noninteractive | |
| 3559 (if (not unset) | |
| 3560 (progn | |
| 3561 ;; toggle case sensitivity in search | |
| 19078 | 3562 (viper-record-kbd-macro |
| 18129 | 3563 "//" 'vi-state |
| 19078 | 3564 [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] |
| 18129 | 3565 't) |
| 3566 ;; toggle regexp/vanila search | |
| 19078 | 3567 (viper-record-kbd-macro |
| 18129 | 3568 "///" 'vi-state |
| 19078 | 3569 [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] |
| 18129 | 3570 't) |
| 3571 (if (interactive-p) | |
| 3572 (message | |
| 18839 | 3573 "// and /// now toggle case-sensitivity and regexp search"))) |
| 19078 | 3574 (viper-unrecord-kbd-macro "//" 'vi-state) |
| 18129 | 3575 (sit-for 2) |
| 19078 | 3576 (viper-unrecord-kbd-macro "///" 'vi-state)))) |
| 3577 | |
| 3578 | |
| 3579 (defun viper-set-parsing-style-toggling-macro (unset) | |
| 18839 | 3580 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses. |
| 3581 This is used in conjunction with the `%' command. | |
| 3582 | |
| 3583 With a prefix argument, unsets the macro." | |
| 3584 (interactive "P") | |
| 3585 (or noninteractive | |
| 3586 (if (not unset) | |
| 3587 (progn | |
| 3588 ;; Make %%% toggle parsing comments for matching parentheses | |
| 19078 | 3589 (viper-record-kbd-macro |
| 18839 | 3590 "%%%" 'vi-state |
| 19078 | 3591 [(meta x) v i p e r - t o g g l e - p a r s e - s e x p - i g n o r e - c o m m e n t s return] |
| 18839 | 3592 't) |
| 3593 (if (interactive-p) | |
| 3594 (message | |
| 3595 "%%%%%% now toggles whether comments should be parsed for matching parentheses"))) | |
| 19078 | 3596 (viper-unrecord-kbd-macro "%%%" 'vi-state)))) |
| 3597 | |
| 3598 | |
| 3599 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode) | |
| 18129 | 3600 "Set the macros for toggling the search style in Viper's emacs-state. |
| 3601 The macro that toggles case sensitivity is bound to `//', and the one that | |
| 3602 toggles regexp search is bound to `///'. | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3603 With a prefix argument, this function unsets the macros. |
| 18129 | 3604 If the optional prefix argument is non-nil and specifies a valid major mode, |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3605 this sets the macros only in the macros in that major mode. Otherwise, |
| 18129 | 3606 the macros are set in the current major mode. |
| 3607 \(When unsetting the macros, the second argument has no effect.\)" | |
| 3608 (interactive "P") | |
| 3609 (or noninteractive | |
| 3610 (if (not unset) | |
| 3611 (progn | |
| 3612 ;; toggle case sensitivity in search | |
| 19078 | 3613 (viper-record-kbd-macro |
| 18129 | 3614 "//" 'emacs-state |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3615 [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] |
| 18129 | 3616 (or arg-majormode major-mode)) |
| 3617 ;; toggle regexp/vanila search | |
| 19078 | 3618 (viper-record-kbd-macro |
| 18129 | 3619 "///" 'emacs-state |
| 19078 | 3620 [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] |
| 18129 | 3621 (or arg-majormode major-mode)) |
| 3622 (if (interactive-p) | |
| 3623 (message | |
| 3624 "// and /// now toggle case-sensitivity and regexp search."))) | |
| 19078 | 3625 (viper-unrecord-kbd-macro "//" 'emacs-state) |
| 18129 | 3626 (sit-for 2) |
| 19078 | 3627 (viper-unrecord-kbd-macro "///" 'emacs-state)))) |
| 3628 | |
| 3629 | |
| 3630 (defun viper-search-forward (arg) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3631 "Search a string forward. |
| 18129 | 3632 ARG is used to find the ARG's occurrence of the string. |
| 3633 Null string will repeat previous search." | |
| 3634 (interactive "P") | |
| 19078 | 3635 (let ((val (viper-P-val arg)) |
| 3636 (com (viper-getcom arg)) | |
| 3637 (old-str viper-s-string)) | |
| 3638 (setq viper-s-forward t) | |
| 3639 (viper-if-string "/") | |
| 18129 | 3640 ;; this is not used at present, but may be used later |
| 19078 | 3641 (if (or (not (equal old-str viper-s-string)) |
| 3642 (not (markerp viper-local-search-start-marker)) | |
| 3643 (not (marker-buffer viper-local-search-start-marker))) | |
| 3644 (setq viper-local-search-start-marker (point-marker))) | |
| 3645 (viper-search viper-s-string t val) | |
| 18129 | 3646 (if com |
| 3647 (progn | |
| 19078 | 3648 (viper-move-marker-locally 'viper-com-point (mark t)) |
| 3649 (viper-execute-com 'viper-search-next val com))))) | |
| 3650 | |
| 3651 (defun viper-search-backward (arg) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3652 "Search a string backward. |
| 18129 | 3653 ARG is used to find the ARG's occurrence of the string. |
| 3654 Null string will repeat previous search." | |
| 3655 (interactive "P") | |
| 19078 | 3656 (let ((val (viper-P-val arg)) |
| 3657 (com (viper-getcom arg)) | |
| 3658 (old-str viper-s-string)) | |
| 3659 (setq viper-s-forward nil) | |
| 3660 (viper-if-string "?") | |
| 18129 | 3661 ;; this is not used at present, but may be used later |
| 19078 | 3662 (if (or (not (equal old-str viper-s-string)) |
| 3663 (not (markerp viper-local-search-start-marker)) | |
| 3664 (not (marker-buffer viper-local-search-start-marker))) | |
| 3665 (setq viper-local-search-start-marker (point-marker))) | |
| 3666 (viper-search viper-s-string nil val) | |
| 18129 | 3667 (if com |
| 3668 (progn | |
| 19078 | 3669 (viper-move-marker-locally 'viper-com-point (mark t)) |
| 3670 (viper-execute-com 'viper-search-next val com))))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3671 |
| 18129 | 3672 |
| 3673 ;; Search for COUNT's occurrence of STRING. | |
| 3674 ;; Search is forward if FORWARD is non-nil, otherwise backward. | |
| 3675 ;; INIT-POINT is the position where search is to start. | |
| 3676 ;; Arguments: | |
| 3677 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND) | |
| 19078 | 3678 (defun viper-search (string forward arg |
| 3679 &optional no-offset init-point fail-if-not-found) | |
| 18129 | 3680 (if (not (equal string "")) |
| 19078 | 3681 (let ((val (viper-p-val arg)) |
| 3682 (com (viper-getcom arg)) | |
| 18129 | 3683 (offset (not no-offset)) |
| 19078 | 3684 (case-fold-search viper-case-fold-search) |
| 18129 | 3685 (start-point (or init-point (point)))) |
| 19078 | 3686 (viper-deactivate-mark) |
| 18129 | 3687 (if forward |
| 3688 (condition-case nil | |
| 3689 (progn | |
| 19078 | 3690 (if offset (viper-forward-char-carefully)) |
| 3691 (if viper-re-search | |
| 18129 | 3692 (progn |
| 3693 (re-search-forward string nil nil val) | |
| 3694 (re-search-backward string)) | |
| 3695 (search-forward string nil nil val) | |
| 3696 (search-backward string)) | |
| 3697 (if (not (equal start-point (point))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3698 (push-mark start-point t))) |
| 18129 | 3699 (search-failed |
| 19078 | 3700 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
| 18129 | 3701 (progn |
| 3702 (message "Search wrapped around BOTTOM of buffer") | |
| 3703 (goto-char (point-min)) | |
| 19078 | 3704 (viper-search string forward (cons 1 com) t start-point 'fail) |
| 18129 | 3705 ;; don't wait in macros |
| 19078 | 3706 (or executing-kbd-macro |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3707 (memq viper-intermediate-command |
| 19078 | 3708 '(viper-repeat |
| 3709 viper-digit-argument | |
| 3710 viper-command-argument)) | |
| 3711 (sit-for 2)) | |
| 18129 | 3712 ;; delete the wrap-around message |
| 3713 (message "") | |
| 3714 ) | |
| 3715 (goto-char start-point) | |
| 3716 (error "`%s': %s not found" | |
| 3717 string | |
| 19078 | 3718 (if viper-re-search "Pattern" "String")) |
| 18129 | 3719 ))) |
| 3720 ;; backward | |
| 3721 (condition-case nil | |
| 3722 (progn | |
| 19078 | 3723 (if viper-re-search |
| 18129 | 3724 (re-search-backward string nil nil val) |
| 3725 (search-backward string nil nil val)) | |
| 3726 (if (not (equal start-point (point))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3727 (push-mark start-point t))) |
| 18129 | 3728 (search-failed |
| 19078 | 3729 (if (and (not fail-if-not-found) viper-search-wrap-around-t) |
| 18129 | 3730 (progn |
| 3731 (message "Search wrapped around TOP of buffer") | |
| 3732 (goto-char (point-max)) | |
| 19078 | 3733 (viper-search string forward (cons 1 com) t start-point 'fail) |
| 18129 | 3734 ;; don't wait in macros |
| 19078 | 3735 (or executing-kbd-macro |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3736 (memq viper-intermediate-command |
| 19078 | 3737 '(viper-repeat |
| 3738 viper-digit-argument | |
| 3739 viper-command-argument)) | |
| 3740 (sit-for 2)) | |
| 18129 | 3741 ;; delete the wrap-around message |
| 3742 (message "") | |
| 3743 ) | |
| 3744 (goto-char start-point) | |
| 3745 (error "`%s': %s not found" | |
| 3746 string | |
| 19078 | 3747 (if viper-re-search "Pattern" "String")) |
| 18129 | 3748 )))) |
| 3749 ;; pull up or down if at top/bottom of window | |
| 19078 | 3750 (viper-adjust-window) |
| 18129 | 3751 ;; highlight the result of search |
| 3752 ;; don't wait and don't highlight in macros | |
| 3753 (or executing-kbd-macro | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3754 (memq viper-intermediate-command |
| 19078 | 3755 '(viper-repeat viper-digit-argument viper-command-argument)) |
| 3756 (viper-flash-search-pattern)) | |
| 18129 | 3757 ))) |
| 3758 | |
| 19078 | 3759 (defun viper-search-next (arg) |
| 18129 | 3760 "Repeat previous search." |
| 3761 (interactive "P") | |
| 19078 | 3762 (let ((val (viper-p-val arg)) |
| 3763 (com (viper-getcom arg))) | |
| 3764 (if (null viper-s-string) (error viper-NoPrevSearch)) | |
| 3765 (viper-search viper-s-string viper-s-forward arg) | |
| 18129 | 3766 (if com |
| 3767 (progn | |
| 19078 | 3768 (viper-move-marker-locally 'viper-com-point (mark t)) |
| 3769 (viper-execute-com 'viper-search-next val com))))) | |
| 3770 | |
| 3771 (defun viper-search-Next (arg) | |
| 18129 | 3772 "Repeat previous search in the reverse direction." |
| 3773 (interactive "P") | |
| 19078 | 3774 (let ((val (viper-p-val arg)) |
| 3775 (com (viper-getcom arg))) | |
| 3776 (if (null viper-s-string) (error viper-NoPrevSearch)) | |
| 3777 (viper-search viper-s-string (not viper-s-forward) arg) | |
| 18129 | 3778 (if com |
| 3779 (progn | |
| 19078 | 3780 (viper-move-marker-locally 'viper-com-point (mark t)) |
| 3781 (viper-execute-com 'viper-search-Next val com))))) | |
| 18129 | 3782 |
| 3783 | |
| 3784 ;; Search contents of buffer defined by one of Viper's motion commands. | |
| 3785 ;; Repeatable via `n' and `N'. | |
| 19078 | 3786 (defun viper-buffer-search-enable (&optional c) |
| 3787 (cond (c (setq viper-buffer-search-char c)) | |
| 3788 ((null viper-buffer-search-char) | |
| 3789 (setq viper-buffer-search-char ?g))) | |
| 3790 (define-key viper-vi-basic-map | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3791 (cond ((viper-characterp viper-buffer-search-char) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3792 (char-to-string viper-buffer-search-char)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3793 (t (error "viper-buffer-search-char: wrong value type, %s" |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3794 viper-buffer-search-char))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3795 'viper-command-argument) |
| 19078 | 3796 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search) |
| 3797 (setq viper-prefix-commands | |
| 3798 (cons viper-buffer-search-char viper-prefix-commands))) | |
| 18129 | 3799 |
| 3800 ;; This is a Viper wraper for isearch-forward. | |
| 19078 | 3801 (defun viper-isearch-forward (arg) |
| 18129 | 3802 "Do incremental search forward." |
| 3803 (interactive "P") | |
| 3804 ;; emacs bug workaround | |
| 3805 (if (listp arg) (setq arg (car arg))) | |
| 19078 | 3806 (viper-exec-form-in-emacs (list 'isearch-forward arg))) |
| 18129 | 3807 |
| 3808 ;; This is a Viper wraper for isearch-backward." | |
| 19078 | 3809 (defun viper-isearch-backward (arg) |
| 18129 | 3810 "Do incremental search backward." |
| 3811 (interactive "P") | |
| 3812 ;; emacs bug workaround | |
| 3813 (if (listp arg) (setq arg (car arg))) | |
| 19078 | 3814 (viper-exec-form-in-emacs (list 'isearch-backward arg))) |
| 18129 | 3815 |
| 3816 | |
| 3817 ;; visiting and killing files, buffers | |
| 3818 | |
| 19078 | 3819 (defun viper-switch-to-buffer () |
| 18129 | 3820 "Switch to buffer in the current window." |
| 3821 (interactive) | |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3822 (let ((other-buffer (other-buffer (current-buffer))) |
|
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3823 buffer) |
| 18129 | 3824 (setq buffer |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3825 (funcall viper-read-buffer-function |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3826 "Switch to buffer in this window: " other-buffer)) |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3827 (switch-to-buffer buffer))) |
| 18129 | 3828 |
| 19078 | 3829 (defun viper-switch-to-buffer-other-window () |
| 18129 | 3830 "Switch to buffer in another window." |
| 3831 (interactive) | |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3832 (let ((other-buffer (other-buffer (current-buffer))) |
|
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3833 buffer) |
| 18129 | 3834 (setq buffer |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3835 (funcall viper-read-buffer-function |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3836 "Switch to buffer in another window: " other-buffer)) |
|
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
3837 (switch-to-buffer-other-window buffer))) |
| 18129 | 3838 |
| 19078 | 3839 (defun viper-kill-buffer () |
| 18129 | 3840 "Kill a buffer." |
| 3841 (interactive) | |
| 3842 (let (buffer buffer-name) | |
| 3843 (setq buffer-name | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3844 (funcall viper-read-buffer-function |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3845 (format "Kill buffer \(%s\): " |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3846 (buffer-name (current-buffer))))) |
| 18129 | 3847 (setq buffer |
| 3848 (if (null buffer-name) | |
| 3849 (current-buffer) | |
| 3850 (get-buffer buffer-name))) | |
| 3851 (if (null buffer) (error "`%s': No such buffer" buffer-name)) | |
| 3852 (if (or (not (buffer-modified-p buffer)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3853 (y-or-n-p |
| 18129 | 3854 (format |
| 3855 "Buffer `%s' is modified, are you sure you want to kill it? " | |
| 3856 buffer-name))) | |
| 3857 (kill-buffer buffer) | |
| 3858 (error "Buffer not killed")))) | |
| 3859 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3860 |
| 18129 | 3861 |
| 3862 ;; yank and pop | |
| 3863 | |
| 19078 | 3864 (defsubst viper-yank (text) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3865 "Yank TEXT silently. This works correctly with Emacs's yank-pop command." |
| 18129 | 3866 (insert text) |
| 3867 (setq this-command 'yank)) | |
| 3868 | |
| 19078 | 3869 (defun viper-put-back (arg) |
| 18129 | 3870 "Put back after point/below line." |
| 3871 (interactive "P") | |
| 19078 | 3872 (let ((val (viper-p-val arg)) |
| 3873 (text (if viper-use-register | |
| 3874 (cond ((viper-valid-register viper-use-register '(digit)) | |
| 3875 (current-kill | |
| 3876 (- viper-use-register ?1) 'do-not-rotate)) | |
| 3877 ((viper-valid-register viper-use-register) | |
| 3878 (get-register (downcase viper-use-register))) | |
| 3879 (t (error viper-InvalidRegister viper-use-register))) | |
| 21940 | 3880 (current-kill 0))) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3881 sv-point chars-inserted lines-inserted) |
| 18129 | 3882 (if (null text) |
| 19078 | 3883 (if viper-use-register |
| 3884 (let ((reg viper-use-register)) | |
| 3885 (setq viper-use-register nil) | |
| 3886 (error viper-EmptyRegister reg)) | |
| 18129 | 3887 (error ""))) |
| 19078 | 3888 (setq viper-use-register nil) |
| 3889 (if (viper-end-with-a-newline-p text) | |
| 18129 | 3890 (progn |
| 3891 (end-of-line) | |
| 3892 (if (eobp) | |
| 3893 (insert "\n") | |
| 3894 (forward-line 1)) | |
| 3895 (beginning-of-line)) | |
| 19078 | 3896 (if (not (eolp)) (viper-forward-char-carefully))) |
| 3897 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
| 3898 (viper-set-destructive-command | |
| 3899 (list 'viper-put-back val nil viper-use-register nil nil)) | |
| 21940 | 3900 (setq sv-point (point)) |
| 3901 (viper-loop val (viper-yank text)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3902 (setq chars-inserted (abs (- (point) sv-point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3903 lines-inserted (abs (count-lines (point) sv-point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3904 (if (or (> chars-inserted viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3905 (> lines-inserted viper-change-notification-threshold)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3906 (message "Inserted %d character(s), %d line(s)" |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3907 chars-inserted lines-inserted))) |
| 18129 | 3908 ;; Vi puts cursor on the last char when the yanked text doesn't contain a |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3909 ;; newline; it leaves the cursor at the beginning when the text contains |
| 18129 | 3910 ;; a newline |
| 19078 | 3911 (if (viper-same-line (point) (mark)) |
| 3912 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
| 18129 | 3913 (exchange-point-and-mark) |
| 3914 (if (bolp) | |
| 3915 (back-to-indentation))) | |
| 19078 | 3916 (viper-deactivate-mark)) |
| 3917 | |
| 3918 (defun viper-Put-back (arg) | |
| 18129 | 3919 "Put back at point/above line." |
| 3920 (interactive "P") | |
| 19078 | 3921 (let ((val (viper-p-val arg)) |
| 3922 (text (if viper-use-register | |
| 3923 (cond ((viper-valid-register viper-use-register '(digit)) | |
| 3924 (current-kill | |
| 3925 (- viper-use-register ?1) 'do-not-rotate)) | |
| 3926 ((viper-valid-register viper-use-register) | |
| 3927 (get-register (downcase viper-use-register))) | |
| 3928 (t (error viper-InvalidRegister viper-use-register))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3929 (current-kill 0))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3930 sv-point chars-inserted lines-inserted) |
| 18129 | 3931 (if (null text) |
| 19078 | 3932 (if viper-use-register |
| 3933 (let ((reg viper-use-register)) | |
| 3934 (setq viper-use-register nil) | |
| 3935 (error viper-EmptyRegister reg)) | |
| 18129 | 3936 (error ""))) |
| 19078 | 3937 (setq viper-use-register nil) |
| 3938 (if (viper-end-with-a-newline-p text) (beginning-of-line)) | |
| 3939 (viper-set-destructive-command | |
| 3940 (list 'viper-Put-back val nil viper-use-register nil nil)) | |
| 3941 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3942 (setq sv-point (point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3943 (viper-loop val (viper-yank text)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3944 (setq chars-inserted (abs (- (point) sv-point)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3945 lines-inserted (abs (count-lines (point) sv-point))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3946 (if (or (> chars-inserted viper-change-notification-threshold) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3947 (> lines-inserted viper-change-notification-threshold)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3948 (message "Inserted %d character(s), %d line(s)" |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3949 chars-inserted lines-inserted))) |
| 18129 | 3950 ;; Vi puts cursor on the last char when the yanked text doesn't contain a |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3951 ;; newline; it leaves the cursor at the beginning when the text contains |
| 18129 | 3952 ;; a newline |
| 19078 | 3953 (if (viper-same-line (point) (mark)) |
| 3954 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
| 18129 | 3955 (exchange-point-and-mark) |
| 3956 (if (bolp) | |
| 3957 (back-to-indentation))) | |
| 19078 | 3958 (viper-deactivate-mark)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3959 |
| 18129 | 3960 |
| 3961 ;; Copy region to kill-ring. | |
| 3962 ;; If BEG and END do not belong to the same buffer, copy empty region. | |
| 19078 | 3963 (defun viper-copy-region-as-kill (beg end) |
| 18129 | 3964 (condition-case nil |
| 3965 (copy-region-as-kill beg end) | |
| 3966 (error (copy-region-as-kill beg beg)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3967 |
| 18129 | 3968 |
| 19078 | 3969 (defun viper-delete-char (arg) |
| 19462 | 3970 "Delete next character." |
| 18129 | 3971 (interactive "P") |
| 19462 | 3972 (let ((val (viper-p-val arg)) |
| 3973 end-del-pos) | |
| 19078 | 3974 (viper-set-destructive-command |
| 3975 (list 'viper-delete-char val nil nil nil nil)) | |
| 19462 | 3976 (if (and viper-ex-style-editing |
| 3977 (> val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
| 3978 (setq val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
| 19078 | 3979 (if (and viper-ex-style-motion (eolp)) |
| 18129 | 3980 (if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch |
| 19462 | 3981 (save-excursion |
| 3982 (viper-forward-char-carefully val) | |
| 3983 (setq end-del-pos (point))) | |
| 19078 | 3984 (if viper-use-register |
| 18129 | 3985 (progn |
| 19078 | 3986 (cond ((viper-valid-register viper-use-register '((Letter))) |
| 3987 (viper-append-to-register | |
| 19462 | 3988 (downcase viper-use-register) (point) end-del-pos)) |
| 19078 | 3989 ((viper-valid-register viper-use-register) |
| 18129 | 3990 (copy-to-register |
| 19462 | 3991 viper-use-register (point) end-del-pos nil)) |
| 19078 | 3992 (t (error viper-InvalidRegister viper-use-register))) |
| 3993 (setq viper-use-register nil))) | |
| 19462 | 3994 |
| 3995 (delete-char val t) | |
| 19078 | 3996 (if viper-ex-style-motion |
| 19462 | 3997 (if (and (eolp) (not (bolp))) (backward-char 1))) |
| 3998 )) | |
| 18129 | 3999 |
| 19078 | 4000 (defun viper-delete-backward-char (arg) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4001 "Delete previous character. On reaching beginning of line, stop and beep." |
| 18129 | 4002 (interactive "P") |
| 19462 | 4003 (let ((val (viper-p-val arg)) |
| 4004 end-del-pos) | |
| 19078 | 4005 (viper-set-destructive-command |
| 4006 (list 'viper-delete-backward-char val nil nil nil nil)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4007 (if (and |
| 19462 | 4008 viper-ex-style-editing |
| 4009 (> val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
| 4010 (setq val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
| 4011 (save-excursion | |
| 4012 (viper-backward-char-carefully val) | |
| 4013 (setq end-del-pos (point))) | |
| 19078 | 4014 (if viper-use-register |
| 18129 | 4015 (progn |
| 19078 | 4016 (cond ((viper-valid-register viper-use-register '(Letter)) |
| 4017 (viper-append-to-register | |
| 19462 | 4018 (downcase viper-use-register) end-del-pos (point))) |
| 19078 | 4019 ((viper-valid-register viper-use-register) |
| 18129 | 4020 (copy-to-register |
| 19462 | 4021 viper-use-register end-del-pos (point) nil)) |
| 19078 | 4022 (t (error viper-InvalidRegister viper-use-register))) |
| 4023 (setq viper-use-register nil))) | |
| 19462 | 4024 (if (and (bolp) viper-ex-style-editing) |
| 4025 (ding)) | |
| 4026 (delete-backward-char val t))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4027 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4028 |
| 19078 | 4029 (defun viper-del-backward-char-in-insert () |
| 18129 | 4030 "Delete 1 char backwards while in insert mode." |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4031 (interactive) |
| 19462 | 4032 (if (and viper-ex-style-editing (bolp)) |
| 18129 | 4033 (beep 1) |
| 4034 (delete-backward-char 1 t))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4035 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4036 |
| 19078 | 4037 (defun viper-del-backward-char-in-replace () |
| 18129 | 4038 "Delete one character in replace mode. |
| 19078 | 4039 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4040 charecters. If it is nil, then the cursor just moves backwards, similarly |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4041 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
| 18129 | 4042 cursor move past the beginning of line." |
| 4043 (interactive) | |
| 19078 | 4044 (cond (viper-delete-backwards-in-replace |
| 18129 | 4045 (cond ((not (bolp)) |
| 4046 (delete-backward-char 1 t)) | |
| 19462 | 4047 (viper-ex-style-editing |
| 18129 | 4048 (beep 1)) |
| 4049 ((bobp) | |
| 4050 (beep 1)) | |
| 4051 (t | |
| 4052 (delete-backward-char 1 t)))) | |
| 19462 | 4053 (viper-ex-style-editing |
| 18129 | 4054 (if (bolp) |
| 4055 (beep 1) | |
| 4056 (backward-char 1))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4057 (t |
| 18129 | 4058 (backward-char 1)))) |
| 4059 | |
| 4060 | |
| 4061 | |
| 4062 ;; join lines. | |
| 4063 | |
| 19078 | 4064 (defun viper-join-lines (arg) |
| 18129 | 4065 "Join this line to next, if ARG is nil. Otherwise, join ARG lines." |
| 4066 (interactive "*P") | |
| 19078 | 4067 (let ((val (viper-P-val arg))) |
| 4068 (viper-set-destructive-command | |
| 4069 (list 'viper-join-lines val nil nil nil nil)) | |
| 4070 (viper-loop (if (null val) 1 (1- val)) | |
| 18129 | 4071 (end-of-line) |
| 4072 (if (not (eobp)) | |
| 4073 (progn | |
| 4074 (forward-line 1) | |
| 4075 (delete-region (point) (1- (point))) | |
| 18839 | 4076 (fixup-whitespace) |
| 4077 ;; fixup-whitespace sometimes does not leave space | |
| 4078 ;; between objects, so we insert it as in Vi | |
| 4079 (or (looking-at " ") | |
| 4080 (insert " ") | |
| 4081 (backward-char 1)) | |
| 19462 | 4082 ))))) |
| 18129 | 4083 |
| 4084 | |
| 4085 ;; Replace state | |
| 4086 | |
| 19078 | 4087 (defun viper-change (beg end) |
| 18129 | 4088 (if (markerp beg) (setq beg (marker-position beg))) |
| 4089 (if (markerp end) (setq end (marker-position end))) | |
| 4090 ;; beg is sometimes (mark t), which may be nil | |
| 4091 (or beg (setq beg end)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4092 |
| 19078 | 4093 (viper-set-complex-command-for-undo) |
| 4094 (if viper-use-register | |
| 18129 | 4095 (progn |
| 19078 | 4096 (copy-to-register viper-use-register beg end nil) |
| 4097 (setq viper-use-register nil))) | |
| 4098 (viper-set-replace-overlay beg end) | |
| 18129 | 4099 (setq last-command nil) ; separate repl text from prev kills |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4100 |
| 19078 | 4101 (if (= (viper-replace-start) (point-max)) |
| 18129 | 4102 (error "End of buffer")) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4103 |
| 19078 | 4104 (setq viper-last-replace-region |
| 4105 (buffer-substring (viper-replace-start) | |
| 4106 (viper-replace-end))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4107 |
| 18129 | 4108 ;; protect against error while inserting "@" and other disasters |
| 4109 ;; (e.g., read-only buff) | |
| 4110 (condition-case conds | |
| 19078 | 4111 (if (or viper-allow-multiline-replace-regions |
| 4112 (viper-same-line (viper-replace-start) | |
| 19203 | 4113 (viper-replace-end))) |
| 18129 | 4114 (progn |
| 4115 ;; tabs cause problems in replace, so untabify | |
| 19078 | 4116 (goto-char (viper-replace-end)) |
| 18129 | 4117 (insert-before-markers "@") ; put placeholder after the TAB |
| 19078 | 4118 (untabify (viper-replace-start) (point)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4119 ;; del @, don't put on kill ring |
| 18129 | 4120 (delete-backward-char 1) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4121 |
| 19078 | 4122 (viper-set-replace-overlay-glyphs |
| 4123 viper-replace-region-start-delimiter | |
| 4124 viper-replace-region-end-delimiter) | |
| 18129 | 4125 ;; this move takes care of the last posn in the overlay, which |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4126 ;; has to be shifted because of insert. We can't simply insert |
| 18129 | 4127 ;; "$" before-markers because then overlay-start will shift the |
| 4128 ;; beginning of the overlay in case we are replacing a single | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4129 ;; character. This fixes the bug with `s' and `cl' commands. |
| 19078 | 4130 (viper-move-replace-overlay (viper-replace-start) (point)) |
| 4131 (goto-char (viper-replace-start)) | |
| 4132 (viper-change-state-to-replace t)) | |
| 4133 (kill-region (viper-replace-start) | |
| 4134 (viper-replace-end)) | |
| 4135 (viper-hide-replace-overlay) | |
| 4136 (viper-change-state-to-insert)) | |
| 18129 | 4137 (error ;; make sure that the overlay doesn't stay. |
| 4138 ;; go back to the original point | |
| 19078 | 4139 (goto-char (viper-replace-start)) |
| 4140 (viper-hide-replace-overlay) | |
| 4141 (viper-message-conditions conds)))) | |
| 4142 | |
| 4143 | |
| 4144 (defun viper-change-subr (beg end) | |
| 18129 | 4145 ;; beg is sometimes (mark t), which may be nil |
| 4146 (or beg (setq beg end)) | |
| 19078 | 4147 (if viper-use-register |
| 18129 | 4148 (progn |
| 19078 | 4149 (copy-to-register viper-use-register beg end nil) |
| 4150 (setq viper-use-register nil))) | |
| 18129 | 4151 (kill-region beg end) |
| 19078 | 4152 (setq this-command 'viper-change) |
| 4153 (viper-yank-last-insertion)) | |
| 4154 | |
| 4155 (defun viper-toggle-case (arg) | |
| 18129 | 4156 "Toggle character case." |
| 4157 (interactive "P") | |
| 19078 | 4158 (let ((val (viper-p-val arg)) (c)) |
| 4159 (viper-set-destructive-command | |
| 4160 (list 'viper-toggle-case val nil nil nil nil)) | |
| 18129 | 4161 (while (> val 0) |
| 4162 (setq c (following-char)) | |
| 4163 (delete-char 1 nil) | |
| 4164 (if (eq c (upcase c)) | |
| 4165 (insert-char (downcase c) 1) | |
| 4166 (insert-char (upcase c) 1)) | |
| 4167 (if (eolp) (backward-char 1)) | |
| 4168 (setq val (1- val))))) | |
| 4169 | |
| 4170 | |
| 4171 ;; query replace | |
| 4172 | |
| 19078 | 4173 (defun viper-query-replace () |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4174 "Query replace. |
| 18129 | 4175 If a null string is suplied as the string to be replaced, |
| 4176 the query replace mode will toggle between string replace | |
| 4177 and regexp replace." | |
| 4178 (interactive) | |
| 4179 (let (str) | |
| 19078 | 4180 (setq str (viper-read-string-with-history |
| 4181 (if viper-re-query-replace "Query replace regexp: " | |
| 18129 | 4182 "Query replace: ") |
| 4183 nil ; no initial | |
| 19078 | 4184 'viper-replace1-history |
| 4185 (car viper-replace1-history) ; default | |
| 18129 | 4186 )) |
| 4187 (if (string= str "") | |
| 4188 (progn | |
| 19078 | 4189 (setq viper-re-query-replace (not viper-re-query-replace)) |
| 18129 | 4190 (message "Query replace mode changed to %s" |
| 19078 | 4191 (if viper-re-query-replace "regexp replace" |
| 18129 | 4192 "string replace"))) |
| 19078 | 4193 (if viper-re-query-replace |
| 18129 | 4194 (query-replace-regexp |
| 4195 str | |
| 19078 | 4196 (viper-read-string-with-history |
| 18129 | 4197 (format "Query replace regexp `%s' with: " str) |
| 4198 nil ; no initial | |
| 19078 | 4199 'viper-replace1-history |
| 4200 (car viper-replace1-history) ; default | |
| 18129 | 4201 )) |
| 4202 (query-replace | |
| 4203 str | |
| 19078 | 4204 (viper-read-string-with-history |
| 18129 | 4205 (format "Query replace `%s' with: " str) |
| 4206 nil ; no initial | |
| 19078 | 4207 'viper-replace1-history |
| 4208 (car viper-replace1-history) ; default | |
| 18129 | 4209 )))))) |
| 4210 | |
| 4211 | |
| 4212 ;; marking | |
| 4213 | |
| 19078 | 4214 (defun viper-mark-beginning-of-buffer () |
| 18129 | 4215 "Mark beginning of buffer." |
| 4216 (interactive) | |
| 4217 (push-mark (point)) | |
| 4218 (goto-char (point-min)) | |
| 4219 (exchange-point-and-mark) | |
| 4220 (message "Mark set at the beginning of buffer")) | |
| 4221 | |
| 19078 | 4222 (defun viper-mark-end-of-buffer () |
| 18129 | 4223 "Mark end of buffer." |
| 4224 (interactive) | |
| 4225 (push-mark (point)) | |
| 4226 (goto-char (point-max)) | |
| 4227 (exchange-point-and-mark) | |
| 4228 (message "Mark set at the end of buffer")) | |
| 4229 | |
| 19078 | 4230 (defun viper-mark-point () |
| 18129 | 4231 "Set mark at point of buffer." |
| 4232 (interactive) | |
| 4233 (let ((char (read-char))) | |
| 4234 (cond ((and (<= ?a char) (<= char ?z)) | |
| 4235 (point-to-register (1+ (- char ?a)))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4236 ((viper= char ?<) (viper-mark-beginning-of-buffer)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4237 ((viper= char ?>) (viper-mark-end-of-buffer)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4238 ((viper= char ?.) (viper-set-mark-if-necessary)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4239 ((viper= char ?,) (viper-cycle-through-mark-ring)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4240 ((viper= char ?^) (push-mark viper-saved-mark t t)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4241 ((viper= char ?D) (mark-defun)) |
| 18129 | 4242 (t (error "")) |
| 4243 ))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4244 |
| 18129 | 4245 ;; Algorithm: If first invocation of this command save mark on ring, goto |
| 4246 ;; mark, M0, and pop the most recent elt from the mark ring into mark, | |
| 4247 ;; making it into the new mark, M1. | |
| 4248 ;; Push this mark back and set mark to the original point position, p1. | |
| 4249 ;; So, if you hit '' or `` then you can return to p1. | |
| 4250 ;; | |
| 4251 ;; If repeated command, pop top elt from the ring into mark and | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4252 ;; jump there. This forgets the position, p1, and puts M1 back into mark. |
| 18129 | 4253 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from |
| 4254 ;; the ring into mark. Push M2 back on the ring and set mark to M0. | |
| 4255 ;; etc. | |
| 19078 | 4256 (defun viper-cycle-through-mark-ring () |
| 18129 | 4257 "Visit previous locations on the mark ring. |
| 4258 One can use `` and '' to temporarily jump 1 step back." | |
| 4259 (let* ((sv-pt (point))) | |
| 4260 ;; if repeated `m,' command, pop the previously saved mark. | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4261 ;; Prev saved mark is actually prev saved point. It is used if the |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4262 ;; user types `` or '' and is discarded |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4263 ;; from the mark ring by the next `m,' command. |
| 18129 | 4264 ;; In any case, go to the previous or previously saved mark. |
| 4265 ;; Then push the current mark (popped off the ring) and set current | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4266 ;; point to be the mark. Current pt as mark is discarded by the next |
| 18129 | 4267 ;; m, command. |
| 19078 | 4268 (if (eq last-command 'viper-cycle-through-mark-ring) |
| 18129 | 4269 () |
| 4270 ;; save current mark if the first iteration | |
| 19078 | 4271 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
| 18129 | 4272 (if (mark t) |
| 4273 (push-mark (mark t) t)) ) | |
| 4274 (pop-mark) | |
| 4275 (set-mark-command 1) | |
| 4276 ;; don't duplicate mark on the ring | |
| 19078 | 4277 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
| 18129 | 4278 (push-mark sv-pt t) |
| 19078 | 4279 (viper-deactivate-mark) |
| 4280 (setq this-command 'viper-cycle-through-mark-ring) | |
| 18129 | 4281 )) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4282 |
| 18129 | 4283 |
| 19078 | 4284 (defun viper-goto-mark (arg) |
| 18129 | 4285 "Go to mark." |
| 4286 (interactive "P") | |
| 4287 (let ((char (read-char)) | |
| 19078 | 4288 (com (viper-getcom arg))) |
| 4289 (viper-goto-mark-subr char com nil))) | |
| 4290 | |
| 4291 (defun viper-goto-mark-and-skip-white (arg) | |
| 18129 | 4292 "Go to mark and skip to first non-white character on line." |
| 4293 (interactive "P") | |
| 4294 (let ((char (read-char)) | |
| 19078 | 4295 (com (viper-getCom arg))) |
| 4296 (viper-goto-mark-subr char com t))) | |
| 4297 | |
| 4298 (defun viper-goto-mark-subr (char com skip-white) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4299 (if (eobp) |
| 18129 | 4300 (if (bobp) |
| 4301 (error "Empty buffer") | |
| 4302 (backward-char 1))) | |
| 19078 | 4303 (cond ((viper-valid-register char '(letter)) |
| 18129 | 4304 (let* ((buff (current-buffer)) |
| 4305 (reg (1+ (- char ?a))) | |
| 4306 (text-marker (get-register reg))) | |
|
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4307 ;; If marker points to file that had markers set (and those markers |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4308 ;; were saved (as e.g., in session.el), then restore those markers |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4309 (if (and (consp text-marker) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4310 (eq (car text-marker) 'file-query) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4311 (or (find-buffer-visiting (nth 1 text-marker)) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4312 (y-or-n-p (format "Visit file %s again? " |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4313 (nth 1 text-marker))))) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4314 (save-excursion |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4315 (find-file (nth 1 text-marker)) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4316 (when (and (<= (nth 2 text-marker) (point-max)) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4317 (<= (point-min) (nth 2 text-marker))) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4318 (setq text-marker (copy-marker (nth 2 text-marker))) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4319 (set-register reg text-marker)))) |
| 19078 | 4320 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 4321 (if (not (viper-valid-marker text-marker)) | |
| 4322 (error viper-EmptyTextmarker char)) | |
| 4323 (if (and (viper-same-line (point) viper-last-jump) | |
| 4324 (= (point) viper-last-jump-ignore)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4325 (push-mark viper-last-jump t) |
| 18129 | 4326 (push-mark nil t)) ; no msg |
| 19078 | 4327 (viper-register-to-point reg) |
| 4328 (setq viper-last-jump (point-marker)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4329 (cond (skip-white |
| 18129 | 4330 (back-to-indentation) |
| 19078 | 4331 (setq viper-last-jump-ignore (point)))) |
| 18129 | 4332 (if com |
| 4333 (if (equal buff (current-buffer)) | |
| 19078 | 4334 (viper-execute-com (if skip-white |
| 4335 'viper-goto-mark-and-skip-white | |
| 4336 'viper-goto-mark) | |
| 18129 | 4337 nil com) |
| 4338 (switch-to-buffer buff) | |
| 19078 | 4339 (goto-char viper-com-point) |
| 4340 (viper-change-state-to-vi) | |
| 18129 | 4341 (error ""))))) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4342 ((and (not skip-white) (viper= char ?`)) |
| 19078 | 4343 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 4344 (if (and (viper-same-line (point) viper-last-jump) | |
| 4345 (= (point) viper-last-jump-ignore)) | |
| 4346 (goto-char viper-last-jump)) | |
| 18129 | 4347 (if (null (mark t)) (error "Mark is not set in this buffer")) |
| 4348 (if (= (point) (mark t)) (pop-mark)) | |
| 4349 (exchange-point-and-mark) | |
| 19078 | 4350 (setq viper-last-jump (point-marker) |
| 4351 viper-last-jump-ignore 0) | |
| 4352 (if com (viper-execute-com 'viper-goto-mark nil com))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4353 ((and skip-white (viper= char ?')) |
| 19078 | 4354 (if com (viper-move-marker-locally 'viper-com-point (point))) |
| 4355 (if (and (viper-same-line (point) viper-last-jump) | |
| 4356 (= (point) viper-last-jump-ignore)) | |
| 4357 (goto-char viper-last-jump)) | |
| 18129 | 4358 (if (= (point) (mark t)) (pop-mark)) |
| 4359 (exchange-point-and-mark) | |
| 19078 | 4360 (setq viper-last-jump (point)) |
| 18129 | 4361 (back-to-indentation) |
| 19078 | 4362 (setq viper-last-jump-ignore (point)) |
| 4363 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com))) | |
| 4364 (t (error viper-InvalidTextmarker char)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4365 |
| 19078 | 4366 (defun viper-insert-tab () |
| 18129 | 4367 (interactive) |
| 4368 (insert-tab)) | |
| 4369 | |
| 19078 | 4370 (defun viper-exchange-point-and-mark () |
| 18129 | 4371 (interactive) |
| 4372 (exchange-point-and-mark) | |
| 4373 (back-to-indentation)) | |
| 4374 | |
| 4375 ;; Input Mode Indentation | |
| 4376 | |
| 4377 ;; Returns t, if the string before point matches the regexp STR. | |
| 19078 | 4378 (defsubst viper-looking-back (str) |
| 18129 | 4379 (and (save-excursion (re-search-backward str nil t)) |
| 4380 (= (point) (match-end 0)))) | |
| 4381 | |
| 4382 | |
| 19078 | 4383 (defun viper-forward-indent () |
| 18129 | 4384 "Indent forward -- `C-t' in Vi." |
| 4385 (interactive) | |
| 19078 | 4386 (setq viper-cted t) |
| 4387 (indent-to (+ (current-column) viper-shift-width))) | |
| 4388 | |
| 4389 (defun viper-backward-indent () | |
| 18129 | 4390 "Backtab, C-d in VI" |
| 4391 (interactive) | |
| 19078 | 4392 (if viper-cted |
| 18129 | 4393 (let ((p (point)) (c (current-column)) bol (indent t)) |
| 19078 | 4394 (if (viper-looking-back "[0^]") |
| 18129 | 4395 (progn |
| 4396 (if (eq ?^ (preceding-char)) | |
| 19078 | 4397 (setq viper-preserve-indent t)) |
| 18129 | 4398 (delete-backward-char 1) |
| 4399 (setq p (point)) | |
| 4400 (setq indent nil))) | |
| 4401 (save-excursion | |
| 4402 (beginning-of-line) | |
| 4403 (setq bol (point))) | |
| 4404 (if (re-search-backward "[^ \t]" bol 1) (forward-char)) | |
| 4405 (delete-region (point) p) | |
| 4406 (if indent | |
| 19078 | 4407 (indent-to (- c viper-shift-width))) |
| 4408 (if (or (bolp) (viper-looking-back "[^ \t]")) | |
| 4409 (setq viper-cted nil))))) | |
| 4410 | |
| 4411 (defun viper-autoindent () | |
| 18129 | 4412 "Auto Indentation, Vi-style." |
| 4413 (interactive) | |
| 4414 (let ((col (current-indentation))) | |
| 4415 (if abbrev-mode (expand-abbrev)) | |
| 19078 | 4416 (if viper-preserve-indent |
| 4417 (setq viper-preserve-indent nil) | |
| 4418 (setq viper-current-indent col)) | |
| 18129 | 4419 ;; don't leave whitespace lines around |
| 4420 (if (memq last-command | |
| 19078 | 4421 '(viper-autoindent |
| 4422 viper-open-line viper-Open-line | |
| 4423 viper-replace-state-exit-cmd)) | |
| 18129 | 4424 (indent-to-left-margin)) |
| 4425 ;; use \n instead of newline, or else <Return> will move the insert point | |
| 4426 ;;(newline 1) | |
| 4427 (insert "\n") | |
| 19078 | 4428 (if viper-auto-indent |
| 18129 | 4429 (progn |
| 19078 | 4430 (setq viper-cted t) |
| 4431 (if (and viper-electric-mode | |
| 4432 (not | |
| 4433 (memq major-mode '(fundamental-mode | |
| 4434 text-mode | |
| 4435 paragraph-indent-text-mode )))) | |
| 18129 | 4436 (indent-according-to-mode) |
| 19078 | 4437 (indent-to viper-current-indent)) |
| 18129 | 4438 )) |
| 4439 )) | |
| 4440 | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4441 |
| 18129 | 4442 ;; Viewing registers |
| 4443 | |
| 19078 | 4444 (defun viper-ket-function (arg) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4445 "Function called by \], the ket. View registers and call \]\]." |
| 18129 | 4446 (interactive "P") |
| 4447 (let ((reg (read-char))) | |
| 19078 | 4448 (cond ((viper-valid-register reg '(letter Letter)) |
| 18129 | 4449 (view-register (downcase reg))) |
| 19078 | 4450 ((viper-valid-register reg '(digit)) |
| 18129 | 4451 (let ((text (current-kill (- reg ?1) 'do-not-rotate))) |
| 20003 | 4452 (with-output-to-temp-buffer " *viper-info*" |
| 4453 (princ (format "Register %c contains the string:\n" reg)) | |
| 4454 (princ text)) | |
| 4455 )) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4456 ((viper= ?\] reg) |
| 19078 | 4457 (viper-next-heading arg)) |
| 18129 | 4458 (t (error |
| 19078 | 4459 viper-InvalidRegister reg))))) |
| 4460 | |
| 4461 (defun viper-brac-function (arg) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4462 "Function called by \[, the brac. View textmarkers and call \[\[" |
| 18129 | 4463 (interactive "P") |
| 4464 (let ((reg (read-char))) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4465 (cond ((viper= ?\[ reg) |
| 19078 | 4466 (viper-prev-heading arg)) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4467 ((viper= ?\] reg) |
| 19078 | 4468 (viper-heading-end arg)) |
| 4469 ((viper-valid-register reg '(letter)) | |
| 18129 | 4470 (let* ((val (get-register (1+ (- reg ?a)))) |
| 20003 | 4471 (buf (if (not (markerp val)) |
| 19078 | 4472 (error viper-EmptyTextmarker reg) |
| 18129 | 4473 (marker-buffer val))) |
| 4474 (pos (marker-position val)) | |
| 4475 line-no text (s pos) (e pos)) | |
| 20003 | 4476 (with-output-to-temp-buffer " *viper-info*" |
| 18129 | 4477 (if (and buf pos) |
| 4478 (progn | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4479 (save-excursion |
| 18129 | 4480 (set-buffer buf) |
| 4481 (setq line-no (1+ (count-lines (point-min) val))) | |
| 4482 (goto-char pos) | |
| 4483 (beginning-of-line) | |
| 4484 (if (re-search-backward "[^ \t]" nil t) | |
| 4485 (progn | |
| 4486 (beginning-of-line) | |
| 4487 (setq s (point)))) | |
| 4488 (goto-char pos) | |
| 4489 (forward-line 1) | |
| 4490 (if (re-search-forward "[^ \t]" nil t) | |
| 4491 (progn | |
| 4492 (end-of-line) | |
| 4493 (setq e (point)))) | |
| 4494 (setq text (buffer-substring s e)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4495 (setq text (format "%s<%c>%s" |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4496 (substring text 0 (- pos s)) |
| 18129 | 4497 reg (substring text (- pos s))))) |
| 20003 | 4498 (princ |
| 18129 | 4499 (format |
| 4500 "Textmarker `%c' is in buffer `%s' at line %d.\n" | |
| 4501 reg (buffer-name buf) line-no)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4502 (princ (format "Here is some text around %c:\n\n %s" |
| 18129 | 4503 reg text))) |
| 20003 | 4504 (princ (format viper-EmptyTextmarker reg)))) |
| 4505 )) | |
| 19078 | 4506 (t (error viper-InvalidTextmarker reg))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4507 |
| 18129 | 4508 |
| 4509 | |
| 4510 ;; commands in insertion mode | |
| 4511 | |
| 19078 | 4512 (defun viper-delete-backward-word (arg) |
| 18129 | 4513 "Delete previous word." |
| 4514 (interactive "p") | |
| 4515 (save-excursion | |
| 4516 (push-mark nil t) | |
| 4517 (backward-word arg) | |
| 4518 (delete-region (point) (mark t)) | |
| 4519 (pop-mark))) | |
| 4520 | |
| 4521 | |
| 18839 | 4522 (defun viper-set-expert-level (&optional dont-change-unless) |
| 18129 | 4523 "Sets the expert level for a Viper user. |
| 4524 Can be called interactively to change (temporarily or permanently) the | |
| 4525 current expert level. | |
| 4526 | |
| 18289 | 4527 The optional argument DONT-CHANGE-UNLESS, if not nil, says that |
| 18129 | 4528 the level should not be changed, unless its current value is |
| 4529 meaningless (i.e., not one of 1,2,3,4,5). | |
| 4530 | |
| 4531 User level determines the setting of Viper variables that are most | |
| 4532 sensitive for VI-style look-and-feel." | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4533 |
| 18129 | 4534 (interactive) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4535 |
| 18839 | 4536 (if (not (natnump viper-expert-level)) (setq viper-expert-level 0)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4537 |
| 18129 | 4538 (save-window-excursion |
| 4539 (delete-other-windows) | |
| 18839 | 4540 ;; if 0 < viper-expert-level < viper-max-expert-level |
| 18129 | 4541 ;; & dont-change-unless = t -- use it; else ask |
| 19078 | 4542 (viper-ask-level dont-change-unless)) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4543 |
| 19078 | 4544 (setq viper-always t |
| 4545 viper-ex-style-motion t | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4546 viper-ex-style-editing t |
| 19078 | 4547 viper-want-ctl-h-help nil) |
| 18129 | 4548 |
| 18839 | 4549 (cond ((eq viper-expert-level 1) ; novice or beginner |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4550 (global-set-key ; in emacs-state |
| 19078 | 4551 viper-toggle-key |
| 4552 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | |
| 4553 (setq viper-no-multiple-ESC t | |
| 4554 viper-re-search t | |
| 4555 viper-vi-style-in-minibuffer t | |
| 4556 viper-search-wrap-around-t t | |
| 4557 viper-electric-mode nil | |
| 4558 viper-want-emacs-keys-in-vi nil | |
| 4559 viper-want-emacs-keys-in-insert nil)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4560 |
| 18839 | 4561 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |
| 18129 | 4562 ;; intermediate to guru |
| 19078 | 4563 (setq viper-no-multiple-ESC (if (viper-window-display-p) |
| 4564 t 'twice) | |
| 4565 viper-electric-mode t | |
| 4566 viper-want-emacs-keys-in-vi t | |
| 4567 viper-want-emacs-keys-in-insert (> viper-expert-level 2)) | |
| 4568 | |
| 4569 (if (eq viper-expert-level 4) ; respect user's ex-style motion | |
| 4570 ; and viper-no-multiple-ESC | |
| 18129 | 4571 (progn |
| 18839 | 4572 (setq-default |
| 19462 | 4573 viper-ex-style-editing |
| 4574 (viper-standard-value 'viper-ex-style-editing) | |
| 19078 | 4575 viper-ex-style-motion |
| 4576 (viper-standard-value 'viper-ex-style-motion)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4577 (setq viper-ex-style-motion |
| 19078 | 4578 (viper-standard-value 'viper-ex-style-motion) |
| 19462 | 4579 viper-ex-style-editing |
| 4580 (viper-standard-value 'viper-ex-style-editing) | |
| 19078 | 4581 viper-re-search |
| 4582 (viper-standard-value 'viper-re-search) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4583 viper-no-multiple-ESC |
| 19078 | 4584 (viper-standard-value 'viper-no-multiple-ESC))))) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4585 |
| 18129 | 4586 ;; A wizard!! |
| 4587 ;; Ideally, if 5 is selected, a buffer should pop up to let the | |
| 4588 ;; user toggle the values of variables. | |
| 19462 | 4589 (t (setq-default viper-ex-style-editing |
| 4590 (viper-standard-value 'viper-ex-style-editing) | |
| 19078 | 4591 viper-ex-style-motion |
| 4592 (viper-standard-value 'viper-ex-style-motion)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4593 (setq viper-want-ctl-h-help |
| 19078 | 4594 (viper-standard-value 'viper-want-ctl-h-help) |
| 18289 | 4595 viper-always |
| 18839 | 4596 (viper-standard-value 'viper-always) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4597 viper-no-multiple-ESC |
| 19078 | 4598 (viper-standard-value 'viper-no-multiple-ESC) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4599 viper-ex-style-motion |
| 19078 | 4600 (viper-standard-value 'viper-ex-style-motion) |
| 19462 | 4601 viper-ex-style-editing |
| 4602 (viper-standard-value 'viper-ex-style-editing) | |
| 19078 | 4603 viper-re-search |
| 4604 (viper-standard-value 'viper-re-search) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4605 viper-electric-mode |
| 19078 | 4606 (viper-standard-value 'viper-electric-mode) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4607 viper-want-emacs-keys-in-vi |
| 19078 | 4608 (viper-standard-value 'viper-want-emacs-keys-in-vi) |
| 4609 viper-want-emacs-keys-in-insert | |
| 4610 (viper-standard-value 'viper-want-emacs-keys-in-insert)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4611 |
| 19078 | 4612 (viper-set-mode-vars-for viper-current-state) |
| 18289 | 4613 (if (or viper-always |
| 18839 | 4614 (and (> viper-expert-level 0) (> 5 viper-expert-level))) |
| 19078 | 4615 (viper-set-hooks))) |
| 18129 | 4616 |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4617 |
| 18129 | 4618 ;; Ask user expert level. |
| 19078 | 4619 (defun viper-ask-level (dont-change-unless) |
| 4620 (let ((ask-buffer " *viper-ask-level*") | |
| 18129 | 4621 level-changed repeated) |
| 4622 (save-window-excursion | |
| 4623 (switch-to-buffer ask-buffer) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4624 |
| 18839 | 4625 (while (or (> viper-expert-level viper-max-expert-level) |
| 4626 (< viper-expert-level 1) | |
| 18129 | 4627 (null dont-change-unless)) |
| 4628 (erase-buffer) | |
| 4629 (if repeated | |
| 4630 (progn | |
| 4631 (message "Invalid user level") | |
| 4632 (beep 1)) | |
| 4633 (setq repeated t)) | |
| 4634 (setq dont-change-unless t | |
| 4635 level-changed t) | |
| 4636 (insert " | |
| 4637 Please specify your level of familiarity with the venomous VI PERil | |
| 4638 (and the VI Plan for Emacs Rescue). | |
| 18839 | 4639 You can change it at any time by typing `M-x viper-set-expert-level RET' |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4640 |
| 18129 | 4641 1 -- BEGINNER: Almost all Emacs features are suppressed. |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4642 Feels almost like straight Vi. File name completion and |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4643 command history in the minibuffer are thrown in as a bonus. |
| 19078 | 4644 To use Emacs productively, you must reach level 3 or higher. |
| 18129 | 4645 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state, |
| 19078 | 4646 so most Emacs commands can be used when Viper is in Vi state. |
| 4647 Good progress---you are well on the way to level 3! | |
| 18129 | 4648 3 -- GRAND MASTER: Like 3, but most Emacs commands are available also |
| 19078 | 4649 in Viper's insert state. |
| 4650 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC, | |
| 19462 | 4651 viper-ex-style-motion, viper-ex-style-editing, and |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4652 viper-re-search variables. Adjust these settings to your taste. |
| 18289 | 4653 5 -- WIZARD: Like 4, but user settings are also respected for viper-always, |
| 19078 | 4654 viper-electric-mode, viper-want-ctl-h-help, viper-want-emacs-keys-in-vi, |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4655 and viper-want-emacs-keys-in-insert. Adjust these to your taste. |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4656 |
| 18129 | 4657 Please, specify your level now: ") |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4658 |
| 19078 | 4659 (setq viper-expert-level (- (viper-read-char-exclusive) ?0)) |
| 18129 | 4660 ) ; end while |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4661 |
| 18129 | 4662 ;; tell the user if level was changed |
| 4663 (and level-changed | |
| 4664 (progn | |
| 4665 (insert | |
| 4666 (format "\n\n\n\n\n\t\tYou have selected user level %d" | |
| 18839 | 4667 viper-expert-level)) |
| 18129 | 4668 (if (y-or-n-p "Do you wish to make this change permanent? ") |
| 18839 | 4669 ;; save the setting for viper-expert-level |
| 19078 | 4670 (viper-save-setting |
| 18839 | 4671 'viper-expert-level |
| 4672 (format "Saving user level %d ..." viper-expert-level) | |
| 19078 | 4673 viper-custom-file-name)) |
| 18129 | 4674 )) |
| 4675 (bury-buffer) ; remove ask-buffer from screen | |
| 4676 (message "") | |
| 4677 ))) | |
| 4678 | |
| 4679 | |
| 19078 | 4680 (defun viper-nil () |
| 18129 | 4681 (interactive) |
| 4682 (beep 1)) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4683 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4684 |
| 18129 | 4685 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
| 19078 | 4686 (defun viper-register-to-point (char &optional enforce-buffer) |
| 18129 | 4687 "Like jump-to-register, but switches to another buffer in another window." |
| 4688 (interactive "cViper register to point: ") | |
| 4689 (let ((val (get-register char))) | |
| 4690 (cond | |
| 4691 ((and (fboundp 'frame-configuration-p) | |
| 4692 (frame-configuration-p val)) | |
| 4693 (set-frame-configuration val)) | |
| 4694 ((window-configuration-p val) | |
| 4695 (set-window-configuration val)) | |
| 19078 | 4696 ((viper-valid-marker val) |
| 18129 | 4697 (if (and enforce-buffer |
| 4698 (not (equal (current-buffer) (marker-buffer val)))) | |
| 19078 | 4699 (error (concat viper-EmptyTextmarker " in this buffer") |
| 18129 | 4700 (1- (+ char ?a)))) |
| 4701 (pop-to-buffer (marker-buffer val)) | |
| 4702 (goto-char val)) | |
| 4703 ((and (consp val) (eq (car val) 'file)) | |
| 4704 (find-file (cdr val))) | |
| 4705 (t | |
| 19078 | 4706 (error viper-EmptyTextmarker (1- (+ char ?a))))))) |
| 4707 | |
| 4708 | |
| 4709 (defun viper-save-kill-buffer () | |
| 18129 | 4710 "Save then kill current buffer. " |
| 4711 (interactive) | |
| 18839 | 4712 (if (< viper-expert-level 2) |
| 18129 | 4713 (save-buffers-kill-emacs) |
| 4714 (save-buffer) | |
| 4715 (kill-buffer (current-buffer)))) | |
| 4716 | |
| 4717 | |
| 4718 | |
| 4719 ;;; Bug Report | |
| 4720 | |
| 19078 | 4721 (defun viper-submit-report () |
| 18129 | 4722 "Submit bug report on Viper." |
| 4723 (interactive) | |
| 4724 (let ((reporter-prompt-for-summary-p t) | |
| 19078 | 4725 (viper-device-type (viper-device-type)) |
| 18129 | 4726 color-display-p frame-parameters |
| 4727 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face | |
| 4728 varlist salutation window-config) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4729 |
| 18129 | 4730 ;; If mode info is needed, add variable to `let' and then set it below, |
| 4731 ;; like we did with color-display-p. | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4732 (setq color-display-p (if (viper-window-display-p) |
| 19078 | 4733 (viper-color-display-p) |
| 18129 | 4734 'non-x) |
| 19078 | 4735 minibuffer-vi-face (if (viper-has-face-support-p) |
| 4736 (viper-get-face viper-minibuffer-vi-face) | |
| 18129 | 4737 'non-x) |
| 19078 | 4738 minibuffer-insert-face (if (viper-has-face-support-p) |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4739 (viper-get-face |
| 19078 | 4740 viper-minibuffer-insert-face) |
| 18129 | 4741 'non-x) |
| 19078 | 4742 minibuffer-emacs-face (if (viper-has-face-support-p) |
| 4743 (viper-get-face | |
| 4744 viper-minibuffer-emacs-face) | |
| 18129 | 4745 'non-x) |
| 4746 frame-parameters (if (fboundp 'frame-parameters) | |
| 4747 (frame-parameters (selected-frame)))) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4748 |
| 19078 | 4749 (setq varlist (list 'viper-vi-minibuffer-minor-mode |
| 4750 'viper-insert-minibuffer-minor-mode | |
| 4751 'viper-vi-intercept-minor-mode | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4752 'viper-vi-local-user-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4753 'viper-vi-kbd-minor-mode |
| 19078 | 4754 'viper-vi-global-user-minor-mode |
| 4755 'viper-vi-state-modifier-minor-mode | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4756 'viper-vi-diehard-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4757 'viper-vi-basic-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4758 'viper-replace-minor-mode |
| 19078 | 4759 'viper-insert-intercept-minor-mode |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4760 'viper-insert-local-user-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4761 'viper-insert-kbd-minor-mode |
| 19078 | 4762 'viper-insert-global-user-minor-mode |
| 4763 'viper-insert-state-modifier-minor-mode | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4764 'viper-insert-diehard-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4765 'viper-insert-basic-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4766 'viper-emacs-intercept-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4767 'viper-emacs-local-user-minor-mode |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4768 'viper-emacs-kbd-minor-mode |
| 19078 | 4769 'viper-emacs-global-user-minor-mode |
| 4770 'viper-emacs-state-modifier-minor-mode | |
| 4771 'viper-automatic-iso-accents | |
| 19462 | 4772 'viper-special-input-method |
| 19078 | 4773 'viper-want-emacs-keys-in-insert |
| 4774 'viper-want-emacs-keys-in-vi | |
| 4775 'viper-keep-point-on-undo | |
| 4776 'viper-no-multiple-ESC | |
| 4777 'viper-electric-mode | |
| 4778 'viper-ESC-key | |
| 4779 'viper-want-ctl-h-help | |
| 19462 | 4780 'viper-ex-style-editing |
| 19078 | 4781 'viper-delete-backwards-in-replace |
| 4782 'viper-vi-style-in-minibuffer | |
| 4783 'viper-vi-state-hook | |
| 4784 'viper-insert-state-hook | |
| 4785 'viper-replace-state-hook | |
| 4786 'viper-emacs-state-hook | |
| 18129 | 4787 'ex-cycle-other-window |
| 4788 'ex-cycle-through-non-files | |
| 18839 | 4789 'viper-expert-level |
| 18129 | 4790 'major-mode |
| 19078 | 4791 'viper-device-type |
| 18129 | 4792 'color-display-p |
| 4793 'frame-parameters | |
| 4794 'minibuffer-vi-face | |
| 4795 'minibuffer-insert-face | |
| 4796 'minibuffer-emacs-face | |
| 4797 )) | |
| 4798 (setq salutation " | |
| 4799 Congratulations! You may have unearthed a bug in Viper! | |
| 4800 Please mail a concise, accurate summary of the problem to the address above. | |
| 4801 | |
| 4802 -------------------------------------------------------------------") | |
| 4803 (setq window-config (current-window-configuration)) | |
| 19078 | 4804 (with-output-to-temp-buffer " *viper-info*" |
| 4805 (switch-to-buffer " *viper-info*") | |
| 18129 | 4806 (delete-other-windows) |
| 4807 (princ " | |
| 4808 PLEASE FOLLOW THESE PROCEDURES | |
| 4809 ------------------------------ | |
| 4810 | |
| 4811 Before reporting a bug, please verify that it is related to Viper, and is | |
| 4812 not cause by other packages you are using. | |
| 4813 | |
| 4814 Don't report compilation warnings, unless you are certain that there is a | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4815 problem. These warnings are normal and unavoidable. |
| 18129 | 4816 |
| 4817 Please note that users should not modify variables and keymaps other than | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4818 those advertised in the manual. Such `customization' is likely to crash |
| 18129 | 4819 Viper, as it would any other improperly customized Emacs package. |
| 4820 | |
| 4821 If you are reporting an error message received while executing one of the | |
| 4822 Viper commands, type: | |
| 4823 | |
| 4824 M-x set-variable <Return> debug-on-error <Return> t <Return> | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4825 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4826 Then reproduce the error. The above command will cause Emacs to produce a |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4827 back trace of the execution that leads to the error. Please include this |
| 18129 | 4828 trace in your bug report. |
| 4829 | |
| 4830 If you believe that one of Viper's commands goes into an infinite loop | |
| 4831 \(e.g., Emacs freezes\), type: | |
| 4832 | |
| 4833 M-x set-variable <Return> debug-on-quit <Return> t <Return> | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4834 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4835 Then reproduce the problem. Wait for a few seconds, then type C-g to abort |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4836 the current command. Include the resulting back trace in the bug report. |
| 18129 | 4837 |
| 4838 Mail anyway (y or n)? ") | |
| 4839 (if (y-or-n-p "Mail anyway? ") | |
| 4840 () | |
| 4841 (set-window-configuration window-config) | |
| 4842 (error "Bug report aborted"))) | |
| 4843 | |
| 4844 (require 'reporter) | |
| 4845 (set-window-configuration window-config) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4846 |
| 18129 | 4847 (reporter-submit-bug-report "kifer@cs.sunysb.edu" |
| 19078 | 4848 (viper-version) |
| 18129 | 4849 varlist |
| 4850 nil 'delete-other-windows | |
| 4851 salutation) | |
| 4852 )) | |
|
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4853 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4854 |
|
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4855 |
| 18129 | 4856 ;; Smoothes out the difference between Emacs' unread-command-events |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4857 ;; and XEmacs unread-command-event. Arg is a character, an event, a list of |
| 18129 | 4858 ;; events or a sequence of keys. |
| 4859 ;; | |
| 4860 ;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event | |
| 4861 ;; symbol in unread-command-events list may cause Emacs to turn this symbol | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4862 ;; into an event. Below, we delete nil from event lists, since nil is the most |
| 18129 | 4863 ;; common symbol that might appear in this wrong context. |
| 19078 | 4864 (defun viper-set-unread-command-events (arg) |
| 4865 (if viper-emacs-p | |
| 18129 | 4866 (setq |
| 4867 unread-command-events | |
| 4868 (let ((new-events | |
| 4869 (cond ((eventp arg) (list arg)) | |
| 4870 ((listp arg) arg) | |
| 4871 ((sequencep arg) | |
| 4872 (listify-key-sequence arg)) | |
| 4873 (t (error | |
| 19078 | 4874 "viper-set-unread-command-events: Invalid argument, %S" |
| 18129 | 4875 arg))))) |
| 4876 (if (not (eventp nil)) | |
| 4877 (setq new-events (delq nil new-events))) | |
| 4878 (append new-events unread-command-events))) | |
| 4879 ;; XEmacs | |
| 4880 (setq | |
| 4881 unread-command-events | |
| 4882 (append | |
| 19078 | 4883 (cond ((viper-characterp arg) (list (character-to-event arg))) |
| 18129 | 4884 ((eventp arg) (list arg)) |
| 4885 ((stringp arg) (mapcar 'character-to-event arg)) | |
| 4886 ((vectorp arg) (append arg nil)) ; turn into list | |
| 19078 | 4887 ((listp arg) (viper-eventify-list-xemacs arg)) |
| 18129 | 4888 (t (error |
| 19078 | 4889 "viper-set-unread-command-events: Invalid argument, %S" arg))) |
| 18129 | 4890 unread-command-events)))) |
| 4891 | |
| 4892 ;; list is assumed to be a list of events of characters | |
| 19078 | 4893 (defun viper-eventify-list-xemacs (lis) |
| 18129 | 4894 (mapcar |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4895 (lambda (elt) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4896 (cond ((viper-characterp elt) (character-to-event elt)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4897 ((eventp elt) elt) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4898 (t (error |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4899 "viper-eventify-list-xemacs: can't convert to event, %S" |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4900 elt)))) |
| 18129 | 4901 lis)) |
|
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4902 |
|
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4903 |
| 18129 | 4904 |
| 4905 ;;; viper-cmd.el ends here |
