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