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