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