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