Mercurial > emacs
annotate lisp/emulation/viper-cmd.el @ 110003:336e4a38a76d
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 24 Aug 2010 22:45:30 +0000 |
parents | 5e3accd3ae49 |
children | 280c8ae2476d |
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, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 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 |
99595
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
219 (defun 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 )) |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
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") | |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
722 (if (viper= (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 |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
776 (viper-copy-event (viper-seq-last-elt key)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
777 |
18129 | 778 (if (commandp com) |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
779 ;; 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
|
780 (let ((viper-current-state state)) |
18129 | 781 (setq prefix-arg (or prefix-arg arg)) |
782 (command-execute com))) | |
783 ) | |
784 (quit (ding)) | |
785 (error (beep 1)))) | |
786 ;; set state in the new buffer | |
19078 | 787 (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
|
788 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
789 ;; 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
|
790 ;; 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
|
791 ;; 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
|
792 ;; 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
|
793 ;; 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
|
794 (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
|
795 (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
|
796 (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
|
797 (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
|
798 (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
|
799 (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
|
800 (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
|
801 (condition-case nil |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
802 (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
|
803 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
|
804 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
|
805 ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
806 (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
|
807 (featurep 'emacs) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
808 (fboundp 'quail-input-method)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
809 ;; (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
|
810 ;; 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
|
811 ;; 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
|
812 ;; types a regular key.) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
813 (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
|
814 ;; 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
|
815 ;; 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
|
816 ;; 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
|
817 (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
|
818 ;; 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
|
819 (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
|
820 ;; 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
|
821 (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
|
822 (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
|
823 (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
|
824 (quail-input-method nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
825 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
826 (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
|
827 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
828 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
829 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
830 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
831 (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
|
832 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
833 ((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
|
834 (featurep 'xemacs) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
835 (fboundp 'quail-start-translation)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
836 ;; 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
|
837 ;; quail-input-method |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
838 (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
|
839 (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
|
840 ;; 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
|
841 (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
|
842 ;; 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
|
843 (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
|
844 (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
|
845 (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
|
846 (quail-start-translation nil) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
847 |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
848 (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
|
849 (insert ch) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
850 (insert quail-current-str)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
851 (setq ch (or ch |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
852 (aref quail-current-str |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
853 (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
|
854 )) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
855 ((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
|
856 (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
|
857 ;; 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
|
858 (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
|
859 ;; 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
|
860 (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
|
861 (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
|
862 (insert ch)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
863 (t |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
864 ;;(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
|
865 (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
|
866 (if (featurep 'xemacs) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
867 (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
|
868 ;; 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
|
869 (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
|
870 ;; 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
|
871 (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
|
872 (progn |
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
873 ;;(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
|
874 (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
|
875 (if (featurep 'xemacs) |
72579
5ab6646918c5
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72516
diff
changeset
|
876 (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
|
877 ) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
878 (insert ch)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
879 ) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
880 (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
|
881 (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
|
882 (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
|
883 ) ; let |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
884 (error nil) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
885 ) ; condition-case |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
886 |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
887 (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
|
888 (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
|
889 (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
|
890 ) |
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 |
19078 | 893 (defun viper-exec-form-in-vi (form) |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
894 "Execute FORM in Vi state, regardless of the current Vi state." |
18129 | 895 (let ((buff (current-buffer)) |
896 result) | |
19078 | 897 (viper-set-mode-vars-for 'vi-state) |
18129 | 898 |
899 (condition-case nil | |
19078 | 900 (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
|
901 (setq result (eval form))) |
18129 | 902 (error |
903 (signal 'quit nil))) | |
904 | |
905 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
906 (with-current-buffer buff |
19078 | 907 (viper-set-mode-vars-for viper-current-state))) |
908 (viper-set-mode-vars-for viper-current-state) | |
18129 | 909 result)) |
910 | |
19078 | 911 (defun viper-exec-form-in-emacs (form) |
18129 | 912 "Execute FORM in Emacs, temporarily disabling Viper's minor modes. |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
913 Similar to `viper-escape-to-emacs', but accepts forms rather than keystrokes." |
18129 | 914 (let ((buff (current-buffer)) |
915 result) | |
19078 | 916 (viper-set-mode-vars-for 'emacs-state) |
18129 | 917 (setq result (eval form)) |
918 (if (not (equal buff (current-buffer))) ; cmd switched buffer | |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
919 (with-current-buffer buff |
19078 | 920 (viper-set-mode-vars-for viper-current-state))) |
921 (viper-set-mode-vars-for viper-current-state) | |
18129 | 922 result)) |
923 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
924 ;; 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
|
925 ;; 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
|
926 (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
|
927 (interactive "P") |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
928 (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
|
929 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
930 |
18129 | 931 ;; 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
|
932 ;; bindings. By letting Viper know which files these modes are in, it will |
18129 | 933 ;; arrange to reorganize minor-mode-map-alist so that things will work right. |
19078 | 934 (defun viper-harness-minor-mode (load-file) |
99655
700e59a3b82f
* emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
99595
diff
changeset
|
935 "Familiarize Viper with a minor mode defined in LOAD-FILE. |
18129 | 936 Minor modes that have their own keymaps may overshadow Viper keymaps. |
937 This function is designed to make Viper aware of the packages that define | |
938 such minor modes. | |
939 Usage: | |
19078 | 940 (viper-harness-minor-mode load-file) |
18129 | 941 |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
942 LOAD-FILE is the name of the file where the specific minor mode is defined. |
18129 | 943 Suffixes such as .el or .elc should be stripped." |
944 | |
945 (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
|
946 |
19078 | 947 (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
|
948 |
18129 | 949 ;; Change the default for minor-mode-map-alist each time a harnessed minor |
950 ;; 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
|
951 (unless |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
952 (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
|
953 (eval-after-load |
fbdb9482b6fc
2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64701
diff
changeset
|
954 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))) |
18129 | 955 ) |
956 | |
957 | |
19078 | 958 (defun viper-ESC (arg) |
18129 | 959 "Emulate ESC key in Emacs. |
19078 | 960 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. |
961 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. | |
18129 | 962 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
|
963 keymap. This is more convenient on TTYs, since this won't block |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
964 function keys such as up, down, etc. ESC will also will also work as |
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
965 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC works |
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
966 as a Meta key and any number of multiple escapes are allowed." |
18129 | 967 (interactive "P") |
968 (let (char) | |
19078 | 969 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state)) |
970 (setq char (viper-read-char-exclusive)) | |
971 (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
|
972 ((and (eq viper-no-multiple-ESC 'twice) |
19078 | 973 (eq viper-current-state 'vi-state)) |
974 (setq char (viper-read-char-exclusive)) | |
975 (if (= char (string-to-char viper-ESC-key)) | |
18129 | 976 (ding) |
19078 | 977 (viper-escape-to-emacs arg (list ?\e char) ))) |
18129 | 978 (t (ding))) |
979 )) | |
980 | |
19078 | 981 (defun viper-alternate-Meta-key (arg) |
18129 | 982 "Simulate Emacs Meta key." |
983 (interactive "P") | |
984 (sit-for 1) (message "ESC-") | |
19078 | 985 (viper-escape-to-emacs arg '(?\e))) |
986 | |
987 (defun viper-toggle-key-action () | |
988 "Action bound to `viper-toggle-key'." | |
18129 | 989 (interactive) |
19078 | 990 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z")) |
991 (if (viper-window-display-p) | |
992 (viper-iconify) | |
18129 | 993 (suspend-emacs)) |
19078 | 994 (viper-change-state-to-emacs))) |
18129 | 995 |
996 | |
997 ;; Intercept ESC sequences on dumb terminals. | |
998 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es> | |
999 | |
1000 ;; Check if last key was ESC and if so try to reread it as a function key. | |
1001 ;; But only if there are characters to read during a very short time. | |
1002 ;; Returns the last event, if any. | |
19078 | 1003 (defun viper-envelop-ESC-key () |
18129 | 1004 (let ((event last-input-event) |
1005 (keyseq [nil]) | |
39288
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1006 (inhibit-quit t)) |
19078 | 1007 (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
|
1008 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1009 ;; 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
|
1010 ;; 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
|
1011 ;; 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
|
1012 ;; 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
|
1013 ;; report it. |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1014 ;;(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
|
1015 (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug |
18129 | 1016 (progn |
64485
2273b7101b27
* viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64215
diff
changeset
|
1017 (let (minor-mode-map-alist emulation-mode-map-alists) |
19078 | 1018 (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
|
1019 (setq keyseq (read-key-sequence nil 'continue-echo)) |
18129 | 1020 ) ; let |
1021 ;; If keyseq translates into something that still has ESC | |
1022 ;; at the beginning, separate ESC from the rest of the seq. | |
1023 ;; In XEmacs we check for events that are keypress meta-key | |
1024 ;; and convert them into [escape key] | |
1025 ;; | |
1026 ;; This is needed for the following reason: | |
1027 ;; If ESC is the first symbol, we interpret it as if the | |
1028 ;; user typed ESC and then quickly some other symbols. | |
1029 ;; If ESC is not the first one, then the key sequence | |
1030 ;; entered was apparently translated into a function key or | |
1031 ;; something (e.g., one may have | |
1032 ;; (define-key function-key-map "\e[192z" [f11]) | |
1033 ;; which would translate the escape-sequence generated by | |
1034 ;; f11 in an xterm window into the symbolic key f11. | |
1035 ;; | |
1036 ;; If `first-key' is not an ESC event, we make it into the | |
1037 ;; 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
|
1038 ;; 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
|
1039 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think |
19078 | 1040 ;; that the last event was ESC and so it'll execute whatever is |
18129 | 1041 ;; bound to ESC. (Viper macros can't be bound to |
1042 ;; ESC-sequences). | |
1043 (let* ((first-key (elt keyseq 0)) | |
1044 (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
|
1045 (cond ((and (viper-ESC-event-p first-key) |
99789
125a6fd7c956
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
99655
diff
changeset
|
1046 (not (viper-translate-all-ESC-keysequences))) |
18129 | 1047 ;; put keys following ESC on the unread list |
1048 ;; 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
|
1049 (viper-set-unread-command-events (viper-subseq keyseq 1)) |
18129 | 1050 (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
|
1051 keyseq (if (featurep 'emacs) |
18129 | 1052 "\e" |
1053 (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
|
1054 ((and (featurep 'xemacs) |
18129 | 1055 (key-press-event-p first-key) |
1056 (equal '(meta) key-mod)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1057 (viper-set-unread-command-events |
18129 | 1058 (vconcat (vector |
1059 (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
|
1060 (viper-subseq keyseq 1))) |
18129 | 1061 (setq last-input-event event |
1062 keyseq (vector (character-to-event ?\e)))) | |
1063 ((eventp first-key) | |
19078 | 1064 (setq last-command-event |
1065 (viper-copy-event first-key))) | |
18129 | 1066 )) |
1067 ) ; end progn | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1068 |
18129 | 1069 ;; this is escape event with nothing after it |
1070 ;; put in unread-command-event and then re-read | |
19078 | 1071 (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
|
1072 (setq keyseq (read-key-sequence nil)) |
18129 | 1073 )) |
1074 ;; not an escape event | |
1075 (setq keyseq (vector event))) | |
1076 keyseq)) | |
1077 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1078 |
18129 | 1079 |
1080 ;; Listen to ESC key. | |
1081 ;; If a sequence of keys starting with ESC is issued with very short delays, | |
1082 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key. | |
19078 | 1083 (defun viper-intercept-ESC-key () |
18129 | 1084 "Function that implements ESC key in Viper emulation of Vi." |
1085 (interactive) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1086 (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
|
1087 '(lambda () (interactive) (error "Viper bell"))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1088 |
18129 | 1089 ;; call the actual function to execute ESC (if no other symbols followed) |
1090 ;; 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
|
1091 ;; with very short delay between characters). |
19078 | 1092 (if (eq cmd 'viper-intercept-ESC-key) |
18129 | 1093 (setq cmd |
19078 | 1094 (cond ((eq viper-current-state 'vi-state) |
1095 'viper-ESC) | |
1096 ((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
|
1097 'viper-exit-insert-state) |
19078 | 1098 ((eq viper-current-state 'replace-state) |
1099 'viper-replace-state-exit-cmd) | |
1100 (t 'viper-change-state-to-vi) | |
18129 | 1101 ))) |
1102 (call-interactively cmd))) | |
1103 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1104 |
18129 | 1105 |
1106 | |
1107 ;; prefix argument for Vi mode | |
1108 | |
1109 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM | |
1110 ;; represents the numeric value of the prefix argument and COM represents | |
1111 ;; command prefix such as "c", "d", "m" and "y". | |
1112 | |
1113 ;; Get value part of prefix-argument ARG. | |
19078 | 1114 (defsubst viper-p-val (arg) |
18129 | 1115 (cond ((null arg) 1) |
1116 ((consp arg) | |
1117 (if (or (null (car arg)) (equal (car arg) '(nil))) | |
1118 1 (car arg))) | |
1119 (t arg))) | |
1120 | |
1121 ;; Get raw value part of prefix-argument ARG. | |
19078 | 1122 (defsubst viper-P-val (arg) |
18129 | 1123 (cond ((consp arg) (car arg)) |
1124 (t arg))) | |
1125 | |
1126 ;; Get com part of prefix-argument ARG. | |
19078 | 1127 (defsubst viper-getcom (arg) |
18129 | 1128 (cond ((null arg) nil) |
1129 ((consp arg) (cdr arg)) | |
1130 (t nil))) | |
1131 | |
1132 ;; Get com part of prefix-argument ARG and modify it. | |
19078 | 1133 (defun viper-getCom (arg) |
1134 (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
|
1135 (cond ((viper= com ?c) ?c) |
19078 | 1136 ;; Previously, ?c was being converted to ?C, but this prevented |
1137 ;; multiline replace regions. | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1138 ;;((viper= com ?c) ?C) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1139 ((viper= com ?d) ?D) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1140 ((viper= com ?y) ?Y) |
18129 | 1141 (t com)))) |
1142 | |
1143 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1144 ;; 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
|
1145 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far. |
21940 | 1146 (defun viper-prefix-arg-value (event-char com) |
19078 | 1147 (let ((viper-intermediate-command 'viper-digit-argument) |
1148 value func) | |
18129 | 1149 ;; read while number |
21940 | 1150 (while (and (viper-characterp event-char) |
1151 (>= event-char ?0) (<= event-char ?9)) | |
1152 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0))) | |
1153 (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
|
1154 |
18129 | 1155 (setq prefix-arg value) |
1156 (if com (setq prefix-arg (cons prefix-arg com))) | |
21940 | 1157 (while (eq event-char ?U) |
19078 | 1158 (viper-describe-arg prefix-arg) |
21940 | 1159 (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
|
1160 |
19078 | 1161 (if (or com (and (not (eq viper-current-state 'vi-state)) |
18129 | 1162 ;; make sure it is a Vi command |
21940 | 1163 (viper-characterp event-char) |
1164 (viper-vi-command-p event-char) | |
18129 | 1165 )) |
1166 ;; If appears to be one of the vi commands, | |
1167 ;; then execute it with funcall and clear prefix-arg in order to not | |
1168 ;; confuse subsequent commands | |
1169 (progn | |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1170 ;; last-command-event 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
|
1171 ;; last. If com is not nil, the viper-digit-argument command was |
19078 | 1172 ;; 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
|
1173 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be |
19078 | 1174 ;; `d', `w', etc. If viper-digit-argument was invoked by |
1175 ;; viper-escape-to-vi (which is indicated by the fact that the | |
21940 | 1176 ;; 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
|
1177 ;; vi command to be executed (e.g., `d', `w', etc). Again, |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1178 ;; last-command-event must make emacs believe that this is the command |
19078 | 1179 ;; we typed. |
21940 | 1180 (cond ((eq event-char 'return) (setq event-char ?\C-m)) |
1181 ((eq event-char 'delete) (setq event-char ?\C-?)) | |
1182 ((eq event-char 'backspace) (setq event-char ?\C-h)) | |
1183 ((eq event-char 'space) (setq event-char ?\ ))) | |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1184 (setq last-command-event |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
1185 (if (featurep 'xemacs) |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
1186 (character-to-event (or com event-char)) |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
1187 (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)) |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1260 ;; execute appropriate region command. |
73486
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"))))) |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1288 |
73486
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-event |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1292 (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
|
1293 (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
|
1294 (condition-case err |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1295 (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
|
1296 (error |
81331
c3779fe5830e
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75346
diff
changeset
|
1297 (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
|
1298 )) |
18129 | 1299 |
19078 | 1300 (defun viper-describe-arg (arg) |
18129 | 1301 (let (val com) |
19078 | 1302 (setq val (viper-P-val arg) |
1303 com (viper-getcom arg)) | |
18129 | 1304 (if (null val) |
1305 (if (null com) | |
1306 (message "Value is nil, and command is nil") | |
1307 (message "Value is nil, and command is `%c'" com)) | |
1308 (if (null com) | |
1309 (message "Value is `%d', and command is nil" val) | |
1310 (message "Value is `%d', and command is `%c'" val com))))) | |
1311 | |
19078 | 1312 (defun viper-digit-argument (arg) |
18129 | 1313 "Begin numeric argument for the next command." |
1314 (interactive "P") | |
19078 | 1315 (viper-leave-region-active) |
1316 (viper-prefix-arg-value | |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
1317 (viper-last-command-char) (if (consp arg) (cdr arg) nil))) |
18129 | 1318 |
19078 | 1319 (defun viper-command-argument (arg) |
18129 | 1320 "Accept a motion command as an argument." |
1321 (interactive "P") | |
19078 | 1322 (let ((viper-intermediate-command 'viper-command-argument)) |
18129 | 1323 (condition-case nil |
19078 | 1324 (viper-prefix-arg-com |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
1325 (viper-last-command-char) |
18129 | 1326 (cond ((null arg) nil) |
1327 ((consp arg) (car arg)) | |
1328 ((integerp arg) arg) | |
19078 | 1329 (t (error viper-InvalidCommandArgument))) |
18129 | 1330 (cond ((null arg) nil) |
1331 ((consp arg) (cdr arg)) | |
1332 ((integerp arg) nil) | |
19078 | 1333 (t (error viper-InvalidCommandArgument)))) |
1334 (quit (setq viper-use-register nil) | |
18129 | 1335 (signal 'quit nil))) |
19078 | 1336 (viper-deactivate-mark))) |
18129 | 1337 |
1338 | |
1339 ;; repeat last destructive command | |
1340 | |
1341 ;; Append region to text in register REG. | |
1342 ;; START and END are buffer positions indicating what to append. | |
19078 | 1343 (defsubst viper-append-to-register (reg start end) |
18129 | 1344 (set-register reg (concat (if (stringp (get-register reg)) |
1345 (get-register reg) "") | |
1346 (buffer-substring start end)))) | |
1347 | |
19078 | 1348 ;; Saves last inserted text for possible use by viper-repeat command. |
1349 (defun viper-save-last-insertion (beg end) | |
19756 | 1350 (condition-case nil |
1351 (setq viper-last-insertion (buffer-substring beg end)) | |
1352 (error | |
1353 ;; beg or end marker are somehow screwed up | |
1354 (setq viper-last-insertion nil))) | |
19078 | 1355 (setq viper-last-insertion (buffer-substring beg end)) |
1356 (or (< (length viper-d-com) 5) | |
1357 (setcar (nthcdr 4 viper-d-com) viper-last-insertion)) | |
1358 (or (null viper-command-ring) | |
1359 (ring-empty-p viper-command-ring) | |
18129 | 1360 (progn |
19078 | 1361 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring)) |
1362 viper-last-insertion) | |
18129 | 1363 ;; del most recent elt, if identical to the second most-recent |
19078 | 1364 (viper-cleanup-ring viper-command-ring))) |
18129 | 1365 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1366 |
19078 | 1367 (defsubst viper-yank-last-insertion () |
1368 "Inserts the text saved by the previous viper-save-last-insertion command." | |
18129 | 1369 (condition-case nil |
19078 | 1370 (insert viper-last-insertion) |
18129 | 1371 (error nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1372 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1373 |
18129 | 1374 ;; define functions to be executed |
1375 | |
1376 ;; invoked by the `C' command | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1377 (defun viper-exec-change (m-com com) |
19078 | 1378 (or (and (markerp viper-com-point) (marker-position viper-com-point)) |
1379 (set-marker viper-com-point (point) (current-buffer))) | |
18129 | 1380 ;; handle C cmd at the eol and at eob. |
19078 | 1381 (if (or (and (eolp) (= viper-com-point (point))) |
1382 (= viper-com-point (point-max))) | |
18129 | 1383 (progn |
1384 (insert " ")(backward-char 1))) | |
19078 | 1385 (if (= viper-com-point (point)) |
1386 (viper-forward-char-carefully)) | |
1387 (set-mark viper-com-point) | |
1388 (if (eq m-com 'viper-next-line-at-bol) | |
1389 (viper-enlarge-region (mark t) (point))) | |
1390 (if (< (point) (mark t)) | |
1391 (exchange-point-and-mark)) | |
1392 (if (eq (preceding-char) ?\n) | |
1393 (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
|
1394 (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
|
1395 (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
|
1396 (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
|
1397 )) |
19078 | 1398 |
1399 ;; this is invoked by viper-substitute-line | |
1400 (defun viper-exec-Change (m-com com) | |
18129 | 1401 (save-excursion |
19078 | 1402 (set-mark viper-com-point) |
1403 (viper-enlarge-region (mark t) (point)) | |
1404 (if viper-use-register | |
18129 | 1405 (progn |
19078 | 1406 (cond ((viper-valid-register viper-use-register '(letter digit)) |
18129 | 1407 (copy-to-register |
19078 | 1408 viper-use-register (mark t) (point) nil)) |
1409 ((viper-valid-register viper-use-register '(Letter)) | |
1410 (viper-append-to-register | |
1411 (downcase viper-use-register) (mark t) (point))) | |
1412 (t (setq viper-use-register nil) | |
1413 (error viper-InvalidRegister viper-use-register))) | |
1414 (setq viper-use-register nil))) | |
18129 | 1415 (delete-region (mark t) (point))) |
1416 (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
|
1417 (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
|
1418 (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
|
1419 (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
|
1420 )) |
19078 | 1421 |
1422 (defun viper-exec-delete (m-com com) | |
1423 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1424 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1425 (let (chars-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1426 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1427 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1428 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1429 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1430 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1431 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1432 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1433 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1434 (t (setq viper-use-register nil) |
19078 | 1435 (error viper-InvalidRegister viper-use-register))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1436 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1437 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1438 (if (eq last-command 'd-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1439 (setq chars-deleted (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1440 (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
|
1441 (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
|
1442 (message "Deleted %d characters" chars-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1443 (kill-region viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1444 (setq this-command 'd-command) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1445 (if viper-ex-style-motion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1446 (if (and (eolp) (not (bolp))) (backward-char 1))))) |
18129 | 1447 |
19078 | 1448 (defun viper-exec-Delete (m-com com) |
18129 | 1449 (save-excursion |
19078 | 1450 (set-mark viper-com-point) |
1451 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1452 (let (lines-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1453 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1454 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1455 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1456 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1457 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1458 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1459 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1460 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1461 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1462 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1463 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1464 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1465 (if (eq last-command 'D-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1466 (setq lines-deleted (count-lines (point) viper-com-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1467 (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
|
1468 (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
|
1469 (message "Deleted %d lines" lines-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1470 (kill-region (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1471 (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
|
1472 (back-to-indentation))) |
18129 | 1473 |
21940 | 1474 ;; save region |
19078 | 1475 (defun viper-exec-yank (m-com com) |
1476 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1477 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1478 (let (chars-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1479 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1480 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1481 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1482 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1483 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1484 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1485 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1486 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1487 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1488 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1489 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1490 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1491 (copy-region-as-kill viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1492 (setq chars-saved (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1493 (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
|
1494 (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
|
1495 (message "Saved %d characters" chars-saved))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1496 (goto-char viper-com-point))) |
19078 | 1497 |
21940 | 1498 ;; save lines |
19078 | 1499 (defun viper-exec-Yank (m-com com) |
18129 | 1500 (save-excursion |
19078 | 1501 (set-mark viper-com-point) |
1502 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1503 (let (lines-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1504 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1505 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1506 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1507 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1508 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1509 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1510 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1511 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1512 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1513 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1514 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1515 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1516 (copy-region-as-kill (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1517 (setq lines-saved (count-lines (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1518 (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
|
1519 (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
|
1520 (message "Saved %d lines" lines-saved))))) |
19078 | 1521 (viper-deactivate-mark) |
1522 (goto-char viper-com-point)) | |
1523 | |
1524 (defun viper-exec-bang (m-com com) | |
18129 | 1525 (save-excursion |
19078 | 1526 (set-mark viper-com-point) |
1527 (viper-enlarge-region (mark t) (point)) | |
18958 | 1528 (exchange-point-and-mark) |
18129 | 1529 (shell-command-on-region |
1530 (mark t) (point) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1531 (if (viper= com ?!) |
19078 | 1532 (setq viper-last-shell-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1533 (viper-read-string-with-history |
18129 | 1534 "!" |
1535 nil | |
19078 | 1536 'viper-shell-history |
1537 (car viper-shell-history) | |
18129 | 1538 )) |
19078 | 1539 viper-last-shell-com) |
18129 | 1540 t))) |
1541 | |
19078 | 1542 (defun viper-exec-equals (m-com com) |
18129 | 1543 (save-excursion |
19078 | 1544 (set-mark viper-com-point) |
1545 (viper-enlarge-region (mark t) (point)) | |
18129 | 1546 (if (> (mark t) (point)) (exchange-point-and-mark)) |
1547 (indent-region (mark t) (point) nil))) | |
1548 | |
19078 | 1549 (defun viper-exec-shift (m-com com) |
18129 | 1550 (save-excursion |
19078 | 1551 (set-mark viper-com-point) |
1552 (viper-enlarge-region (mark t) (point)) | |
18129 | 1553 (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
|
1554 (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
|
1555 (if (viper= com ?>) |
19078 | 1556 viper-shift-width |
1557 (- viper-shift-width)))) | |
18129 | 1558 ;; return point to where it was before shift |
19078 | 1559 (goto-char viper-com-point)) |
18129 | 1560 |
1561 ;; this is needed because some commands fake com by setting it to ?r, which | |
1562 ;; denotes repeated insert command. | |
19078 | 1563 (defsubst viper-exec-dummy (m-com com) |
18129 | 1564 nil) |
1565 | |
19078 | 1566 (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
|
1567 (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
|
1568 (regexp-quote (buffer-substring (point) viper-com-point))) |
19078 | 1569 (setq viper-s-forward t) |
1570 (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
|
1571 (setq viper-intermediate-command 'viper-exec-buffer-search) |
19078 | 1572 (viper-search viper-s-string viper-s-forward 1)) |
1573 | |
1574 (defvar viper-exec-array (make-vector 128 nil)) | |
18129 | 1575 |
1576 ;; 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
|
1577 ;; without affecting other functions. Buffer search can now be bound |
18129 | 1578 ;; to any character. |
1579 | |
19078 | 1580 (aset viper-exec-array ?c 'viper-exec-change) |
1581 (aset viper-exec-array ?C 'viper-exec-Change) | |
1582 (aset viper-exec-array ?d 'viper-exec-delete) | |
1583 (aset viper-exec-array ?D 'viper-exec-Delete) | |
1584 (aset viper-exec-array ?y 'viper-exec-yank) | |
1585 (aset viper-exec-array ?Y 'viper-exec-Yank) | |
1586 (aset viper-exec-array ?r 'viper-exec-dummy) | |
1587 (aset viper-exec-array ?! 'viper-exec-bang) | |
1588 (aset viper-exec-array ?< 'viper-exec-shift) | |
1589 (aset viper-exec-array ?> 'viper-exec-shift) | |
1590 (aset viper-exec-array ?= 'viper-exec-equals) | |
18129 | 1591 |
1592 | |
1593 | |
1594 ;; 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
|
1595 ;; destructive command on the region specified by the movement command. For |
19078 | 1596 ;; instance, if the user types cw, then the command viper-forward-word will |
1597 ;; call viper-execute-com to execute viper-exec-change, which eventually will | |
1598 ;; call viper-change to invoke the replace mode on the region. | |
18129 | 1599 ;; |
19078 | 1600 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) |
1601 ;; via a call to viper-set-destructive-command, for later use by viper-repeat. | |
1602 (defun viper-execute-com (m-com val com) | |
1603 (let ((reg viper-use-register)) | |
18129 | 1604 ;; this is the special command `#' |
1605 (if (> com 128) | |
19078 | 1606 (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
|
1607 (let ((fn (aref viper-exec-array com))) |
18129 | 1608 (if (null fn) |
19078 | 1609 (error "%c: %s" com viper-InvalidViCommand) |
18129 | 1610 (funcall fn m-com com)))) |
19078 | 1611 (if (viper-dotable-command-p com) |
1612 (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
|
1613 (list m-com val com reg nil nil))) |
18129 | 1614 )) |
1615 | |
1616 | |
19078 | 1617 (defun viper-repeat (arg) |
18129 | 1618 "Re-execute last destructive command. |
19078 | 1619 Use the info in viper-d-com, which has the form |
18129 | 1620 \(com val ch reg inserted-text command-keys\), |
1621 where `com' is the command to be re-executed, `val' is the | |
1622 argument to `com', `ch' is a flag for repeat, and `reg' is optional; | |
1623 if it exists, it is the name of the register for `com'. | |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1624 If the prefix argument ARG is non-nil, it is used instead of `val'." |
18129 | 1625 (interactive "P") |
1626 (let ((save-point (point)) ; save point before repeating prev cmd | |
1627 ;; Pass along that we are repeating a destructive command | |
19078 | 1628 ;; This tells viper-set-destructive-command not to update |
1629 ;; viper-command-ring | |
1630 (viper-intermediate-command 'viper-repeat)) | |
1631 (if (eq last-command 'viper-undo) | |
1632 ;; if the last command was viper-undo, then undo-more | |
1633 (viper-undo-more) | |
1634 ;; otherwise execute the command stored in viper-d-com. if arg is | |
1635 ;; non-nil its prefix value is used as new prefix value for the command. | |
1636 (let ((m-com (car viper-d-com)) | |
1637 (val (viper-P-val arg)) | |
1638 (com (nth 2 viper-d-com)) | |
1639 (reg (nth 3 viper-d-com))) | |
1640 (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
|
1641 (if (null m-com) (error "No previous command to repeat")) |
19078 | 1642 (setq viper-use-register reg) |
1643 (if (nth 4 viper-d-com) ; text inserted by command | |
1644 (setq viper-last-insertion (nth 4 viper-d-com) | |
1645 viper-d-char (nth 4 viper-d-com))) | |
18129 | 1646 (funcall m-com (cons val com)) |
19078 | 1647 (cond ((and (< save-point (point)) viper-keep-point-on-repeat) |
18839 | 1648 (goto-char save-point)) ; go back to before repeat. |
19462 | 1649 ((and (< save-point (point)) viper-ex-style-editing) |
18839 | 1650 (or (bolp) (backward-char 1)))) |
18129 | 1651 (if (and (eolp) (not (bolp))) |
1652 (backward-char 1)) | |
1653 )) | |
19462 | 1654 (viper-adjust-undo) ; take care of undo |
18129 | 1655 ;; 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
|
1656 ;; just executed a command from that ring. So, push it on the ring again. |
19078 | 1657 ;; If we are just executing previous command , then don't push viper-d-com |
1658 ;; 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
|
1659 ;; the inserted text may be nil). Besides, in this case, the command |
18129 | 1660 ;; executed by `.' is already on the ring. |
19078 | 1661 (if (eq last-command 'viper-display-current-destructive-command) |
1662 (viper-push-onto-ring viper-d-com 'viper-command-ring)) | |
1663 (viper-deactivate-mark) | |
18129 | 1664 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1665 |
19078 | 1666 (defun viper-repeat-from-history () |
18129 | 1667 "Repeat a destructive command from history. |
19078 | 1668 Doesn't change viper-command-ring in any way, so `.' will work as before |
18129 | 1669 executing this command. |
1670 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
|
1671 the second character is a digit 0 to 9. The digit indicates which |
18129 | 1672 history command to execute. `<char>0' is equivalent to `.', `<char>1' |
1673 invokes the command before that, etc." | |
1674 (interactive) | |
19078 | 1675 (let* ((viper-intermediate-command 'repeating-display-destructive-command) |
1676 (idx (cond (viper-this-kbd-macro | |
18129 | 1677 (string-to-number |
19078 | 1678 (symbol-name (elt viper-this-kbd-macro 1)))) |
18129 | 1679 (t 0))) |
1680 (num idx) | |
19078 | 1681 (viper-d-com viper-d-com)) |
18129 | 1682 |
1683 (or (and (numberp num) (<= 0 num) (<= num 9)) | |
1684 (progn | |
1685 (setq idx 0 | |
1686 num 0) | |
1687 (message | |
19078 | 1688 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'"))) |
18129 | 1689 (while (< 0 num) |
19078 | 1690 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1)) |
18129 | 1691 (setq num (1- num))) |
19078 | 1692 (viper-repeat nil) |
18129 | 1693 (while (> idx num) |
19078 | 1694 (viper-special-ring-rotate1 viper-command-ring 1) |
18129 | 1695 (setq num (1+ num))) |
1696 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1697 |
18129 | 1698 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1699 ;; The hash-command. It is invoked interactively by the key sequence #<char>. |
19078 | 1700 ;; The chars that can follow `#' are determined by viper-hash-command-p |
1701 (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
|
1702 (cond ((viper= char ?c) |
19078 | 1703 (downcase-region (min viper-com-point (point)) |
1704 (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
|
1705 ((viper= char ?C) |
19078 | 1706 (upcase-region (min viper-com-point (point)) |
1707 (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
|
1708 ((viper= char ?g) |
19078 | 1709 (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
|
1710 ;; execute the last emacs kbd macro on each line of the region |
19078 | 1711 (viper-global-execute)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1712 ((viper= char ?q) |
19078 | 1713 (push-mark viper-com-point t) |
1714 (viper-quote-region)) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1715 ((viper= char ?s) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1716 (funcall viper-spell-function viper-com-point (point))) |
19078 | 1717 (t (error "#%c: %s" char viper-InvalidViCommand)))) |
18129 | 1718 |
1719 | |
1720 ;; undoing | |
1721 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1722 ;; hook used inside undo |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1723 (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
|
1724 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1725 ;; 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
|
1726 (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
|
1727 (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
|
1728 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1729 (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
|
1730 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1731 ;; 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
|
1732 (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
|
1733 (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
|
1734 (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
|
1735 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
|
1736 ;; 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
|
1737 ;; 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
|
1738 ;; its repeated invocation |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1739 (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
|
1740 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1741 |
19078 | 1742 (defun viper-undo () |
18129 | 1743 "Undo previous change." |
1744 (interactive) | |
1745 (message "undo!") | |
1746 (let ((modified (buffer-modified-p)) | |
1747 (before-undo-pt (point-marker)) | |
1748 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
|
1749 |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1750 ;; 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
|
1751 (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
|
1752 |
18129 | 1753 (undo-start) |
1754 (undo-more 2) | |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1755 ;;(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
|
1756 ;; 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
|
1757 ;;(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
|
1758 ;; 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
|
1759 |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1760 (if (and undo-beg-posn undo-end-posn) |
18129 | 1761 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1762 (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
|
1763 (sit-for 0) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1764 (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
|
1765 (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
|
1766 (progn |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1767 (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
|
1768 (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
|
1769 (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
|
1770 (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
|
1771 (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
|
1772 (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
|
1773 (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
|
1774 (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
|
1775 )) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1776 |
18129 | 1777 (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
|
1778 ) |
19078 | 1779 (setq this-command 'viper-undo)) |
18129 | 1780 |
1781 ;; Continue undoing previous changes. | |
19078 | 1782 (defun viper-undo-more () |
18129 | 1783 (message "undo more!") |
1784 (condition-case nil | |
1785 (undo-more 1) | |
1786 (error (beep) | |
1787 (message "No further undo information in this buffer"))) | |
1788 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
19078 | 1789 (setq this-command 'viper-undo)) |
18129 | 1790 |
1791 ;; The following two functions are used to set up undo properly. | |
1792 ;; 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
|
1793 ;; they are undone all at once. |
19078 | 1794 (defun viper-adjust-undo () |
19462 | 1795 (if viper-undo-needs-adjustment |
1796 (let ((inhibit-quit t) | |
1797 tmp tmp2) | |
1798 (setq viper-undo-needs-adjustment nil) | |
1799 (if (listp buffer-undo-list) | |
1800 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list)) | |
1801 (progn | |
1802 (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
|
1803 |
19462 | 1804 ;; cut tail from buffer-undo-list temporarily by direct |
1805 ;; manipulation with pointers in buffer-undo-list | |
1806 (setcdr tmp nil) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1807 |
19462 | 1808 (setq buffer-undo-list (delq nil buffer-undo-list)) |
1809 (setq buffer-undo-list | |
1810 (delq viper-buffer-undo-list-mark buffer-undo-list)) | |
1811 ;; restore tail of buffer-undo-list | |
1812 (setq buffer-undo-list (nconc buffer-undo-list tmp2))) | |
1813 (setq buffer-undo-list (delq nil buffer-undo-list))))) | |
1814 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1815 |
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 (defun viper-set-complex-command-for-undo () |
18129 | 1818 (if (listp buffer-undo-list) |
19078 | 1819 (if (not viper-undo-needs-adjustment) |
18129 | 1820 (let ((inhibit-quit t)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1821 (setq buffer-undo-list |
19078 | 1822 (cons viper-buffer-undo-list-mark buffer-undo-list)) |
1823 (setq viper-undo-needs-adjustment t))))) | |
18129 | 1824 |
1825 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1826 ;;; 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
|
1827 |
19078 | 1828 (defun viper-display-current-destructive-command () |
1829 (let ((text (nth 4 viper-d-com)) | |
1830 (keys (nth 5 viper-d-com)) | |
18129 | 1831 (max-text-len 30)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1832 |
19078 | 1833 (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
|
1834 |
18129 | 1835 (message " `.' runs %s%s" |
19078 | 1836 (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
|
1837 (viper-abbreviate-string |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
1838 (if (featurep 'xemacs) |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1839 (replace-in-string ; xemacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1840 (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
|
1841 ((stringp text) text) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1842 (t "")) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1843 "\n" "^J") |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1844 text ; emacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1845 ) |
19079 | 1846 max-text-len |
1847 " inserting `" "'" " .......")) | |
18129 | 1848 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1849 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1850 |
19078 | 1851 ;; don't change viper-d-com if it was viper-repeat command invoked with `.' |
18129 | 1852 ;; or in some other way (non-interactively). |
19078 | 1853 (defun viper-set-destructive-command (list) |
1854 (or (eq viper-intermediate-command 'viper-repeat) | |
18129 | 1855 (progn |
19078 | 1856 (setq viper-d-com list) |
1857 (setcar (nthcdr 5 viper-d-com) | |
1858 (viper-array-to-string (if (arrayp viper-this-command-keys) | |
1859 viper-this-command-keys | |
1860 (this-command-keys)))) | |
1861 (viper-push-onto-ring viper-d-com 'viper-command-ring))) | |
1862 (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
|
1863 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1864 |
19078 | 1865 (defun viper-prev-destructive-command (next) |
18129 | 1866 "Find previous destructive command in the history of destructive commands. |
1867 With prefix argument, find next destructive command." | |
1868 (interactive "P") | |
19078 | 1869 (let (cmd viper-intermediate-command) |
1870 (if (eq last-command 'viper-display-current-destructive-command) | |
18129 | 1871 ;; repeated search through command history |
19078 | 1872 (setq viper-intermediate-command |
1873 'repeating-display-destructive-command) | |
18129 | 1874 ;; 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
|
1875 (setq viper-temp-command-ring (ring-copy viper-command-ring))) |
18129 | 1876 (setq cmd (if next |
19078 | 1877 (viper-special-ring-rotate1 viper-temp-command-ring 1) |
1878 (viper-special-ring-rotate1 viper-temp-command-ring -1))) | |
18129 | 1879 (if (null cmd) |
1880 () | |
19078 | 1881 (setq viper-d-com cmd)) |
1882 (viper-display-current-destructive-command))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1883 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1884 |
19078 | 1885 (defun viper-next-destructive-command () |
18129 | 1886 "Find next destructive command in the history of destructive commands." |
1887 (interactive) | |
19078 | 1888 (viper-prev-destructive-command 'next)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1889 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1890 |
19078 | 1891 (defun viper-insert-prev-from-insertion-ring (arg) |
18129 | 1892 "Cycle through insertion ring in the direction of older insertions. |
1893 Undoes previous insertion and inserts new. | |
1894 With prefix argument, cycles in the direction of newer elements. | |
1895 In minibuffer, this command executes whatever the invocation key is bound | |
1896 to in the global map, instead of cycling through the insertion ring." | |
1897 (interactive "P") | |
19078 | 1898 (let (viper-intermediate-command) |
1899 (if (eq last-command 'viper-insert-from-insertion-ring) | |
18129 | 1900 (progn ; repeated search through insertion history |
19078 | 1901 (setq viper-intermediate-command 'repeating-insertion-from-ring) |
1902 (if (eq viper-current-state 'replace-state) | |
18129 | 1903 (undo 1) |
19078 | 1904 (if viper-last-inserted-string-from-insertion-ring |
18129 | 1905 (backward-delete-char |
19078 | 1906 (length viper-last-inserted-string-from-insertion-ring)))) |
18129 | 1907 ) |
1908 ;;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
|
1909 (setq viper-temp-insertion-ring (ring-copy viper-insertion-ring))) |
19078 | 1910 (setq this-command 'viper-insert-from-insertion-ring) |
18129 | 1911 ;; so that things will be undone properly |
1912 (setq buffer-undo-list (cons nil buffer-undo-list)) | |
19078 | 1913 (setq viper-last-inserted-string-from-insertion-ring |
1914 (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
|
1915 |
19078 | 1916 ;; this change of viper-intermediate-command must come after |
1917 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the | |
18129 | 1918 ;; insertion. |
19078 | 1919 (setq viper-intermediate-command nil) |
1920 (if viper-last-inserted-string-from-insertion-ring | |
1921 (insert viper-last-inserted-string-from-insertion-ring)) | |
18129 | 1922 )) |
1923 | |
19078 | 1924 (defun viper-insert-next-from-insertion-ring () |
18129 | 1925 "Cycle through insertion ring in the direction of older insertions. |
1926 Undo previous insertion and inserts new." | |
1927 (interactive) | |
19078 | 1928 (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
|
1929 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1930 |
18129 | 1931 |
1932 ;; some region utilities | |
1933 | |
1934 ;; If at the last line of buffer, add \\n before eob, if newline is missing. | |
19078 | 1935 (defun viper-add-newline-at-eob-if-necessary () |
18129 | 1936 (save-excursion |
1937 (end-of-line) | |
1938 ;; make sure all lines end with newline, unless in the minibuffer or | |
1939 ;; 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
|
1940 (save-restriction |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1941 (widen) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1942 (if (and (eobp) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1943 (not (bolp)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1944 require-final-newline |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1945 ;; 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
|
1946 ;; might unintentionally modify binary buffers |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1947 (buffer-modified-p) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1948 (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
|
1949 (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
|
1950 ;; 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
|
1951 (condition-case nil |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1952 (insert "\n") |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1953 (error nil)) |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1954 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1955 )) |
18129 | 1956 |
19078 | 1957 (defun viper-yank-defun () |
18129 | 1958 (mark-defun) |
1959 (copy-region-as-kill (point) (mark t))) | |
1960 | |
1961 ;; Enlarge region between BEG and END. | |
19078 | 1962 (defun viper-enlarge-region (beg end) |
18129 | 1963 (or beg (setq beg end)) ; if beg is nil, set to end |
1964 (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
|
1965 |
18129 | 1966 (if (< beg end) |
1967 (progn (goto-char beg) (set-mark end)) | |
1968 (goto-char end) | |
1969 (set-mark beg)) | |
1970 (beginning-of-line) | |
1971 (exchange-point-and-mark) | |
1972 (if (or (not (eobp)) (not (bolp))) (forward-line 1)) | |
1973 (if (not (eobp)) (beginning-of-line)) | |
1974 (if (> beg end) (exchange-point-and-mark))) | |
1975 | |
1976 | |
1977 ;; Quote region by each line with a user supplied string. | |
19078 | 1978 (defun viper-quote-region () |
20343 | 1979 (let ((quote-str viper-quote-string) |
1980 (donot-change-dafault t)) | |
1981 (setq quote-str | |
1982 (viper-read-string-with-history | |
1983 "Quote string: " | |
1984 nil | |
1985 'viper-quote-region-history | |
1986 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%") | |
1987 ((string-match "java.*-mode" (symbol-name major-mode)) "//") | |
1988 ((string-match "perl.*-mode" (symbol-name major-mode)) "#") | |
1989 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | |
1990 ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | |
1991 ((memq major-mode '(sh-mode shell-mode)) "#") | |
1992 (t (setq donot-change-dafault nil) | |
1993 quote-str)))) | |
1994 (or donot-change-dafault | |
1995 (setq viper-quote-string quote-str)) | |
1996 (viper-enlarge-region (point) (mark t)) | |
1997 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
1998 (insert quote-str) | |
18129 | 1999 (beginning-of-line) |
20343 | 2000 (forward-line 1) |
2001 (while (and (< (point) (mark t)) (bolp)) | |
2002 (insert quote-str) | |
2003 (beginning-of-line) | |
2004 (forward-line 1)))) | |
18129 | 2005 |
2006 ;; Tells whether BEG is on the same line as END. | |
2007 ;; If one of the args is nil, it'll return nil. | |
19078 | 2008 (defun viper-same-line (beg end) |
18129 | 2009 (let ((selective-display nil) |
2010 (incr 0) | |
2011 temp) | |
2012 (if (and beg end (> beg end)) | |
2013 (setq temp beg | |
2014 beg end | |
2015 end temp)) | |
2016 (if (and beg end) | |
2017 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range | |
2018 nil) | |
2019 (t | |
2020 ;; This 'if' is needed because Emacs treats the next empty line | |
2021 ;; as part of the previous line. | |
19078 | 2022 (if (= (viper-line-pos 'start) end) |
18129 | 2023 (setq incr 1)) |
2024 (<= (+ incr (count-lines beg end)) 1)))) | |
2025 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2026 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2027 |
18129 | 2028 ;; Check if the string ends with a newline. |
19078 | 2029 (defun viper-end-with-a-newline-p (string) |
18129 | 2030 (or (string= string "") |
19078 | 2031 (= (viper-seq-last-elt string) ?\n))) |
2032 | |
2033 (defun viper-tmp-insert-at-eob (msg) | |
18129 | 2034 (let ((savemax (point-max))) |
2035 (goto-char savemax) | |
2036 (insert msg) | |
2037 (sit-for 2) | |
2038 (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
|
2039 )) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2040 |
18129 | 2041 |
2042 | |
2043 ;;; Minibuffer business | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2044 |
19078 | 2045 (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
|
2046 (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
|
2047 (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
|
2048 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2049 |
19078 | 2050 (defun viper-minibuffer-setup-sentinel () |
2051 (let ((hook (if viper-vi-style-in-minibuffer | |
2052 'viper-change-state-to-insert | |
2053 '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
|
2054 ;; 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
|
2055 ;; 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
|
2056 ;; 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
|
2057 ;; the normal buffers |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2058 (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
|
2059 (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
|
2060 (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
|
2061 (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
|
2062 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
|
2063 viper-command-ring nil) |
18129 | 2064 (funcall hook) |
2065 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2066 |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2067 ;; 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
|
2068 ;; 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
|
2069 ;; 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
|
2070 ;; viper-read-string-with-history |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2071 (defun viper-minibuffer-standard-hook () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2072 (if (stringp init-message) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2073 (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
|
2074 (if (stringp initial) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2075 (progn |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2076 ;; 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
|
2077 (or unread-command-events |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2078 executing-kbd-macro |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2079 (sit-for 840)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2080 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2081 (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
|
2082 (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
|
2083 (insert initial)))) |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2084 |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2085 (defsubst viper-minibuffer-real-start () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2086 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2087 (minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2088 (point-min))) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2089 |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2090 (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
|
2091 (when (active-minibuffer-window) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2092 (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
|
2093 (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
|
2094 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2095 |
19756 | 2096 ;; Interpret last event in the local map first; if fails, use exit-minibuffer. |
2097 ;; Run viper-minibuffer-exit-hook before exiting. | |
19078 | 2098 (defun viper-exit-minibuffer () |
19756 | 2099 "Exit minibuffer Viper way." |
18129 | 2100 (interactive) |
2101 (let (command) | |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
2102 (setq command (local-key-binding (char-to-string (viper-last-command-char)))) |
19756 | 2103 (run-hooks 'viper-minibuffer-exit-hook) |
18129 | 2104 (if command |
2105 (command-execute command) | |
2106 (exit-minibuffer)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2107 |
19756 | 2108 |
2109 (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
|
2110 '("" "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
|
2111 "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
|
2112 "*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
|
2113 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
|
2114 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
|
2115 represents an editable file. However, file completion will stop at the `.' |
19756 | 2116 The smart suffix feature lets you hit RET in such a case, and Viper will |
2117 select the appropriate suffix. | |
2118 | |
2119 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
|
2120 corresponding file exists is selected. If no file exists for any of the |
19756 | 2121 suffixes, the user is asked to confirm. |
2122 | |
2123 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
|
2124 :type '(repeat string) |
20003 | 2125 :group 'viper-misc) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2126 |
19756 | 2127 |
2128 ;; Try to add a suitable suffix to files whose name ends with a `.' | |
2129 ;; Useful when the user hits RET on a non-completed file name. | |
2130 ;; Used as a minibuffer exit hook in read-file-name | |
2131 (defun viper-file-add-suffix () | |
2132 (let ((count 0) | |
2133 (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
|
2134 (file (buffer-substring-no-properties |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2135 (viper-minibuffer-real-start) (point-max))) |
19756 | 2136 found key cmd suff) |
2137 (goto-char (point-max)) | |
2138 (if (and viper-smart-suffix-list (string-match "\\.$" file)) | |
2139 (progn | |
2140 (while (and (not found) (< count len)) | |
2141 (setq suff (nth count viper-smart-suffix-list) | |
2142 count (1+ count)) | |
2143 (if (file-exists-p | |
2144 (format "%s%s" (substitute-in-file-name file) suff)) | |
2145 (progn | |
2146 (setq found t) | |
2147 (insert suff)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2148 |
19756 | 2149 (if found |
2150 () | |
2151 (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
|
2152 (unwind-protect |
19756 | 2153 (while (not (memq cmd |
2154 '(exit-minibuffer viper-exit-minibuffer))) | |
2155 (setq cmd | |
2156 (key-binding (setq key (read-key-sequence nil)))) | |
2157 (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
|
2158 (if (featurep 'xemacs) |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
2159 (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
|
2160 (insert key) ; emacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
2161 )) |
19756 | 2162 ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) |
2163 nil) | |
2164 (t (command-execute cmd))) | |
2165 ))) | |
2166 )))) | |
2167 | |
2168 | |
2169 (defun viper-minibuffer-trim-tail () | |
2170 "Delete junk at the end of the first line of the minibuffer input. | |
2171 Remove this function from `viper-minibuffer-exit-hook', if this causes | |
2172 problems." | |
2173 (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
|
2174 (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
|
2175 (goto-char (viper-minibuffer-real-start)) |
19756 | 2176 (end-of-line) |
2177 (delete-region (point) (point-max))))) | |
2178 | |
18129 | 2179 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2180 ;;; Reading string with history |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2181 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2182 (defun viper-read-string-with-history (prompt &optional initial |
20343 | 2183 history-var default keymap |
2184 init-message) | |
18129 | 2185 ;; Read string, prompting with PROMPT and inserting the INITIAL |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2186 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the |
20343 | 2187 ;; input is an empty string. |
18129 | 2188 ;; 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
|
2189 ;; minibuffer. |
20343 | 2190 ;; KEYMAP is used, if given, instead of minibuffer-local-map. |
2191 ;; INIT-MESSAGE is the message temporarily displayed after entering the | |
2192 ;; minibuffer. | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2193 (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
|
2194 ;; 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
|
2195 (let ((old |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2196 (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
|
2197 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 nil))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2199 (cons |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2200 '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
|
2201 (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
|
2202 (list old) old)))) |
18129 | 2203 (val "") |
2204 (padding "") | |
2205 temp-msg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2206 |
18129 | 2207 (setq keymap (or keymap minibuffer-local-map) |
2208 initial (or initial "") | |
2209 temp-msg (if default | |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2210 (format "(default %s) " default) |
18129 | 2211 "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2212 |
19078 | 2213 (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
|
2214 (setq val (read-from-minibuffer prompt |
18129 | 2215 (concat temp-msg initial val padding) |
2216 keymap nil history-var)) | |
2217 (setq minibuffer-setup-hook nil | |
19078 | 2218 padding (viper-array-to-string (this-command-keys)) |
18129 | 2219 temp-msg "") |
2220 ;; the following tries to be smart about what to put in history | |
2221 (if (not (string= val (car (eval history-var)))) | |
2222 (set history-var (cons val (eval history-var)))) | |
2223 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var))) | |
2224 (string= (nth 0 (eval history-var)) "")) | |
2225 (set history-var (cdr (eval history-var)))) | |
19078 | 2226 ;; 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
|
2227 ;; viper-command-argument, or `! shell-command', this probably means |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2228 ;; that the user typed something then erased. Return "" in this case, not |
18129 | 2229 ;; the default---the default is too confusing in this case. |
2230 (cond ((and (string= val "") | |
2231 (not (string= prompt "!")) ; was a `! shell-command' | |
2232 (not (memq last-command | |
19078 | 2233 '(viper-ex |
2234 viper-command-argument | |
18129 | 2235 t) |
2236 ))) | |
2237 "") | |
2238 ((string= val "") (or default "")) | |
2239 (t val)) | |
2240 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2241 |
18129 | 2242 |
2243 | |
2244 ;; insertion commands | |
2245 | |
2246 ;; Called when state changes from Insert Vi command mode. | |
2247 ;; Repeats the insertion command if Insert state was entered with prefix | |
2248 ;; argument > 1. | |
19078 | 2249 (defun viper-repeat-insert-command () |
2250 (let ((i-com (car viper-d-com)) | |
2251 (val (nth 1 viper-d-com)) | |
2252 (char (nth 2 viper-d-com))) | |
18129 | 2253 (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
|
2254 (progn |
19078 | 2255 (setq viper-d-com (list i-com (1- val) ?r nil nil nil)) |
2256 (viper-repeat nil) | |
2257 (setq viper-d-com (list i-com val char nil nil nil)) | |
18129 | 2258 )))) |
2259 | |
19078 | 2260 (defun viper-insert (arg) |
18129 | 2261 "Insert before point." |
2262 (interactive "P") | |
19078 | 2263 (viper-set-complex-command-for-undo) |
2264 (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
|
2265 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2266 ) |
19078 | 2267 (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
|
2268 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2269 (viper-loop val (viper-yank-last-insertion)) |
2270 (viper-change-state-to-insert)))) | |
2271 | |
2272 (defun viper-append (arg) | |
18129 | 2273 "Append after point." |
2274 (interactive "P") | |
19078 | 2275 (viper-set-complex-command-for-undo) |
2276 (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
|
2277 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2278 ) |
19078 | 2279 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil)) |
18129 | 2280 (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
|
2281 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2282 (viper-loop val (viper-yank-last-insertion)) |
2283 (viper-change-state-to-insert)))) | |
2284 | |
2285 (defun viper-Append (arg) | |
18129 | 2286 "Append at end of line." |
2287 (interactive "P") | |
19078 | 2288 (viper-set-complex-command-for-undo) |
2289 (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
|
2290 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2291 ) |
19078 | 2292 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil)) |
18129 | 2293 (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
|
2294 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2295 (viper-loop val (viper-yank-last-insertion)) |
2296 (viper-change-state-to-insert)))) | |
2297 | |
2298 (defun viper-Insert (arg) | |
18129 | 2299 "Insert before first non-white." |
2300 (interactive "P") | |
19078 | 2301 (viper-set-complex-command-for-undo) |
2302 (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
|
2303 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2304 ) |
19078 | 2305 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil)) |
18129 | 2306 (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
|
2307 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2308 (viper-loop val (viper-yank-last-insertion)) |
2309 (viper-change-state-to-insert)))) | |
2310 | |
2311 (defun viper-open-line (arg) | |
18129 | 2312 "Open line below." |
2313 (interactive "P") | |
19078 | 2314 (viper-set-complex-command-for-undo) |
2315 (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
|
2316 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2317 ) |
19078 | 2318 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil)) |
18129 | 2319 (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
|
2320 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2321 (viper-loop val |
18129 | 2322 (end-of-line) |
2323 (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
|
2324 (viper-indent-line col) |
19462 | 2325 (viper-yank-last-insertion)) |
18129 | 2326 (end-of-line) |
2327 (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
|
2328 (viper-indent-line col) |
19078 | 2329 (viper-change-state-to-insert))))) |
2330 | |
2331 (defun viper-Open-line (arg) | |
18129 | 2332 "Open line above." |
2333 (interactive "P") | |
19078 | 2334 (viper-set-complex-command-for-undo) |
2335 (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
|
2336 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2337 ) |
19078 | 2338 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil)) |
18129 | 2339 (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
|
2340 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2341 (viper-loop val |
18129 | 2342 (beginning-of-line) |
2343 (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
|
2344 (viper-indent-line col) |
19462 | 2345 (viper-yank-last-insertion)) |
18129 | 2346 (beginning-of-line) |
2347 (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
|
2348 (viper-indent-line col) |
19078 | 2349 (viper-change-state-to-insert))))) |
2350 | |
2351 (defun viper-open-line-at-point (arg) | |
18129 | 2352 "Open line at point." |
2353 (interactive "P") | |
19078 | 2354 (viper-set-complex-command-for-undo) |
2355 (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
|
2356 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2357 ) |
19078 | 2358 (viper-set-destructive-command |
2359 (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
|
2360 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2361 (viper-loop val |
18129 | 2362 (open-line 1) |
19462 | 2363 (viper-yank-last-insertion)) |
18129 | 2364 (open-line 1) |
19078 | 2365 (viper-change-state-to-insert)))) |
2366 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2367 ;; bound to s |
19078 | 2368 (defun viper-substitute (arg) |
18129 | 2369 "Substitute characters." |
2370 (interactive "P") | |
19078 | 2371 (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
|
2372 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2373 ) |
18129 | 2374 (push-mark nil t) |
2375 (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
|
2376 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2377 (viper-change-subr (mark t) (point)) |
2378 (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
|
2379 ;; com is set to ?r when we repeat this comand with dot |
19078 | 2380 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) |
18129 | 2381 )) |
2382 | |
19078 | 2383 ;; Command bound to S |
2384 (defun viper-substitute-line (arg) | |
18129 | 2385 "Substitute lines." |
2386 (interactive "p") | |
19078 | 2387 (viper-set-complex-command-for-undo) |
2388 (viper-line (cons arg ?C))) | |
18129 | 2389 |
2390 ;; Prepare for replace | |
19078 | 2391 (defun viper-start-replace () |
2392 (setq viper-began-as-replace t | |
2393 viper-sitting-in-replace t | |
19462 | 2394 viper-replace-chars-to-delete 0) |
21940 | 2395 (add-hook |
2396 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local) | |
2397 (add-hook | |
2398 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local) | |
18129 | 2399 ;; this will get added repeatedly, but no harm |
19078 | 2400 (add-hook 'after-change-functions 'viper-after-change-sentinel t) |
2401 (add-hook 'before-change-functions 'viper-before-change-sentinel t) | |
21940 | 2402 (viper-move-marker-locally |
2403 'viper-last-posn-in-replace-region (viper-replace-start)) | |
2404 (add-hook | |
2405 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel | |
2406 t 'local) | |
2407 (add-hook | |
2408 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2409 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2410 (remove-hook |
2411 '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
|
2412 (if overwrite-mode (overwrite-mode -1)) |
18129 | 2413 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2414 |
18129 | 2415 |
19078 | 2416 (defun viper-replace-mode-spy-before (beg end) |
19462 | 2417 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end)) |
2418 ) | |
2419 | |
2420 ;; 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
|
2421 ;; 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
|
2422 ;; if this command performs several separate buffer changes. Therefore, if |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2423 ;; 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
|
2424 ;; deleted. |
19078 | 2425 (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
|
2426 (if (memq viper-intermediate-command |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2427 '(dabbrev-expand hippie-expand repeating-insertion-from-ring)) |
19462 | 2428 ;; Take special care of text insertion from insertion ring inside |
2429 ;; replacement overlays. | |
18129 | 2430 (progn |
19078 | 2431 (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
|
2432 (viper-move-marker-locally |
19078 | 2433 '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
|
2434 |
19462 | 2435 (let* ((real-end (min end (viper-replace-end))) |
2436 (column-shift (- (save-excursion (goto-char real-end) | |
2437 (current-column)) | |
2438 (save-excursion (goto-char beg) | |
2439 (current-column)))) | |
2440 (chars-deleted 0)) | |
2441 | |
2442 (if (> length 0) | |
2443 (setq chars-deleted viper-replace-region-chars-deleted)) | |
2444 (setq viper-replace-region-chars-deleted 0) | |
2445 (setq viper-replace-chars-to-delete | |
2446 (+ viper-replace-chars-to-delete | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2447 (- |
19462 | 2448 ;; if column shift is bigger, due to a TAB insertion, take |
2449 ;; column-shift instead of the number of inserted chars | |
2450 (max (viper-chars-in-region beg real-end) | |
2451 ;; This test accounts for Chinese/Japanese/... chars, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2452 ;; which occupy 2 columns instead of one. If we use |
19462 | 2453 ;; 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
|
2454 ;; one when the user types one Chinese character. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2455 ;; Deleting two would be OK, if they were European chars, |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2456 ;; but it is not OK if they are Chinese chars. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2457 ;; Since it is hard to |
19462 | 2458 ;; figure out which characters are being deleted in any |
2459 ;; given region, we decided to treat Eastern and European | |
2460 ;; characters equally, even though Eastern chars may | |
2461 ;; occupy more columns. | |
2462 (if (memq this-command '(self-insert-command | |
2463 quoted-insert viper-insert-tab)) | |
2464 column-shift | |
2465 0)) | |
2466 ;; the number of deleted chars | |
2467 chars-deleted))) | |
2468 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2469 (viper-move-marker-locally |
19078 | 2470 'viper-last-posn-in-replace-region |
19462 | 2471 (max (if (> end (viper-replace-end)) (viper-replace-end) end) |
19078 | 2472 (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
|
2473 (viper-replace-start)) |
18129 | 2474 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2475 |
18129 | 2476 ))) |
2477 | |
19462 | 2478 |
2479 ;; Delete stuff between viper-last-posn-in-replace-region and the end of | |
2480 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within | |
2481 ;; the overlay and current point is before the end of the overlay. | |
2482 ;; Don't delete anything if current point is past the end of the overlay. | |
2483 (defun viper-finish-change () | |
21940 | 2484 (remove-hook |
2485 'viper-after-change-functions 'viper-replace-mode-spy-after 'local) | |
2486 (remove-hook | |
2487 'viper-before-change-functions 'viper-replace-mode-spy-before 'local) | |
2488 (remove-hook | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2489 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) |
21940 | 2490 (remove-hook |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2491 '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
|
2492 (viper-restore-cursor-color 'after-replace-mode) |
19078 | 2493 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it |
18129 | 2494 (save-excursion |
19462 | 2495 (if (and viper-replace-overlay |
2496 (viper-pos-within-region viper-last-posn-in-replace-region | |
2497 (viper-replace-start) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2498 (viper-replace-end)) |
19462 | 2499 (< (point) (viper-replace-end))) |
2500 (delete-region | |
2501 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
|
2502 |
19078 | 2503 (if (eq viper-current-state 'replace-state) |
2504 (viper-downgrade-to-insert)) | |
2505 ;; replace mode ended => nullify viper-last-posn-in-replace-region | |
2506 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil) | |
2507 (viper-hide-replace-overlay) | |
2508 (viper-refresh-mode-line) | |
2509 (viper-put-string-on-kill-ring viper-last-replace-region) | |
18129 | 2510 ) |
2511 | |
2512 ;; Make STRING be the first element of the kill ring. | |
19078 | 2513 (defun viper-put-string-on-kill-ring (string) |
18129 | 2514 (setq kill-ring (cons string kill-ring)) |
2515 (if (> (length kill-ring) kill-ring-max) | |
2516 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)) | |
2517 (setq kill-ring-yank-pointer kill-ring)) | |
2518 | |
19078 | 2519 (defun viper-finish-R-mode () |
21940 | 2520 (remove-hook |
2521 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
2522 (remove-hook | |
2523 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) | |
19078 | 2524 (viper-downgrade-to-insert)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2525 |
19078 | 2526 (defun viper-start-R-mode () |
18129 | 2527 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number |
2528 (overwrite-mode 1) | |
21940 | 2529 (add-hook |
2530 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) | |
2531 (add-hook | |
2532 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2533 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2534 (remove-hook |
2535 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) | |
18129 | 2536 ) |
2537 | |
2538 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2539 |
19078 | 2540 (defun viper-replace-state-exit-cmd () |
18129 | 2541 "Binding for keys that cause Replace state to switch to Vi or to Insert. |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2542 These keys are ESC, RET, and LineFeed." |
18129 | 2543 (interactive) |
19462 | 2544 (if overwrite-mode ; if in replace mode invoked via 'R' |
19078 | 2545 (viper-finish-R-mode) |
19462 | 2546 (viper-finish-change)) |
18129 | 2547 (let (com) |
19078 | 2548 (if (eq this-command 'viper-intercept-ESC-key) |
2549 (setq com 'viper-exit-insert-state) | |
101013
dbe70c3aa01d
Replace last-input-char with last-input-event.
Glenn Morris <rgm@gnu.org>
parents:
101009
diff
changeset
|
2550 (viper-set-unread-command-events last-input-event) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2551 (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
|
2552 |
18129 | 2553 (condition-case conds |
2554 (command-execute com) | |
2555 (error | |
19078 | 2556 (viper-message-conditions conds))) |
18129 | 2557 ) |
19078 | 2558 (viper-hide-replace-overlay)) |
2559 | |
2560 | |
2561 (defun viper-replace-state-carriage-return () | |
2562 "Carriage return in Viper replace state." | |
18129 | 2563 (interactive) |
2564 ;; If Emacs start supporting overlay maps, as it currently supports | |
19078 | 2565 ;; 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
|
2566 ;; just have keymap attached to replace overlay. Then the "if part" of this |
18129 | 2567 ;; statement can be deleted. |
19078 | 2568 (if (or (< (point) (viper-replace-start)) |
2569 (> (point) (viper-replace-end))) | |
2570 (let (viper-replace-minor-mode com) | |
101013
dbe70c3aa01d
Replace last-input-char with last-input-event.
Glenn Morris <rgm@gnu.org>
parents:
101009
diff
changeset
|
2571 (viper-set-unread-command-events last-input-event) |
18129 | 2572 (setq com (key-binding (read-key-sequence nil))) |
2573 (condition-case conds | |
2574 (command-execute com) | |
2575 (error | |
19078 | 2576 (viper-message-conditions conds)))) |
2577 (if (not viper-allow-multiline-replace-regions) | |
2578 (viper-replace-state-exit-cmd) | |
2579 (if (viper-same-line (point) (viper-replace-end)) | |
2580 (viper-replace-state-exit-cmd) | |
2581 ;; delete the rest of line | |
2582 (delete-region (point) (viper-line-pos 'end)) | |
2583 (save-excursion | |
2584 (end-of-line) | |
2585 (if (eobp) (error "Last line in buffer"))) | |
2586 ;; skip to the next line | |
2587 (forward-line 1) | |
2588 (back-to-indentation) | |
2589 )))) | |
18129 | 2590 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2591 |
18129 | 2592 ;; This is the function bound to 'R'---unlimited replace. |
2593 ;; 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
|
2594 (defun viper-overwrite (arg) |
18129 | 2595 "Begin overwrite mode." |
2596 (interactive "P") | |
19078 | 2597 (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
|
2598 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2599 (len)) |
19078 | 2600 (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
|
2601 (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
|
2602 (progn |
19078 | 2603 ;; Viper saves inserted text in viper-last-insertion |
2604 (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
|
2605 (delete-char (min len (- (point-max) (point) 1))) |
19078 | 2606 (viper-loop val (viper-yank-last-insertion))) |
2607 (setq last-command 'viper-overwrite) | |
2608 (viper-set-complex-command-for-undo) | |
2609 (viper-set-replace-overlay (point) (viper-line-pos 'end)) | |
2610 (viper-change-state-to-replace) | |
18129 | 2611 ))) |
2612 | |
2613 | |
2614 ;; line commands | |
2615 | |
19078 | 2616 (defun viper-line (arg) |
18129 | 2617 (let ((val (car arg)) |
2618 (com (cdr arg))) | |
19078 | 2619 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2620 (if (not (eobp)) |
19078 | 2621 (viper-next-line-carefully (1- val))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2622 ;; 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
|
2623 ;; last line of buffer when this line has no \n. |
19078 | 2624 (viper-add-newline-at-eob-if-necessary) |
2625 (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
|
2626 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
18129 | 2627 ) |
2628 | |
19078 | 2629 (defun viper-yank-line (arg) |
18129 | 2630 "Yank ARG lines (in Vi's sense)." |
2631 (interactive "P") | |
19078 | 2632 (let ((val (viper-p-val arg))) |
2633 (viper-line (cons val ?Y)))) | |
18129 | 2634 |
2635 | |
2636 ;; region commands | |
2637 | |
19078 | 2638 (defun viper-region (arg) |
18129 | 2639 "Execute command on a region." |
2640 (interactive "P") | |
19078 | 2641 (let ((val (viper-P-val arg)) |
2642 (com (viper-getcom arg))) | |
2643 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2644 (exchange-point-and-mark) |
19078 | 2645 (viper-execute-com 'viper-region val com))) |
2646 | |
2647 (defun viper-Region (arg) | |
18129 | 2648 "Execute command on a Region." |
2649 (interactive "P") | |
19078 | 2650 (let ((val (viper-P-val arg)) |
2651 (com (viper-getCom arg))) | |
2652 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2653 (exchange-point-and-mark) |
19078 | 2654 (viper-execute-com 'viper-Region val com))) |
2655 | |
2656 (defun viper-replace-char (arg) | |
18129 | 2657 "Replace the following ARG chars by the character read." |
2658 (interactive "P") | |
2659 (if (and (eolp) (bolp)) (error "No character to replace here")) | |
19078 | 2660 (let ((val (viper-p-val arg)) |
2661 (com (viper-getcom arg))) | |
2662 (viper-replace-char-subr com val) | |
18129 | 2663 (if (and (eolp) (not (bolp))) (forward-char 1)) |
19462 | 2664 (setq viper-this-command-keys |
2665 (format "%sr" (if (integerp arg) arg ""))) | |
19078 | 2666 (viper-set-destructive-command |
2667 (list 'viper-replace-char val ?r nil viper-d-char nil)) | |
18129 | 2668 )) |
2669 | |
19078 | 2670 (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
|
2671 (let ((inhibit-quit t) |
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
2672 char) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2673 (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
|
2674 (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
|
2675 (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
|
2676 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2677 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2678 (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
|
2679 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2680 (if com (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2681 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2682 (setq viper-d-char char) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2683 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2684 (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
|
2685 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2686 (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2687 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2688 (viper-adjust-undo) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2689 (backward-char arg) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2690 )) |
18129 | 2691 |
2692 | |
2693 ;; basic cursor movement. j, k, l, h commands. | |
2694 | |
19078 | 2695 (defun viper-forward-char (arg) |
18129 | 2696 "Move point right ARG characters (left if ARG negative). |
2697 On reaching end of line, stop and signal error." | |
2698 (interactive "P") | |
19078 | 2699 (viper-leave-region-active) |
2700 (let ((val (viper-p-val arg)) | |
2701 (com (viper-getcom arg))) | |
2702 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2703 (if viper-ex-style-motion | |
18129 | 2704 (progn |
2705 ;; the boundary condition check gets weird here because | |
2706 ;; forward-char may be the parameter of a delete, and 'dl' works | |
2707 ;; just like 'x' for the last char on a line, so we have to allow | |
19078 | 2708 ;; the forward motion before the 'viper-execute-com', but, of |
18129 | 2709 ;; course, 'dl' doesn't work on an empty line, so we have to |
19078 | 2710 ;; 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
|
2711 (if (and (eolp) (bolp)) (error "Viper bell") (forward-char val)) |
19078 | 2712 (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
|
2713 (if (eolp) (progn (backward-char 1) (error "Viper bell")))) |
18129 | 2714 (forward-char val) |
19078 | 2715 (if com (viper-execute-com 'viper-forward-char val com))))) |
2716 | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2717 |
19078 | 2718 (defun viper-backward-char (arg) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2719 "Move point left ARG characters (right if ARG negative). |
18129 | 2720 On reaching beginning of line, stop and signal error." |
2721 (interactive "P") | |
19078 | 2722 (viper-leave-region-active) |
2723 (let ((val (viper-p-val arg)) | |
2724 (com (viper-getcom arg))) | |
2725 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2726 (if viper-ex-style-motion | |
18129 | 2727 (progn |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
2728 (if (bolp) (error "Viper bell") (backward-char val)) |
19078 | 2729 (if com (viper-execute-com 'viper-backward-char val com))) |
18129 | 2730 (backward-char val) |
19078 | 2731 (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
|
2732 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2733 |
18129 | 2734 ;; 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
|
2735 ;; Returns distance traveled |
19462 | 2736 ;; (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
|
2737 (defun viper-forward-char-carefully (&optional arg) |
18129 | 2738 (setq arg (or arg 1)) |
19462 | 2739 (let ((pt (point))) |
2740 (condition-case nil | |
2741 (forward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2742 (error nil)) |
19462 | 2743 (if (< (point) pt) ; arg was negative |
2744 (- (viper-chars-in-region pt (point))) | |
2745 (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
|
2746 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2747 |
19462 | 2748 ;; Like backward-char, but doesn't move at beg of buffer. |
2749 ;; Returns distance traveled | |
2750 ;; (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
|
2751 (defun viper-backward-char-carefully (&optional arg) |
18129 | 2752 (setq arg (or arg 1)) |
19462 | 2753 (let ((pt (point))) |
2754 (condition-case nil | |
2755 (backward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2756 (error nil)) |
19462 | 2757 (if (> (point) pt) ; arg was negative |
2758 (viper-chars-in-region pt (point)) | |
2759 (- (viper-chars-in-region pt (point)))))) | |
18129 | 2760 |
19078 | 2761 (defun viper-next-line-carefully (arg) |
18129 | 2762 (condition-case nil |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
2763 ;; do not use forward-line! need to keep column |
99595
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
2764 (let ((line-move-visual nil)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
2765 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
2766 (with-no-warnings (next-line arg)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
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 |
99595
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3067 (let ((line-move-visual nil)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3068 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3069 (with-no-warnings (next-line val)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3070 (next-line val))) |
19078 | 3071 (if viper-ex-style-motion |
18129 | 3072 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3073 (setq this-command 'next-line) | |
19078 | 3074 (if com (viper-execute-com 'viper-next-line val com)))) |
3075 | |
87691
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
3076 (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
|
3077 (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
|
3078 (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
|
3079 |
19078 | 3080 (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
|
3081 "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
|
3082 If point is on a widget or a button, simulate clicking on that widget/button." |
18129 | 3083 (interactive "P") |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3084 (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
|
3085 (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
|
3086 (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
|
3087 (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
|
3088 (if (and widget |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3089 (if (symbolp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3090 (get widget 'widget-type) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3091 (and (consp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3092 (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
|
3093 (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
|
3094 (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
|
3095 (push-button) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3096 ;; 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
|
3097 (viper-leave-region-active) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3098 (save-excursion |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3099 (end-of-line) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3100 (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
|
3101 (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
|
3102 (com (viper-getCom arg))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3103 (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
|
3104 (forward-line val) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3105 (back-to-indentation) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3106 (if com (viper-execute-com 'viper-next-line-at-bol val com))))))) |
19078 | 3107 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
3108 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3109 (defun viper-previous-line (arg) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3110 "Go to previous line." |
18129 | 3111 (interactive "P") |
19078 | 3112 (viper-leave-region-active) |
3113 (let ((val (viper-p-val arg)) | |
3114 (com (viper-getCom arg))) | |
3115 (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
|
3116 ;; do not use forward-line! need to keep column |
99595
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3117 (let ((line-move-visual nil)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3118 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3119 (with-no-warnings (previous-line val)) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3120 (previous-line val))) |
19078 | 3121 (if viper-ex-style-motion |
18129 | 3122 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3123 (setq this-command 'previous-line) | |
19078 | 3124 (if com (viper-execute-com 'viper-previous-line val com)))) |
3125 | |
3126 | |
3127 (defun viper-previous-line-at-bol (arg) | |
18129 | 3128 "Previous line at beginning of line." |
3129 (interactive "P") | |
19078 | 3130 (viper-leave-region-active) |
18129 | 3131 (save-excursion |
3132 (beginning-of-line) | |
3133 (if (bobp) (error "First line in buffer"))) | |
19078 | 3134 (let ((val (viper-p-val arg)) |
3135 (com (viper-getCom arg))) | |
3136 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3137 (forward-line (- val)) |
3138 (back-to-indentation) | |
19078 | 3139 (if com (viper-execute-com 'viper-previous-line val com)))) |
3140 | |
3141 (defun viper-change-to-eol (arg) | |
18129 | 3142 "Change to end of line." |
3143 (interactive "P") | |
19078 | 3144 (viper-goto-eol (cons arg ?c))) |
3145 | |
3146 (defun viper-kill-line (arg) | |
18129 | 3147 "Delete line." |
3148 (interactive "P") | |
19078 | 3149 (viper-goto-eol (cons arg ?d))) |
3150 | |
3151 (defun viper-erase-line (arg) | |
18129 | 3152 "Erase line." |
3153 (interactive "P") | |
19078 | 3154 (viper-beginning-of-line (cons arg ?d))) |
18129 | 3155 |
3156 | |
3157 ;;; Moving around | |
3158 | |
19078 | 3159 (defun viper-goto-line (arg) |
18129 | 3160 "Go to ARG's line. Without ARG go to end of buffer." |
3161 (interactive "P") | |
19078 | 3162 (let ((val (viper-P-val arg)) |
3163 (com (viper-getCom arg))) | |
3164 (viper-move-marker-locally 'viper-com-point (point)) | |
3165 (viper-deactivate-mark) | |
18129 | 3166 (push-mark nil t) |
3167 (if (null val) | |
3168 (goto-char (point-max)) | |
3169 (goto-char (point-min)) | |
3170 (forward-line (1- val))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3171 |
18129 | 3172 ;; positioning is done twice: before and after command execution |
3173 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3174 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3175 |
19078 | 3176 (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
|
3177 |
18129 | 3178 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3179 (back-to-indentation) | |
3180 )) | |
3181 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3182 ;; Find ARG's occurrence of CHAR on the current line. |
18129 | 3183 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to |
3184 ;; adjust point after search. | |
19078 | 3185 (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
|
3186 (or (char-or-string-p char) (error "Viper bell")) |
18129 | 3187 (let ((arg (if forward arg (- arg))) |
19078 | 3188 (cmd (if (eq viper-intermediate-command 'viper-repeat) |
3189 (nth 5 viper-d-com) | |
3190 (viper-array-to-string (this-command-keys)))) | |
21940 | 3191 point region-beg region-end) |
18129 | 3192 (save-excursion |
3193 (save-restriction | |
21940 | 3194 (if (> arg 0) ; forward |
3195 (progn | |
3196 (setq region-beg (point)) | |
3197 (if viper-allow-multiline-replace-regions | |
3198 (viper-forward-paragraph 1) | |
3199 (end-of-line)) | |
3200 (setq region-end (point))) | |
3201 (setq region-end (point)) | |
3202 (if viper-allow-multiline-replace-regions | |
3203 (viper-backward-paragraph 1) | |
3204 (beginning-of-line)) | |
3205 (setq region-beg (point))) | |
3206 (if (or (and (< arg 0) | |
3207 (< (- region-end region-beg) | |
3208 (if viper-allow-multiline-replace-regions | |
3209 2 1)) | |
3210 (bolp)) | |
3211 (and (> arg 0) | |
3212 (< (- region-end region-beg) | |
3213 (if viper-allow-multiline-replace-regions | |
3214 3 2)) | |
3215 (eolp))) | |
3216 (error "Command `%s': At %s of %s" | |
3217 cmd | |
3218 (if (> arg 0) "end" "beginning") | |
3219 (if viper-allow-multiline-replace-regions | |
3220 "paragraph" "line"))) | |
3221 (narrow-to-region region-beg region-end) | |
18129 | 3222 ;; if arg > 0, point is forwarded before search. |
3223 (if (> arg 0) (goto-char (1+ (point-min))) | |
3224 (goto-char (point-max))) | |
3225 (if (let ((case-fold-search nil)) | |
3226 (search-forward (char-to-string char) nil 0 arg)) | |
3227 (setq point (point)) | |
3228 (error "Command `%s': `%c' not found" cmd char)))) | |
19462 | 3229 (goto-char point) |
3230 (if (> arg 0) | |
3231 (backward-char (if offset 2 1)) | |
3232 (forward-char (if offset 1 0))))) | |
18129 | 3233 |
19078 | 3234 (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
|
3235 "Find char on the line. |
18129 | 3236 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
|
3237 called from viper-repeat, the char last used is used. This behavior is |
18129 | 3238 controlled by the sign of prefix numeric value." |
3239 (interactive "P") | |
19078 | 3240 (let ((val (viper-p-val arg)) |
3241 (com (viper-getcom arg)) | |
3242 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3243 (if (> val 0) |
3244 ;; this means that the function was called interactively | |
19078 | 3245 (setq viper-f-char (read-char) |
3246 viper-f-forward t | |
3247 viper-f-offset nil) | |
3248 ;; viper-repeat --- set viper-F-char from command-keys | |
3249 (setq viper-F-char (if (stringp cmd-representation) | |
3250 (viper-seq-last-elt cmd-representation) | |
3251 viper-F-char) | |
3252 viper-f-char viper-F-char) | |
18129 | 3253 (setq val (- val))) |
19078 | 3254 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3255 (viper-find-char | |
3256 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil) | |
18129 | 3257 (setq val (- val)) |
3258 (if com | |
3259 (progn | |
19078 | 3260 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3261 (forward-char) |
19078 | 3262 (viper-execute-com 'viper-find-char-forward val com))))) |
3263 | |
3264 (defun viper-goto-char-forward (arg) | |
18129 | 3265 "Go up to char ARG forward on line." |
3266 (interactive "P") | |
19078 | 3267 (let ((val (viper-p-val arg)) |
3268 (com (viper-getcom arg)) | |
3269 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3270 (if (> val 0) |
3271 ;; this means that the function was called interactively | |
19078 | 3272 (setq viper-f-char (read-char) |
3273 viper-f-forward t | |
3274 viper-f-offset t) | |
3275 ;; viper-repeat --- set viper-F-char from command-keys | |
3276 (setq viper-F-char (if (stringp cmd-representation) | |
3277 (viper-seq-last-elt cmd-representation) | |
3278 viper-F-char) | |
3279 viper-f-char viper-F-char) | |
18129 | 3280 (setq val (- val))) |
19078 | 3281 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3282 (viper-find-char | |
3283 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t) | |
18129 | 3284 (setq val (- val)) |
3285 (if com | |
3286 (progn | |
19078 | 3287 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3288 (forward-char) |
19078 | 3289 (viper-execute-com 'viper-goto-char-forward val com))))) |
3290 | |
3291 (defun viper-find-char-backward (arg) | |
18129 | 3292 "Find char ARG on line backward." |
3293 (interactive "P") | |
19078 | 3294 (let ((val (viper-p-val arg)) |
3295 (com (viper-getcom arg)) | |
3296 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3297 (if (> val 0) |
3298 ;; this means that the function was called interactively | |
19078 | 3299 (setq viper-f-char (read-char) |
3300 viper-f-forward nil | |
3301 viper-f-offset nil) | |
3302 ;; viper-repeat --- set viper-F-char from command-keys | |
3303 (setq viper-F-char (if (stringp cmd-representation) | |
3304 (viper-seq-last-elt cmd-representation) | |
3305 viper-F-char) | |
3306 viper-f-char viper-F-char) | |
18129 | 3307 (setq val (- val))) |
19078 | 3308 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3309 (viper-find-char | |
3310 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil) | |
18129 | 3311 (setq val (- val)) |
3312 (if com | |
3313 (progn | |
19078 | 3314 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3315 (viper-execute-com 'viper-find-char-backward val com))))) | |
3316 | |
3317 (defun viper-goto-char-backward (arg) | |
18129 | 3318 "Go up to char ARG backward on line." |
3319 (interactive "P") | |
19078 | 3320 (let ((val (viper-p-val arg)) |
3321 (com (viper-getcom arg)) | |
3322 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3323 (if (> val 0) |
3324 ;; this means that the function was called interactively | |
19078 | 3325 (setq viper-f-char (read-char) |
3326 viper-f-forward nil | |
3327 viper-f-offset t) | |
3328 ;; viper-repeat --- set viper-F-char from command-keys | |
3329 (setq viper-F-char (if (stringp cmd-representation) | |
3330 (viper-seq-last-elt cmd-representation) | |
3331 viper-F-char) | |
3332 viper-f-char viper-F-char) | |
18129 | 3333 (setq val (- val))) |
19078 | 3334 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3335 (viper-find-char | |
3336 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t) | |
18129 | 3337 (setq val (- val)) |
3338 (if com | |
3339 (progn | |
19078 | 3340 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3341 (viper-execute-com 'viper-goto-char-backward val com))))) | |
3342 | |
3343 (defun viper-repeat-find (arg) | |
18129 | 3344 "Repeat previous find command." |
3345 (interactive "P") | |
19078 | 3346 (let ((val (viper-p-val arg)) |
3347 (com (viper-getcom arg))) | |
3348 (viper-deactivate-mark) | |
3349 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3350 (viper-find-char val viper-f-char viper-f-forward viper-f-offset) | |
18129 | 3351 (if com |
3352 (progn | |
19078 | 3353 (if viper-f-forward (forward-char)) |
3354 (viper-execute-com 'viper-repeat-find val com))))) | |
3355 | |
3356 (defun viper-repeat-find-opposite (arg) | |
18129 | 3357 "Repeat previous find command in the opposite direction." |
3358 (interactive "P") | |
19078 | 3359 (let ((val (viper-p-val arg)) |
3360 (com (viper-getcom arg))) | |
3361 (viper-deactivate-mark) | |
3362 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3363 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset) | |
18129 | 3364 (if com |
3365 (progn | |
19078 | 3366 (if viper-f-forward (forward-char)) |
3367 (viper-execute-com 'viper-repeat-find-opposite val com))))) | |
18129 | 3368 |
3369 | |
3370 ;; window scrolling etc. | |
3371 | |
19078 | 3372 (defun viper-window-top (arg) |
18129 | 3373 "Go to home window line." |
3374 (interactive "P") | |
19078 | 3375 (let ((val (viper-p-val arg)) |
3376 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3377 (viper-leave-region-active) |
19078 | 3378 (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
|
3379 (push-mark nil t) |
18129 | 3380 (move-to-window-line (1- val)) |
3381 | |
3382 ;; positioning is done twice: before and after command execution | |
3383 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3384 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3385 |
19078 | 3386 (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
|
3387 |
18129 | 3388 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3389 (back-to-indentation) | |
3390 )) | |
3391 | |
19078 | 3392 (defun viper-window-middle (arg) |
18129 | 3393 "Go to middle window line." |
3394 (interactive "P") | |
19078 | 3395 (let ((val (viper-p-val arg)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3396 (com (viper-getCom arg))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3397 (viper-leave-region-active) |
19078 | 3398 (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
|
3399 (push-mark nil t) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3400 (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
|
3401 |
18129 | 3402 ;; positioning is done twice: before and after command execution |
3403 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3404 (back-to-indentation) | |
3405 | |
19078 | 3406 (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
|
3407 |
18129 | 3408 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3409 (back-to-indentation) | |
3410 )) | |
3411 | |
19078 | 3412 (defun viper-window-bottom (arg) |
18129 | 3413 "Go to last window line." |
3414 (interactive "P") | |
19078 | 3415 (let ((val (viper-p-val arg)) |
3416 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3417 (viper-leave-region-active) |
19078 | 3418 (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
|
3419 (push-mark nil t) |
18129 | 3420 (move-to-window-line (- val)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3421 |
18129 | 3422 ;; positioning is done twice: before and after command execution |
3423 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3424 (back-to-indentation) | |
3425 | |
19078 | 3426 (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
|
3427 |
18129 | 3428 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3429 (back-to-indentation) | |
3430 )) | |
3431 | |
19078 | 3432 (defun viper-line-to-top (arg) |
18129 | 3433 "Put current line on the home line." |
3434 (interactive "p") | |
3435 (recenter (1- arg))) | |
3436 | |
19078 | 3437 (defun viper-line-to-middle (arg) |
18129 | 3438 "Put current line on the middle line." |
3439 (interactive "p") | |
3440 (recenter (+ (1- arg) (/ (1- (window-height)) 2)))) | |
3441 | |
19078 | 3442 (defun viper-line-to-bottom (arg) |
18129 | 3443 "Put current line on the last line." |
3444 (interactive "p") | |
3445 (recenter (- (window-height) (1+ arg)))) | |
3446 | |
19078 | 3447 ;; If point is within viper-search-scroll-threshold of window top or bottom, |
18129 | 3448 ;; 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
|
3449 ;; 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
|
3450 ;; (which is called from viper-search-forward/backward/next). If the value of |
19078 | 3451 ;; viper-search-scroll-threshold is negative - don't scroll. |
3452 (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
|
3453 (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
|
3454 (window-displayed-height) |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
3455 (1- (window-height)))) ; adjust for modeline |
18129 | 3456 (pt (point)) |
3457 at-top-p at-bottom-p | |
3458 min-scroll direction) | |
3459 (save-excursion | |
3460 (move-to-window-line 0) ; top | |
3461 (setq at-top-p | |
3462 (<= (count-lines pt (point)) | |
19078 | 3463 viper-search-scroll-threshold)) |
18129 | 3464 (move-to-window-line -1) ; bottom |
3465 (setq at-bottom-p | |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
3466 (<= (count-lines pt (point)) viper-search-scroll-threshold))) |
19078 | 3467 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold) |
18129 | 3468 direction 1)) |
19078 | 3469 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold) |
18129 | 3470 direction -1))) |
3471 (if min-scroll | |
3472 (recenter | |
3473 (* (max min-scroll (/ win-height 7)) direction))) | |
3474 )) | |
3475 | |
3476 | |
3477 ;; paren match | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3478 ;; must correct this to only match ( to ) etc. On the other hand |
18129 | 3479 ;; 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
|
3480 ;; catch _all_ imbalances. |
18129 | 3481 |
19078 | 3482 (defun viper-paren-match (arg) |
18129 | 3483 "Go to the matching parenthesis." |
3484 (interactive "P") | |
19078 | 3485 (viper-leave-region-active) |
3486 (let ((com (viper-getcom arg)) | |
3487 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments) | |
18129 | 3488 anchor-point) |
3489 (if (integerp arg) | |
3490 (if (or (> arg 99) (< arg 1)) | |
3491 (error "Prefix must be between 1 and 99") | |
3492 (goto-char | |
3493 (if (> (point-max) 80000) | |
3494 (* (/ (point-max) 100) arg) | |
3495 (/ (* (point-max) arg) 100))) | |
3496 (back-to-indentation)) | |
3497 (let (beg-lim end-lim) | |
3498 (if (and (eolp) (not (bolp))) (forward-char -1)) | |
3499 (if (not (looking-at "[][(){}]")) | |
3500 (setq anchor-point (point))) | |
3501 (save-excursion | |
3502 (beginning-of-line) | |
3503 (setq beg-lim (point)) | |
3504 (end-of-line) | |
3505 (setq end-lim (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3506 (cond ((re-search-forward "[][(){}]" end-lim t) |
18129 | 3507 (backward-char) ) |
3508 ((re-search-backward "[][(){}]" beg-lim t)) | |
3509 (t | |
3510 (error "No matching character on line")))) | |
3511 (cond ((looking-at "[\(\[{]") | |
19078 | 3512 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3513 (forward-sexp 1) |
3514 (if com | |
19078 | 3515 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3516 (backward-char))) |
3517 (anchor-point | |
3518 (if com | |
3519 (progn | |
19078 | 3520 (viper-move-marker-locally 'viper-com-point anchor-point) |
18129 | 3521 (forward-char 1) |
19078 | 3522 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3523 ))) |
3524 ((looking-at "[])}]") | |
3525 (forward-char) | |
19078 | 3526 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3527 (backward-sexp 1) |
19078 | 3528 (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
|
3529 (t (error "Viper bell")))))) |
18129 | 3530 |
19078 | 3531 (defun viper-toggle-parse-sexp-ignore-comments () |
18129 | 3532 (interactive) |
19078 | 3533 (setq viper-parse-sexp-ignore-comments |
3534 (not viper-parse-sexp-ignore-comments)) | |
18839 | 3535 (princ (format |
3536 "From now on, `%%' will %signore parentheses inside comment fields" | |
19078 | 3537 (if viper-parse-sexp-ignore-comments "" "NOT ")))) |
18129 | 3538 |
3539 | |
21940 | 3540 ;; sentence, paragraph and heading |
18129 | 3541 |
19078 | 3542 (defun viper-forward-sentence (arg) |
18129 | 3543 "Forward sentence." |
3544 (interactive "P") | |
20003 | 3545 (or (eq last-command this-command) |
3546 (push-mark nil t)) | |
19078 | 3547 (let ((val (viper-p-val arg)) |
3548 (com (viper-getcom arg))) | |
3549 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3550 (forward-sentence val) |
19078 | 3551 (if com (viper-execute-com 'viper-forward-sentence nil com)))) |
3552 | |
3553 (defun viper-backward-sentence (arg) | |
18129 | 3554 "Backward sentence." |
3555 (interactive "P") | |
20003 | 3556 (or (eq last-command this-command) |
3557 (push-mark nil t)) | |
19078 | 3558 (let ((val (viper-p-val arg)) |
3559 (com (viper-getcom arg))) | |
3560 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3561 (backward-sentence val) |
19078 | 3562 (if com (viper-execute-com 'viper-backward-sentence nil com)))) |
3563 | |
3564 (defun viper-forward-paragraph (arg) | |
18129 | 3565 "Forward paragraph." |
3566 (interactive "P") | |
20003 | 3567 (or (eq last-command this-command) |
3568 (push-mark nil t)) | |
19078 | 3569 (let ((val (viper-p-val arg)) |
21940 | 3570 ;; if you want d} operate on whole lines, change viper-getcom to |
3571 ;; viper-getCom below | |
3572 (com (viper-getcom arg))) | |
19078 | 3573 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3574 (forward-paragraph val) |
3575 (if com | |
3576 (progn | |
3577 (backward-char 1) | |
19078 | 3578 (viper-execute-com 'viper-forward-paragraph nil com))))) |
3579 | |
3580 (defun viper-backward-paragraph (arg) | |
18129 | 3581 "Backward paragraph." |
3582 (interactive "P") | |
20003 | 3583 (or (eq last-command this-command) |
3584 (push-mark nil t)) | |
19078 | 3585 (let ((val (viper-p-val arg)) |
21940 | 3586 ;; if you want d{ operate on whole lines, change viper-getcom to |
3587 ;; viper-getCom below | |
3588 (com (viper-getcom arg))) | |
19078 | 3589 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3590 (backward-paragraph val) |
3591 (if com | |
3592 (progn | |
3593 (forward-char 1) | |
19078 | 3594 (viper-execute-com 'viper-backward-paragraph nil com) |
18129 | 3595 (backward-char 1))))) |
3596 | |
20003 | 3597 ;; should be mode-specific |
19078 | 3598 (defun viper-prev-heading (arg) |
18129 | 3599 (interactive "P") |
19078 | 3600 (let ((val (viper-p-val arg)) |
3601 (com (viper-getCom arg))) | |
3602 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3603 (re-search-backward viper-heading-start nil t val) | |
18129 | 3604 (goto-char (match-beginning 0)) |
19078 | 3605 (if com (viper-execute-com 'viper-prev-heading nil com)))) |
3606 | |
3607 (defun viper-heading-end (arg) | |
18129 | 3608 (interactive "P") |
19078 | 3609 (let ((val (viper-p-val arg)) |
3610 (com (viper-getCom arg))) | |
3611 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3612 (re-search-forward viper-heading-end nil t val) | |
18129 | 3613 (goto-char (match-beginning 0)) |
19078 | 3614 (if com (viper-execute-com 'viper-heading-end nil com)))) |
3615 | |
3616 (defun viper-next-heading (arg) | |
18129 | 3617 (interactive "P") |
19078 | 3618 (let ((val (viper-p-val arg)) |
3619 (com (viper-getCom arg))) | |
3620 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3621 (end-of-line) |
19078 | 3622 (re-search-forward viper-heading-start nil t val) |
18129 | 3623 (goto-char (match-beginning 0)) |
19078 | 3624 (if com (viper-execute-com 'viper-next-heading nil com)))) |
18129 | 3625 |
3626 | |
3627 ;; scrolling | |
3628 | |
19078 | 3629 (defun viper-scroll-screen (arg) |
18129 | 3630 "Scroll to next screen." |
3631 (interactive "p") | |
3632 (condition-case nil | |
3633 (if (> arg 0) | |
3634 (while (> arg 0) | |
3635 (scroll-up) | |
3636 (setq arg (1- arg))) | |
3637 (while (> 0 arg) | |
3638 (scroll-down) | |
3639 (setq arg (1+ arg)))) | |
3640 (error (beep 1) | |
3641 (if (> arg 0) | |
3642 (progn | |
3643 (message "End of buffer") | |
3644 (goto-char (point-max))) | |
3645 (message "Beginning of buffer") | |
3646 (goto-char (point-min)))) | |
3647 )) | |
3648 | |
19078 | 3649 (defun viper-scroll-screen-back (arg) |
18129 | 3650 "Scroll to previous screen." |
3651 (interactive "p") | |
19078 | 3652 (viper-scroll-screen (- arg))) |
3653 | |
3654 (defun viper-scroll-down (arg) | |
18129 | 3655 "Pull down half screen." |
3656 (interactive "P") | |
3657 (condition-case nil | |
3658 (if (null arg) | |
3659 (scroll-down (/ (window-height) 2)) | |
3660 (scroll-down arg)) | |
3661 (error (beep 1) | |
3662 (message "Beginning of buffer") | |
3663 (goto-char (point-min))))) | |
3664 | |
19078 | 3665 (defun viper-scroll-down-one (arg) |
18129 | 3666 "Scroll up one line." |
3667 (interactive "p") | |
3668 (scroll-down arg)) | |
3669 | |
19078 | 3670 (defun viper-scroll-up (arg) |
18129 | 3671 "Pull up half screen." |
3672 (interactive "P") | |
3673 (condition-case nil | |
3674 (if (null arg) | |
3675 (scroll-up (/ (window-height) 2)) | |
3676 (scroll-up arg)) | |
3677 (error (beep 1) | |
3678 (message "End of buffer") | |
3679 (goto-char (point-max))))) | |
3680 | |
19078 | 3681 (defun viper-scroll-up-one (arg) |
18129 | 3682 "Scroll down one line." |
3683 (interactive "p") | |
3684 (scroll-up arg)) | |
3685 | |
3686 | |
3687 ;; searching | |
3688 | |
104277
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3689 (defun viper-insert-isearch-string () |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3690 "Insert `isearch' last search string." |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3691 (interactive) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3692 (when isearch-string (insert isearch-string))) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3693 |
19078 | 3694 (defun viper-if-string (prompt) |
3695 (if (memq viper-intermediate-command | |
3696 '(viper-command-argument viper-digit-argument viper-repeat)) | |
3697 (setq viper-this-command-keys (this-command-keys))) | |
104277
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3698 (let* ((keymap (let ((keymap (copy-keymap minibuffer-local-map))) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3699 (define-key keymap [(control ?s)] 'viper-insert-isearch-string) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3700 keymap)) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3701 (s (viper-read-string-with-history |
18129 | 3702 prompt |
3703 nil ; no initial | |
19078 | 3704 'viper-search-history |
104277
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3705 (car viper-search-history) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3706 keymap))) |
18129 | 3707 (if (not (string= s "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3708 (setq viper-s-string s)))) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3709 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3710 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3711 (defun viper-toggle-search-style (arg) |
19078 | 3712 "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
|
3713 Without prefix argument, will ask which search style to toggle. With prefix |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
3714 arg 1, toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
19078 | 3715 |
3716 Although this function is bound to \\[viper-toggle-search-style], the most | |
18129 | 3717 convenient way to use it is to bind `//' to the macro |
19078 | 3718 `1 M-x viper-toggle-search-style' and `///' to |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3719 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will |
18129 | 3720 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
|
3721 search. Macros are more convenient in this case because they don't affect |
18129 | 3722 the Emacs binding of `/'." |
3723 (interactive "P") | |
3724 (let (msg) | |
3725 (cond ((or (eq arg 1) | |
3726 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3727 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3728 (if viper-case-fold-search |
18129 | 3729 "case-insensitive" "case-sensitive") |
19078 | 3730 (if viper-case-fold-search |
18129 | 3731 "case-sensitive" |
3732 "case-insensitive"))))) | |
19078 | 3733 (setq viper-case-fold-search (null viper-case-fold-search)) |
3734 (if viper-case-fold-search | |
18129 | 3735 (setq msg "Search becomes case-insensitive") |
3736 (setq msg "Search becomes case-sensitive"))) | |
3737 ((or (eq arg 2) | |
3738 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3739 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3740 (if viper-re-search |
18129 | 3741 "regexp-search" "vanilla-search") |
19078 | 3742 (if viper-re-search |
18129 | 3743 "vanilla-search" |
3744 "regexp-search"))))) | |
19078 | 3745 (setq viper-re-search (null viper-re-search)) |
3746 (if viper-re-search | |
18129 | 3747 (setq msg "Search becomes regexp-style") |
3748 (setq msg "Search becomes vanilla-style"))) | |
3749 (t | |
3750 (setq msg "Search style remains unchanged"))) | |
18839 | 3751 (princ msg t))) |
3752 | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3753 (defun viper-set-searchstyle-toggling-macros (unset &optional major-mode) |
18129 | 3754 "Set the macros for toggling the search style in Viper's vi-state. |
3755 The macro that toggles case sensitivity is bound to `//', and the one that | |
3756 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
|
3757 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
|
3758 If MAJOR-MODE is set, set the macros only in that major mode." |
18129 | 3759 (interactive "P") |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3760 (let (scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3761 (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
|
3762 (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
|
3763 (setq scope 't)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3764 (or noninteractive |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3765 (if (not unset) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3766 (progn |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3767 ;; 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
|
3768 (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
|
3769 "//" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3770 [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
|
3771 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3772 ;; 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
|
3773 (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
|
3774 "///" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3775 [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
|
3776 scope) |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3777 ;; XEmacs has no called-interactively-p |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3778 ;; (if (called-interactively-p 'interactive) |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3779 (if (interactive-p) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3780 (message |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3781 "// 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
|
3782 (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
|
3783 (sit-for 2) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3784 (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
|
3785 )) |
63268
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3786 |
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3787 |
19078 | 3788 (defun viper-set-parsing-style-toggling-macro (unset) |
18839 | 3789 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses. |
3790 This is used in conjunction with the `%' command. | |
3791 | |
3792 With a prefix argument, unsets the macro." | |
3793 (interactive "P") | |
3794 (or noninteractive | |
3795 (if (not unset) | |
3796 (progn | |
3797 ;; Make %%% toggle parsing comments for matching parentheses | |
19078 | 3798 (viper-record-kbd-macro |
18839 | 3799 "%%%" 'vi-state |
19078 | 3800 [(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 | 3801 't) |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3802 ;; XEmacs has no called-interactively-p. And interactive-p |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3803 ;; works fine here. |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3804 ;; (if (called-interactively-p 'interactive) |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3805 (if (interactive-p) |
18839 | 3806 (message |
3807 "%%%%%% now toggles whether comments should be parsed for matching parentheses"))) | |
19078 | 3808 (viper-unrecord-kbd-macro "%%%" 'vi-state)))) |
3809 | |
3810 | |
3811 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode) | |
18129 | 3812 "Set the macros for toggling the search style in Viper's emacs-state. |
3813 The macro that toggles case sensitivity is bound to `//', and the one that | |
3814 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
|
3815 With a prefix argument, this function unsets the macros. |
18129 | 3816 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
|
3817 this sets the macros only in the macros in that major mode. Otherwise, |
18129 | 3818 the macros are set in the current major mode. |
3819 \(When unsetting the macros, the second argument has no effect.\)" | |
3820 (interactive "P") | |
3821 (or noninteractive | |
3822 (if (not unset) | |
3823 (progn | |
3824 ;; toggle case sensitivity in search | |
19078 | 3825 (viper-record-kbd-macro |
18129 | 3826 "//" 'emacs-state |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3827 [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 | 3828 (or arg-majormode major-mode)) |
3829 ;; toggle regexp/vanila search | |
19078 | 3830 (viper-record-kbd-macro |
18129 | 3831 "///" 'emacs-state |
19078 | 3832 [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 | 3833 (or arg-majormode major-mode)) |
106192
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3834 ;; called-interactively-p does not work for |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3835 ;; XEmacs. interactive-p is ok here. |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3836 ;; (if (called-interactively-p 'interactive) |
a2ee981efbec
2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
105829
diff
changeset
|
3837 (if (interactive-p) |
18129 | 3838 (message |
3839 "// and /// now toggle case-sensitivity and regexp search."))) | |
19078 | 3840 (viper-unrecord-kbd-macro "//" 'emacs-state) |
18129 | 3841 (sit-for 2) |
19078 | 3842 (viper-unrecord-kbd-macro "///" 'emacs-state)))) |
3843 | |
3844 | |
3845 (defun viper-search-forward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3846 "Search a string forward. |
18129 | 3847 ARG is used to find the ARG's occurrence of the string. |
3848 Null string will repeat previous search." | |
3849 (interactive "P") | |
19078 | 3850 (let ((val (viper-P-val arg)) |
3851 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3852 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3853 debug-on-error) |
19078 | 3854 (setq viper-s-forward t) |
3855 (viper-if-string "/") | |
18129 | 3856 ;; this is not used at present, but may be used later |
19078 | 3857 (if (or (not (equal old-str viper-s-string)) |
3858 (not (markerp viper-local-search-start-marker)) | |
3859 (not (marker-buffer viper-local-search-start-marker))) | |
3860 (setq viper-local-search-start-marker (point-marker))) | |
3861 (viper-search viper-s-string t val) | |
18129 | 3862 (if com |
3863 (progn | |
19078 | 3864 (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
|
3865 (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
|
3866 )) |
19078 | 3867 |
3868 (defun viper-search-backward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3869 "Search a string backward. |
18129 | 3870 ARG is used to find the ARG's occurrence of the string. |
3871 Null string will repeat previous search." | |
3872 (interactive "P") | |
19078 | 3873 (let ((val (viper-P-val arg)) |
3874 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3875 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3876 debug-on-error) |
19078 | 3877 (setq viper-s-forward nil) |
3878 (viper-if-string "?") | |
18129 | 3879 ;; this is not used at present, but may be used later |
19078 | 3880 (if (or (not (equal old-str viper-s-string)) |
3881 (not (markerp viper-local-search-start-marker)) | |
3882 (not (marker-buffer viper-local-search-start-marker))) | |
3883 (setq viper-local-search-start-marker (point-marker))) | |
3884 (viper-search viper-s-string nil val) | |
18129 | 3885 (if com |
3886 (progn | |
19078 | 3887 (viper-move-marker-locally 'viper-com-point (mark t)) |
3888 (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
|
3889 |
18129 | 3890 |
3891 ;; Search for COUNT's occurrence of STRING. | |
3892 ;; Search is forward if FORWARD is non-nil, otherwise backward. | |
3893 ;; INIT-POINT is the position where search is to start. | |
3894 ;; Arguments: | |
3895 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND) | |
19078 | 3896 (defun viper-search (string forward arg |
3897 &optional no-offset init-point fail-if-not-found) | |
18129 | 3898 (if (not (equal string "")) |
19078 | 3899 (let ((val (viper-p-val arg)) |
3900 (com (viper-getcom arg)) | |
18129 | 3901 (offset (not no-offset)) |
19078 | 3902 (case-fold-search viper-case-fold-search) |
18129 | 3903 (start-point (or init-point (point)))) |
19078 | 3904 (viper-deactivate-mark) |
18129 | 3905 (if forward |
3906 (condition-case nil | |
3907 (progn | |
19078 | 3908 (if offset (viper-forward-char-carefully)) |
3909 (if viper-re-search | |
18129 | 3910 (progn |
3911 (re-search-forward string nil nil val) | |
3912 (re-search-backward string)) | |
3913 (search-forward string nil nil val) | |
3914 (search-backward string)) | |
3915 (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
|
3916 (push-mark start-point t))) |
18129 | 3917 (search-failed |
93773
d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
93615
diff
changeset
|
3918 (if (and (not fail-if-not-found) viper-search-wrap-around) |
18129 | 3919 (progn |
3920 (message "Search wrapped around BOTTOM of buffer") | |
3921 (goto-char (point-min)) | |
19078 | 3922 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3923 ;; don't wait in macros |
19078 | 3924 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3925 (memq viper-intermediate-command |
19078 | 3926 '(viper-repeat |
3927 viper-digit-argument | |
3928 viper-command-argument)) | |
3929 (sit-for 2)) | |
18129 | 3930 ;; delete the wrap-around message |
3931 (message "") | |
3932 ) | |
3933 (goto-char start-point) | |
3934 (error "`%s': %s not found" | |
3935 string | |
19078 | 3936 (if viper-re-search "Pattern" "String")) |
18129 | 3937 ))) |
3938 ;; backward | |
3939 (condition-case nil | |
3940 (progn | |
19078 | 3941 (if viper-re-search |
18129 | 3942 (re-search-backward string nil nil val) |
3943 (search-backward string nil nil val)) | |
3944 (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
|
3945 (push-mark start-point t))) |
18129 | 3946 (search-failed |
93773
d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
93615
diff
changeset
|
3947 (if (and (not fail-if-not-found) viper-search-wrap-around) |
18129 | 3948 (progn |
3949 (message "Search wrapped around TOP of buffer") | |
3950 (goto-char (point-max)) | |
19078 | 3951 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3952 ;; don't wait in macros |
19078 | 3953 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3954 (memq viper-intermediate-command |
19078 | 3955 '(viper-repeat |
3956 viper-digit-argument | |
3957 viper-command-argument)) | |
3958 (sit-for 2)) | |
18129 | 3959 ;; delete the wrap-around message |
3960 (message "") | |
3961 ) | |
3962 (goto-char start-point) | |
3963 (error "`%s': %s not found" | |
3964 string | |
19078 | 3965 (if viper-re-search "Pattern" "String")) |
18129 | 3966 )))) |
3967 ;; pull up or down if at top/bottom of window | |
19078 | 3968 (viper-adjust-window) |
18129 | 3969 ;; highlight the result of search |
3970 ;; don't wait and don't highlight in macros | |
3971 (or executing-kbd-macro | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3972 (memq viper-intermediate-command |
19078 | 3973 '(viper-repeat viper-digit-argument viper-command-argument)) |
3974 (viper-flash-search-pattern)) | |
18129 | 3975 ))) |
3976 | |
19078 | 3977 (defun viper-search-next (arg) |
18129 | 3978 "Repeat previous search." |
3979 (interactive "P") | |
19078 | 3980 (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
|
3981 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3982 debug-on-error) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
3983 (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
|
3984 (error viper-NoPrevSearch)) |
19078 | 3985 (viper-search viper-s-string viper-s-forward arg) |
18129 | 3986 (if com |
3987 (progn | |
19078 | 3988 (viper-move-marker-locally 'viper-com-point (mark t)) |
3989 (viper-execute-com 'viper-search-next val com))))) | |
3990 | |
3991 (defun viper-search-Next (arg) | |
18129 | 3992 "Repeat previous search in the reverse direction." |
3993 (interactive "P") | |
19078 | 3994 (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
|
3995 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3996 debug-on-error) |
19078 | 3997 (if (null viper-s-string) (error viper-NoPrevSearch)) |
3998 (viper-search viper-s-string (not viper-s-forward) arg) | |
18129 | 3999 (if com |
4000 (progn | |
19078 | 4001 (viper-move-marker-locally 'viper-com-point (mark t)) |
4002 (viper-execute-com 'viper-search-Next val com))))) | |
18129 | 4003 |
4004 | |
4005 ;; Search contents of buffer defined by one of Viper's motion commands. | |
4006 ;; Repeatable via `n' and `N'. | |
19078 | 4007 (defun viper-buffer-search-enable (&optional c) |
4008 (cond (c (setq viper-buffer-search-char c)) | |
4009 ((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
|
4010 ;; ?g acts as a default value for viper-buffer-search-char |
19078 | 4011 (setq viper-buffer-search-char ?g))) |
4012 (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
|
4013 (cond ((viper-characterp viper-buffer-search-char) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4014 (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
|
4015 (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
|
4016 viper-buffer-search-char))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4017 'viper-command-argument) |
19078 | 4018 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search) |
4019 (setq viper-prefix-commands | |
4020 (cons viper-buffer-search-char viper-prefix-commands))) | |
18129 | 4021 |
4022 ;; This is a Viper wraper for isearch-forward. | |
19078 | 4023 (defun viper-isearch-forward (arg) |
18129 | 4024 "Do incremental search forward." |
4025 (interactive "P") | |
4026 ;; emacs bug workaround | |
4027 (if (listp arg) (setq arg (car arg))) | |
19078 | 4028 (viper-exec-form-in-emacs (list 'isearch-forward arg))) |
18129 | 4029 |
4030 ;; This is a Viper wraper for isearch-backward." | |
19078 | 4031 (defun viper-isearch-backward (arg) |
18129 | 4032 "Do incremental search backward." |
4033 (interactive "P") | |
4034 ;; emacs bug workaround | |
4035 (if (listp arg) (setq arg (car arg))) | |
19078 | 4036 (viper-exec-form-in-emacs (list 'isearch-backward arg))) |
18129 | 4037 |
4038 | |
4039 ;; visiting and killing files, buffers | |
4040 | |
19078 | 4041 (defun viper-switch-to-buffer () |
18129 | 4042 "Switch to buffer in the current window." |
4043 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4044 (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
|
4045 buffer) |
18129 | 4046 (setq buffer |
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 "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
|
4049 (switch-to-buffer buffer))) |
18129 | 4050 |
19078 | 4051 (defun viper-switch-to-buffer-other-window () |
18129 | 4052 "Switch to buffer in another window." |
4053 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4054 (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
|
4055 buffer) |
18129 | 4056 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4057 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4058 "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
|
4059 (switch-to-buffer-other-window buffer))) |
18129 | 4060 |
19078 | 4061 (defun viper-kill-buffer () |
18129 | 4062 "Kill a buffer." |
4063 (interactive) | |
4064 (let (buffer buffer-name) | |
4065 (setq buffer-name | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4066 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4067 (format "Kill buffer \(%s\): " |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4068 (buffer-name (current-buffer))))) |
18129 | 4069 (setq buffer |
4070 (if (null buffer-name) | |
4071 (current-buffer) | |
4072 (get-buffer buffer-name))) | |
4073 (if (null buffer) (error "`%s': No such buffer" buffer-name)) | |
4074 (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
|
4075 (y-or-n-p |
18129 | 4076 (format |
4077 "Buffer `%s' is modified, are you sure you want to kill it? " | |
4078 buffer-name))) | |
4079 (kill-buffer buffer) | |
4080 (error "Buffer not killed")))) | |
4081 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4082 |
18129 | 4083 |
4084 ;; yank and pop | |
4085 | |
19078 | 4086 (defsubst viper-yank (text) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4087 "Yank TEXT silently. This works correctly with Emacs's yank-pop command." |
18129 | 4088 (insert text) |
4089 (setq this-command 'yank)) | |
4090 | |
19078 | 4091 (defun viper-put-back (arg) |
18129 | 4092 "Put back after point/below line." |
4093 (interactive "P") | |
19078 | 4094 (let ((val (viper-p-val arg)) |
4095 (text (if viper-use-register | |
4096 (cond ((viper-valid-register viper-use-register '(digit)) | |
4097 (current-kill | |
4098 (- viper-use-register ?1) 'do-not-rotate)) | |
4099 ((viper-valid-register viper-use-register) | |
4100 (get-register (downcase viper-use-register))) | |
4101 (t (error viper-InvalidRegister viper-use-register))) | |
21940 | 4102 (current-kill 0))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4103 sv-point chars-inserted lines-inserted) |
18129 | 4104 (if (null text) |
19078 | 4105 (if viper-use-register |
4106 (let ((reg viper-use-register)) | |
4107 (setq viper-use-register nil) | |
4108 (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
|
4109 (error "Viper bell"))) |
19078 | 4110 (setq viper-use-register nil) |
4111 (if (viper-end-with-a-newline-p text) | |
18129 | 4112 (progn |
4113 (end-of-line) | |
4114 (if (eobp) | |
4115 (insert "\n") | |
4116 (forward-line 1)) | |
4117 (beginning-of-line)) | |
19078 | 4118 (if (not (eolp)) (viper-forward-char-carefully))) |
4119 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
4120 (viper-set-destructive-command | |
4121 (list 'viper-put-back val nil viper-use-register nil nil)) | |
21940 | 4122 (setq sv-point (point)) |
4123 (viper-loop val (viper-yank text)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4124 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4125 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4126 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4127 (> 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
|
4128 (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
|
4129 (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
|
4130 chars-inserted lines-inserted)))) |
18129 | 4131 ;; 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
|
4132 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4133 ;; a newline |
19078 | 4134 (if (viper-same-line (point) (mark)) |
4135 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4136 (exchange-point-and-mark) |
4137 (if (bolp) | |
4138 (back-to-indentation))) | |
19078 | 4139 (viper-deactivate-mark)) |
4140 | |
4141 (defun viper-Put-back (arg) | |
18129 | 4142 "Put back at point/above line." |
4143 (interactive "P") | |
19078 | 4144 (let ((val (viper-p-val arg)) |
4145 (text (if viper-use-register | |
4146 (cond ((viper-valid-register viper-use-register '(digit)) | |
4147 (current-kill | |
4148 (- viper-use-register ?1) 'do-not-rotate)) | |
4149 ((viper-valid-register viper-use-register) | |
4150 (get-register (downcase viper-use-register))) | |
4151 (t (error viper-InvalidRegister viper-use-register))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4152 (current-kill 0))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4153 sv-point chars-inserted lines-inserted) |
18129 | 4154 (if (null text) |
19078 | 4155 (if viper-use-register |
4156 (let ((reg viper-use-register)) | |
4157 (setq viper-use-register nil) | |
4158 (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
|
4159 (error "Viper bell"))) |
19078 | 4160 (setq viper-use-register nil) |
4161 (if (viper-end-with-a-newline-p text) (beginning-of-line)) | |
4162 (viper-set-destructive-command | |
4163 (list 'viper-Put-back val nil viper-use-register nil nil)) | |
4164 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4165 (setq sv-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4166 (viper-loop val (viper-yank text)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4167 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4168 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4169 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4170 (> 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
|
4171 (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
|
4172 (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
|
4173 chars-inserted lines-inserted)))) |
18129 | 4174 ;; 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
|
4175 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4176 ;; a newline |
19078 | 4177 (if (viper-same-line (point) (mark)) |
4178 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4179 (exchange-point-and-mark) |
4180 (if (bolp) | |
4181 (back-to-indentation))) | |
19078 | 4182 (viper-deactivate-mark)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4183 |
18129 | 4184 |
4185 ;; Copy region to kill-ring. | |
4186 ;; If BEG and END do not belong to the same buffer, copy empty region. | |
19078 | 4187 (defun viper-copy-region-as-kill (beg end) |
18129 | 4188 (condition-case nil |
4189 (copy-region-as-kill beg end) | |
4190 (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
|
4191 |
18129 | 4192 |
19078 | 4193 (defun viper-delete-char (arg) |
19462 | 4194 "Delete next character." |
18129 | 4195 (interactive "P") |
19462 | 4196 (let ((val (viper-p-val arg)) |
4197 end-del-pos) | |
19078 | 4198 (viper-set-destructive-command |
4199 (list 'viper-delete-char val nil nil nil nil)) | |
19462 | 4200 (if (and viper-ex-style-editing |
4201 (> val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
4202 (setq val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
19078 | 4203 (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
|
4204 (if (bolp) (error "Viper bell") (setq val 0))) ; not bol---simply back 1 ch |
19462 | 4205 (save-excursion |
4206 (viper-forward-char-carefully val) | |
4207 (setq end-del-pos (point))) | |
19078 | 4208 (if viper-use-register |
18129 | 4209 (progn |
19078 | 4210 (cond ((viper-valid-register viper-use-register '((Letter))) |
4211 (viper-append-to-register | |
19462 | 4212 (downcase viper-use-register) (point) end-del-pos)) |
19078 | 4213 ((viper-valid-register viper-use-register) |
18129 | 4214 (copy-to-register |
19462 | 4215 viper-use-register (point) end-del-pos nil)) |
19078 | 4216 (t (error viper-InvalidRegister viper-use-register))) |
4217 (setq viper-use-register nil))) | |
19462 | 4218 |
4219 (delete-char val t) | |
19078 | 4220 (if viper-ex-style-motion |
19462 | 4221 (if (and (eolp) (not (bolp))) (backward-char 1))) |
4222 )) | |
18129 | 4223 |
19078 | 4224 (defun viper-delete-backward-char (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4225 "Delete previous character. On reaching beginning of line, stop and beep." |
18129 | 4226 (interactive "P") |
19462 | 4227 (let ((val (viper-p-val arg)) |
4228 end-del-pos) | |
19078 | 4229 (viper-set-destructive-command |
4230 (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
|
4231 (if (and |
19462 | 4232 viper-ex-style-editing |
4233 (> val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4234 (setq val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4235 (save-excursion | |
4236 (viper-backward-char-carefully val) | |
4237 (setq end-del-pos (point))) | |
19078 | 4238 (if viper-use-register |
18129 | 4239 (progn |
19078 | 4240 (cond ((viper-valid-register viper-use-register '(Letter)) |
4241 (viper-append-to-register | |
19462 | 4242 (downcase viper-use-register) end-del-pos (point))) |
19078 | 4243 ((viper-valid-register viper-use-register) |
18129 | 4244 (copy-to-register |
19462 | 4245 viper-use-register end-del-pos (point) nil)) |
19078 | 4246 (t (error viper-InvalidRegister viper-use-register))) |
4247 (setq viper-use-register nil))) | |
19462 | 4248 (if (and (bolp) viper-ex-style-editing) |
4249 (ding)) | |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4250 (delete-char (- val) t))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4251 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4252 |
19078 | 4253 (defun viper-del-backward-char-in-insert () |
18129 | 4254 "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
|
4255 (interactive) |
19462 | 4256 (if (and viper-ex-style-editing (bolp)) |
18129 | 4257 (beep 1) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4258 ;; don't put on kill ring |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4259 (delete-char -1 nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4260 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4261 |
19078 | 4262 (defun viper-del-backward-char-in-replace () |
18129 | 4263 "Delete one character in replace mode. |
19078 | 4264 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
4265 characters. If it is nil, then the cursor just moves backwards, similarly |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4266 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
18129 | 4267 cursor move past the beginning of line." |
4268 (interactive) | |
19078 | 4269 (cond (viper-delete-backwards-in-replace |
18129 | 4270 (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
|
4271 ;; don't put on kill ring |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4272 (delete-char -1 nil)) |
19462 | 4273 (viper-ex-style-editing |
18129 | 4274 (beep 1)) |
4275 ((bobp) | |
4276 (beep 1)) | |
4277 (t | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4278 ;; don't put on kill ring |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4279 (delete-char -1 nil)))) |
19462 | 4280 (viper-ex-style-editing |
18129 | 4281 (if (bolp) |
4282 (beep 1) | |
4283 (backward-char 1))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4284 (t |
18129 | 4285 (backward-char 1)))) |
4286 | |
4287 | |
4288 | |
4289 ;; join lines. | |
4290 | |
19078 | 4291 (defun viper-join-lines (arg) |
18129 | 4292 "Join this line to next, if ARG is nil. Otherwise, join ARG lines." |
4293 (interactive "*P") | |
19078 | 4294 (let ((val (viper-P-val arg))) |
4295 (viper-set-destructive-command | |
4296 (list 'viper-join-lines val nil nil nil nil)) | |
4297 (viper-loop (if (null val) 1 (1- val)) | |
18129 | 4298 (end-of-line) |
4299 (if (not (eobp)) | |
4300 (progn | |
4301 (forward-line 1) | |
4302 (delete-region (point) (1- (point))) | |
18839 | 4303 (fixup-whitespace) |
4304 ;; fixup-whitespace sometimes does not leave space | |
4305 ;; between objects, so we insert it as in Vi | |
4306 (or (looking-at " ") | |
4307 (insert " ") | |
4308 (backward-char 1)) | |
19462 | 4309 ))))) |
18129 | 4310 |
4311 | |
4312 ;; Replace state | |
4313 | |
19078 | 4314 (defun viper-change (beg end) |
18129 | 4315 (if (markerp beg) (setq beg (marker-position beg))) |
4316 (if (markerp end) (setq end (marker-position end))) | |
4317 ;; beg is sometimes (mark t), which may be nil | |
4318 (or beg (setq beg end)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4319 |
19078 | 4320 (viper-set-complex-command-for-undo) |
4321 (if viper-use-register | |
18129 | 4322 (progn |
19078 | 4323 (copy-to-register viper-use-register beg end nil) |
4324 (setq viper-use-register nil))) | |
4325 (viper-set-replace-overlay beg end) | |
18129 | 4326 (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
|
4327 |
19078 | 4328 (if (= (viper-replace-start) (point-max)) |
18129 | 4329 (error "End of buffer")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4330 |
19078 | 4331 (setq viper-last-replace-region |
4332 (buffer-substring (viper-replace-start) | |
4333 (viper-replace-end))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4334 |
18129 | 4335 ;; protect against error while inserting "@" and other disasters |
4336 ;; (e.g., read-only buff) | |
4337 (condition-case conds | |
19078 | 4338 (if (or viper-allow-multiline-replace-regions |
4339 (viper-same-line (viper-replace-start) | |
19203 | 4340 (viper-replace-end))) |
18129 | 4341 (progn |
4342 ;; tabs cause problems in replace, so untabify | |
19078 | 4343 (goto-char (viper-replace-end)) |
18129 | 4344 (insert-before-markers "@") ; put placeholder after the TAB |
19078 | 4345 (untabify (viper-replace-start) (point)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4346 ;; del @, don't put on kill ring |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4347 (delete-char -1) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4348 |
19078 | 4349 (viper-set-replace-overlay-glyphs |
4350 viper-replace-region-start-delimiter | |
4351 viper-replace-region-end-delimiter) | |
18129 | 4352 ;; 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
|
4353 ;; has to be shifted because of insert. We can't simply insert |
18129 | 4354 ;; "$" before-markers because then overlay-start will shift the |
4355 ;; 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
|
4356 ;; character. This fixes the bug with `s' and `cl' commands. |
19078 | 4357 (viper-move-replace-overlay (viper-replace-start) (point)) |
4358 (goto-char (viper-replace-start)) | |
4359 (viper-change-state-to-replace t)) | |
4360 (kill-region (viper-replace-start) | |
4361 (viper-replace-end)) | |
4362 (viper-hide-replace-overlay) | |
4363 (viper-change-state-to-insert)) | |
18129 | 4364 (error ;; make sure that the overlay doesn't stay. |
4365 ;; go back to the original point | |
19078 | 4366 (goto-char (viper-replace-start)) |
4367 (viper-hide-replace-overlay) | |
4368 (viper-message-conditions conds)))) | |
4369 | |
4370 | |
4371 (defun viper-change-subr (beg end) | |
18129 | 4372 ;; beg is sometimes (mark t), which may be nil |
4373 (or beg (setq beg end)) | |
19078 | 4374 (if viper-use-register |
18129 | 4375 (progn |
19078 | 4376 (copy-to-register viper-use-register beg end nil) |
4377 (setq viper-use-register nil))) | |
18129 | 4378 (kill-region beg end) |
19078 | 4379 (setq this-command 'viper-change) |
4380 (viper-yank-last-insertion)) | |
4381 | |
4382 (defun viper-toggle-case (arg) | |
18129 | 4383 "Toggle character case." |
4384 (interactive "P") | |
19078 | 4385 (let ((val (viper-p-val arg)) (c)) |
4386 (viper-set-destructive-command | |
4387 (list 'viper-toggle-case val nil nil nil nil)) | |
18129 | 4388 (while (> val 0) |
4389 (setq c (following-char)) | |
4390 (delete-char 1 nil) | |
4391 (if (eq c (upcase c)) | |
4392 (insert-char (downcase c) 1) | |
4393 (insert-char (upcase c) 1)) | |
4394 (if (eolp) (backward-char 1)) | |
4395 (setq val (1- val))))) | |
4396 | |
4397 | |
4398 ;; query replace | |
4399 | |
19078 | 4400 (defun viper-query-replace () |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4401 "Query replace. |
18129 | 4402 If a null string is suplied as the string to be replaced, |
4403 the query replace mode will toggle between string replace | |
4404 and regexp replace." | |
4405 (interactive) | |
4406 (let (str) | |
19078 | 4407 (setq str (viper-read-string-with-history |
4408 (if viper-re-query-replace "Query replace regexp: " | |
18129 | 4409 "Query replace: ") |
4410 nil ; no initial | |
19078 | 4411 'viper-replace1-history |
4412 (car viper-replace1-history) ; default | |
18129 | 4413 )) |
4414 (if (string= str "") | |
4415 (progn | |
19078 | 4416 (setq viper-re-query-replace (not viper-re-query-replace)) |
18129 | 4417 (message "Query replace mode changed to %s" |
19078 | 4418 (if viper-re-query-replace "regexp replace" |
18129 | 4419 "string replace"))) |
19078 | 4420 (if viper-re-query-replace |
18129 | 4421 (query-replace-regexp |
4422 str | |
19078 | 4423 (viper-read-string-with-history |
18129 | 4424 (format "Query replace regexp `%s' with: " str) |
4425 nil ; no initial | |
19078 | 4426 'viper-replace1-history |
4427 (car viper-replace1-history) ; default | |
18129 | 4428 )) |
4429 (query-replace | |
4430 str | |
19078 | 4431 (viper-read-string-with-history |
18129 | 4432 (format "Query replace `%s' with: " str) |
4433 nil ; no initial | |
19078 | 4434 'viper-replace1-history |
4435 (car viper-replace1-history) ; default | |
18129 | 4436 )))))) |
4437 | |
4438 | |
4439 ;; marking | |
4440 | |
19078 | 4441 (defun viper-mark-beginning-of-buffer () |
18129 | 4442 "Mark beginning of buffer." |
4443 (interactive) | |
4444 (push-mark (point)) | |
4445 (goto-char (point-min)) | |
4446 (exchange-point-and-mark) | |
4447 (message "Mark set at the beginning of buffer")) | |
4448 | |
19078 | 4449 (defun viper-mark-end-of-buffer () |
18129 | 4450 "Mark end of buffer." |
4451 (interactive) | |
4452 (push-mark (point)) | |
4453 (goto-char (point-max)) | |
4454 (exchange-point-and-mark) | |
4455 (message "Mark set at the end of buffer")) | |
4456 | |
19078 | 4457 (defun viper-mark-point () |
18129 | 4458 "Set mark at point of buffer." |
4459 (interactive) | |
4460 (let ((char (read-char))) | |
4461 (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
|
4462 (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
|
4463 ((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
|
4464 ((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
|
4465 ((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
|
4466 ((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
|
4467 ((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
|
4468 ((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
|
4469 (t (error "Viper bell")) |
18129 | 4470 ))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4471 |
18129 | 4472 ;; Algorithm: If first invocation of this command save mark on ring, goto |
4473 ;; mark, M0, and pop the most recent elt from the mark ring into mark, | |
4474 ;; making it into the new mark, M1. | |
4475 ;; Push this mark back and set mark to the original point position, p1. | |
4476 ;; So, if you hit '' or `` then you can return to p1. | |
4477 ;; | |
4478 ;; 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
|
4479 ;; jump there. This forgets the position, p1, and puts M1 back into mark. |
18129 | 4480 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from |
4481 ;; the ring into mark. Push M2 back on the ring and set mark to M0. | |
4482 ;; etc. | |
19078 | 4483 (defun viper-cycle-through-mark-ring () |
18129 | 4484 "Visit previous locations on the mark ring. |
4485 One can use `` and '' to temporarily jump 1 step back." | |
4486 (let* ((sv-pt (point))) | |
4487 ;; if repeated `m,' command, pop the previously saved mark. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4488 ;; 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
|
4489 ;; user types `` or '' and is discarded |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4490 ;; from the mark ring by the next `m,' command. |
18129 | 4491 ;; In any case, go to the previous or previously saved mark. |
4492 ;; 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
|
4493 ;; point to be the mark. Current pt as mark is discarded by the next |
18129 | 4494 ;; m, command. |
19078 | 4495 (if (eq last-command 'viper-cycle-through-mark-ring) |
18129 | 4496 () |
4497 ;; save current mark if the first iteration | |
19078 | 4498 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4499 (if (mark t) |
4500 (push-mark (mark t) t)) ) | |
4501 (pop-mark) | |
4502 (set-mark-command 1) | |
4503 ;; don't duplicate mark on the ring | |
19078 | 4504 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4505 (push-mark sv-pt t) |
19078 | 4506 (viper-deactivate-mark) |
4507 (setq this-command 'viper-cycle-through-mark-ring) | |
18129 | 4508 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4509 |
18129 | 4510 |
19078 | 4511 (defun viper-goto-mark (arg) |
18129 | 4512 "Go to mark." |
4513 (interactive "P") | |
4514 (let ((char (read-char)) | |
19078 | 4515 (com (viper-getcom arg))) |
4516 (viper-goto-mark-subr char com nil))) | |
4517 | |
4518 (defun viper-goto-mark-and-skip-white (arg) | |
18129 | 4519 "Go to mark and skip to first non-white character on line." |
4520 (interactive "P") | |
4521 (let ((char (read-char)) | |
19078 | 4522 (com (viper-getCom arg))) |
4523 (viper-goto-mark-subr char com t))) | |
4524 | |
4525 (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
|
4526 (if (eobp) |
18129 | 4527 (if (bobp) |
4528 (error "Empty buffer") | |
4529 (backward-char 1))) | |
19078 | 4530 (cond ((viper-valid-register char '(letter)) |
18129 | 4531 (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
|
4532 (reg (viper-int-to-char (1+ (- char ?a)))) |
18129 | 4533 (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
|
4534 ;; 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
|
4535 ;; 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
|
4536 (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
|
4537 (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
|
4538 (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
|
4539 (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
|
4540 (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
|
4541 (save-excursion |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4542 (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
|
4543 (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
|
4544 (<= (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
|
4545 (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
|
4546 (set-register reg text-marker)))) |
19078 | 4547 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4548 (if (not (viper-valid-marker text-marker)) | |
4549 (error viper-EmptyTextmarker char)) | |
4550 (if (and (viper-same-line (point) viper-last-jump) | |
4551 (= (point) viper-last-jump-ignore)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4552 (push-mark viper-last-jump t) |
18129 | 4553 (push-mark nil t)) ; no msg |
19078 | 4554 (viper-register-to-point reg) |
4555 (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
|
4556 (cond (skip-white |
18129 | 4557 (back-to-indentation) |
19078 | 4558 (setq viper-last-jump-ignore (point)))) |
18129 | 4559 (if com |
4560 (if (equal buff (current-buffer)) | |
19078 | 4561 (viper-execute-com (if skip-white |
4562 'viper-goto-mark-and-skip-white | |
4563 'viper-goto-mark) | |
18129 | 4564 nil com) |
4565 (switch-to-buffer buff) | |
19078 | 4566 (goto-char viper-com-point) |
4567 (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
|
4568 (error "Viper bell"))))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4569 ((and (not skip-white) (viper= char ?`)) |
19078 | 4570 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4571 (if (and (viper-same-line (point) viper-last-jump) | |
4572 (= (point) viper-last-jump-ignore)) | |
4573 (goto-char viper-last-jump)) | |
18129 | 4574 (if (null (mark t)) (error "Mark is not set in this buffer")) |
4575 (if (= (point) (mark t)) (pop-mark)) | |
4576 (exchange-point-and-mark) | |
19078 | 4577 (setq viper-last-jump (point-marker) |
4578 viper-last-jump-ignore 0) | |
4579 (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
|
4580 ((and skip-white (viper= char ?')) |
19078 | 4581 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4582 (if (and (viper-same-line (point) viper-last-jump) | |
4583 (= (point) viper-last-jump-ignore)) | |
4584 (goto-char viper-last-jump)) | |
18129 | 4585 (if (= (point) (mark t)) (pop-mark)) |
4586 (exchange-point-and-mark) | |
19078 | 4587 (setq viper-last-jump (point)) |
18129 | 4588 (back-to-indentation) |
19078 | 4589 (setq viper-last-jump-ignore (point)) |
4590 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com))) | |
4591 (t (error viper-InvalidTextmarker char)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4592 |
19078 | 4593 (defun viper-insert-tab () |
18129 | 4594 (interactive) |
4595 (insert-tab)) | |
4596 | |
19078 | 4597 (defun viper-exchange-point-and-mark () |
18129 | 4598 (interactive) |
4599 (exchange-point-and-mark) | |
4600 (back-to-indentation)) | |
4601 | |
4602 ;; Input Mode Indentation | |
4603 | |
4604 ;; Returns t, if the string before point matches the regexp STR. | |
19078 | 4605 (defsubst viper-looking-back (str) |
18129 | 4606 (and (save-excursion (re-search-backward str nil t)) |
4607 (= (point) (match-end 0)))) | |
4608 | |
4609 | |
19078 | 4610 (defun viper-forward-indent () |
18129 | 4611 "Indent forward -- `C-t' in Vi." |
4612 (interactive) | |
19078 | 4613 (setq viper-cted t) |
4614 (indent-to (+ (current-column) viper-shift-width))) | |
4615 | |
4616 (defun viper-backward-indent () | |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
4617 "Backtab, `C-d' in Vi." |
18129 | 4618 (interactive) |
19078 | 4619 (if viper-cted |
18129 | 4620 (let ((p (point)) (c (current-column)) bol (indent t)) |
19078 | 4621 (if (viper-looking-back "[0^]") |
18129 | 4622 (progn |
4623 (if (eq ?^ (preceding-char)) | |
19078 | 4624 (setq viper-preserve-indent t)) |
109106
5e3accd3ae49
Replace delete-backward-char Lisp calls in Viper (Bug#6552).
Chong Yidong <cyd@stupidchicken.com>
parents:
106895
diff
changeset
|
4625 (delete-char -1) |
18129 | 4626 (setq p (point)) |
4627 (setq indent nil))) | |
4628 (save-excursion | |
4629 (beginning-of-line) | |
4630 (setq bol (point))) | |
4631 (if (re-search-backward "[^ \t]" bol 1) (forward-char)) | |
4632 (delete-region (point) p) | |
4633 (if indent | |
19078 | 4634 (indent-to (- c viper-shift-width))) |
4635 (if (or (bolp) (viper-looking-back "[^ \t]")) | |
4636 (setq viper-cted nil))))) | |
4637 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4638 ;; 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
|
4639 (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
|
4640 (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
|
4641 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4642 (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
|
4643 (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
|
4644 (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
|
4645 text-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4646 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
|
4647 (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
|
4648 (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
|
4649 |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4650 |
19078 | 4651 (defun viper-autoindent () |
18129 | 4652 "Auto Indentation, Vi-style." |
4653 (interactive) | |
4654 (let ((col (current-indentation))) | |
4655 (if abbrev-mode (expand-abbrev)) | |
19078 | 4656 (if viper-preserve-indent |
4657 (setq viper-preserve-indent nil) | |
4658 (setq viper-current-indent col)) | |
18129 | 4659 ;; don't leave whitespace lines around |
4660 (if (memq last-command | |
19078 | 4661 '(viper-autoindent |
4662 viper-open-line viper-Open-line | |
4663 viper-replace-state-exit-cmd)) | |
18129 | 4664 (indent-to-left-margin)) |
4665 ;; use \n instead of newline, or else <Return> will move the insert point | |
4666 ;;(newline 1) | |
4667 (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
|
4668 (viper-indent-line viper-current-indent) |
18129 | 4669 )) |
4670 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4671 |
18129 | 4672 ;; Viewing registers |
4673 | |
19078 | 4674 (defun viper-ket-function (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4675 "Function called by \], the ket. View registers and call \]\]." |
18129 | 4676 (interactive "P") |
4677 (let ((reg (read-char))) | |
19078 | 4678 (cond ((viper-valid-register reg '(letter Letter)) |
18129 | 4679 (view-register (downcase reg))) |
19078 | 4680 ((viper-valid-register reg '(digit)) |
18129 | 4681 (let ((text (current-kill (- reg ?1) 'do-not-rotate))) |
20003 | 4682 (with-output-to-temp-buffer " *viper-info*" |
4683 (princ (format "Register %c contains the string:\n" reg)) | |
4684 (princ text)) | |
4685 )) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4686 ((viper= ?\] reg) |
19078 | 4687 (viper-next-heading arg)) |
18129 | 4688 (t (error |
19078 | 4689 viper-InvalidRegister reg))))) |
4690 | |
4691 (defun viper-brac-function (arg) | |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
4692 "Function called by \[, the brac. View textmarkers and call \[\[." |
18129 | 4693 (interactive "P") |
4694 (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
|
4695 (cond ((viper= ?\[ reg) |
19078 | 4696 (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
|
4697 ((viper= ?\] reg) |
19078 | 4698 (viper-heading-end arg)) |
4699 ((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
|
4700 (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a))))) |
20003 | 4701 (buf (if (not (markerp val)) |
19078 | 4702 (error viper-EmptyTextmarker reg) |
18129 | 4703 (marker-buffer val))) |
4704 (pos (marker-position val)) | |
4705 line-no text (s pos) (e pos)) | |
20003 | 4706 (with-output-to-temp-buffer " *viper-info*" |
18129 | 4707 (if (and buf pos) |
4708 (progn | |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
4709 (with-current-buffer buf |
18129 | 4710 (setq line-no (1+ (count-lines (point-min) val))) |
4711 (goto-char pos) | |
4712 (beginning-of-line) | |
4713 (if (re-search-backward "[^ \t]" nil t) | |
4714 (progn | |
4715 (beginning-of-line) | |
4716 (setq s (point)))) | |
4717 (goto-char pos) | |
4718 (forward-line 1) | |
4719 (if (re-search-forward "[^ \t]" nil t) | |
4720 (progn | |
4721 (end-of-line) | |
4722 (setq e (point)))) | |
4723 (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
|
4724 (setq text (format "%s<%c>%s" |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4725 (substring text 0 (- pos s)) |
18129 | 4726 reg (substring text (- pos s))))) |
20003 | 4727 (princ |
18129 | 4728 (format |
4729 "Textmarker `%c' is in buffer `%s' at line %d.\n" | |
4730 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
|
4731 (princ (format "Here is some text around %c:\n\n %s" |
18129 | 4732 reg text))) |
20003 | 4733 (princ (format viper-EmptyTextmarker reg)))) |
4734 )) | |
19078 | 4735 (t (error viper-InvalidTextmarker reg))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4736 |
18129 | 4737 |
4738 | |
19078 | 4739 (defun viper-delete-backward-word (arg) |
18129 | 4740 "Delete previous word." |
4741 (interactive "p") | |
4742 (save-excursion | |
4743 (push-mark nil t) | |
4744 (backward-word arg) | |
4745 (delete-region (point) (mark t)) | |
4746 (pop-mark))) | |
4747 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4748 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4749 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4750 ;; 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
|
4751 ;; 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
|
4752 ;; 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
|
4753 (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
|
4754 (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
|
4755 (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
|
4756 (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
|
4757 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4758 |
18129 | 4759 |
18839 | 4760 (defun viper-set-expert-level (&optional dont-change-unless) |
18129 | 4761 "Sets the expert level for a Viper user. |
4762 Can be called interactively to change (temporarily or permanently) the | |
4763 current expert level. | |
4764 | |
18289 | 4765 The optional argument DONT-CHANGE-UNLESS, if not nil, says that |
18129 | 4766 the level should not be changed, unless its current value is |
4767 meaningless (i.e., not one of 1,2,3,4,5). | |
4768 | |
4769 User level determines the setting of Viper variables that are most | |
4770 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
|
4771 |
18129 | 4772 (interactive) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4773 |
18839 | 4774 (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
|
4775 |
18129 | 4776 (save-window-excursion |
4777 (delete-other-windows) | |
18839 | 4778 ;; if 0 < viper-expert-level < viper-max-expert-level |
18129 | 4779 ;; & dont-change-unless = t -- use it; else ask |
19078 | 4780 (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
|
4781 |
19078 | 4782 (setq viper-always t |
4783 viper-ex-style-motion t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4784 viper-ex-style-editing t |
19078 | 4785 viper-want-ctl-h-help nil) |
18129 | 4786 |
18839 | 4787 (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
|
4788 (global-set-key ; in emacs-state |
19078 | 4789 viper-toggle-key |
4790 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | |
4791 (setq viper-no-multiple-ESC t | |
4792 viper-re-search t | |
4793 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
|
4794 viper-search-wrap-around t |
19078 | 4795 viper-electric-mode nil |
4796 viper-want-emacs-keys-in-vi nil | |
4797 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
|
4798 |
18839 | 4799 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |
18129 | 4800 ;; intermediate to guru |
19078 | 4801 (setq viper-no-multiple-ESC (if (viper-window-display-p) |
4802 t 'twice) | |
4803 viper-electric-mode t | |
4804 viper-want-emacs-keys-in-vi t | |
4805 viper-want-emacs-keys-in-insert (> viper-expert-level 2)) | |
4806 | |
4807 (if (eq viper-expert-level 4) ; respect user's ex-style motion | |
4808 ; and viper-no-multiple-ESC | |
18129 | 4809 (progn |
18839 | 4810 (setq-default |
19462 | 4811 viper-ex-style-editing |
4812 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4813 viper-ex-style-motion |
4814 (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
|
4815 (setq viper-ex-style-motion |
19078 | 4816 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4817 viper-ex-style-editing |
4818 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4819 viper-re-search |
4820 (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
|
4821 viper-no-multiple-ESC |
19078 | 4822 (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
|
4823 |
18129 | 4824 ;; A wizard!! |
4825 ;; Ideally, if 5 is selected, a buffer should pop up to let the | |
4826 ;; user toggle the values of variables. | |
19462 | 4827 (t (setq-default viper-ex-style-editing |
4828 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4829 viper-ex-style-motion |
4830 (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
|
4831 (setq viper-want-ctl-h-help |
19078 | 4832 (viper-standard-value 'viper-want-ctl-h-help) |
18289 | 4833 viper-always |
18839 | 4834 (viper-standard-value 'viper-always) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4835 viper-no-multiple-ESC |
19078 | 4836 (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
|
4837 viper-ex-style-motion |
19078 | 4838 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4839 viper-ex-style-editing |
4840 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4841 viper-re-search |
4842 (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
|
4843 viper-electric-mode |
19078 | 4844 (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
|
4845 viper-want-emacs-keys-in-vi |
19078 | 4846 (viper-standard-value 'viper-want-emacs-keys-in-vi) |
4847 viper-want-emacs-keys-in-insert | |
4848 (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
|
4849 |
19078 | 4850 (viper-set-mode-vars-for viper-current-state) |
18289 | 4851 (if (or viper-always |
18839 | 4852 (and (> viper-expert-level 0) (> 5 viper-expert-level))) |
19078 | 4853 (viper-set-hooks))) |
18129 | 4854 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4855 |
18129 | 4856 ;; Ask user expert level. |
19078 | 4857 (defun viper-ask-level (dont-change-unless) |
4858 (let ((ask-buffer " *viper-ask-level*") | |
18129 | 4859 level-changed repeated) |
4860 (save-window-excursion | |
4861 (switch-to-buffer ask-buffer) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4862 |
18839 | 4863 (while (or (> viper-expert-level viper-max-expert-level) |
4864 (< viper-expert-level 1) | |
18129 | 4865 (null dont-change-unless)) |
4866 (erase-buffer) | |
4867 (if repeated | |
4868 (progn | |
4869 (message "Invalid user level") | |
4870 (beep 1)) | |
4871 (setq repeated t)) | |
4872 (setq dont-change-unless t | |
4873 level-changed t) | |
4874 (insert " | |
4875 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
|
4876 \(and the VI Plan for Emacs Rescue). |
18839 | 4877 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
|
4878 |
18129 | 4879 1 -- BEGINNER: Almost all Emacs features are suppressed. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4880 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
|
4881 command history in the minibuffer are thrown in as a bonus. |
19078 | 4882 To use Emacs productively, you must reach level 3 or higher. |
18129 | 4883 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state, |
19078 | 4884 so most Emacs commands can be used when Viper is in Vi state. |
4885 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
|
4886 3 -- GRAND MASTER: Like 2, but most Emacs commands are available also |
19078 | 4887 in Viper's insert state. |
4888 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC, | |
19462 | 4889 viper-ex-style-motion, viper-ex-style-editing, and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4890 viper-re-search variables. Adjust these settings to your taste. |
18289 | 4891 5 -- WIZARD: Like 4, but user settings are also respected for viper-always, |
19078 | 4892 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
|
4893 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
|
4894 |
18129 | 4895 Please, specify your level now: ") |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4896 |
19078 | 4897 (setq viper-expert-level (- (viper-read-char-exclusive) ?0)) |
18129 | 4898 ) ; end while |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4899 |
18129 | 4900 ;; tell the user if level was changed |
4901 (and level-changed | |
4902 (progn | |
4903 (insert | |
4904 (format "\n\n\n\n\n\t\tYou have selected user level %d" | |
18839 | 4905 viper-expert-level)) |
18129 | 4906 (if (y-or-n-p "Do you wish to make this change permanent? ") |
18839 | 4907 ;; save the setting for viper-expert-level |
19078 | 4908 (viper-save-setting |
18839 | 4909 'viper-expert-level |
4910 (format "Saving user level %d ..." viper-expert-level) | |
19078 | 4911 viper-custom-file-name)) |
18129 | 4912 )) |
4913 (bury-buffer) ; remove ask-buffer from screen | |
4914 (message "") | |
4915 ))) | |
4916 | |
4917 | |
19078 | 4918 (defun viper-nil () |
18129 | 4919 (interactive) |
4920 (beep 1)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4921 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4922 |
18129 | 4923 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
19078 | 4924 (defun viper-register-to-point (char &optional enforce-buffer) |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
4925 "Like `jump-to-register', but switches to another buffer in another window." |
18129 | 4926 (interactive "cViper register to point: ") |
4927 (let ((val (get-register char))) | |
4928 (cond | |
4929 ((and (fboundp 'frame-configuration-p) | |
4930 (frame-configuration-p val)) | |
4931 (set-frame-configuration val)) | |
4932 ((window-configuration-p val) | |
4933 (set-window-configuration val)) | |
19078 | 4934 ((viper-valid-marker val) |
18129 | 4935 (if (and enforce-buffer |
4936 (not (equal (current-buffer) (marker-buffer val)))) | |
19078 | 4937 (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
|
4938 (viper-int-to-char (1- (+ char ?a))))) |
18129 | 4939 (pop-to-buffer (marker-buffer val)) |
4940 (goto-char val)) | |
4941 ((and (consp val) (eq (car val) 'file)) | |
4942 (find-file (cdr val))) | |
4943 (t | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4944 (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a)))))))) |
19078 | 4945 |
4946 | |
4947 (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
|
4948 "Save then kill current buffer." |
18129 | 4949 (interactive) |
18839 | 4950 (if (< viper-expert-level 2) |
18129 | 4951 (save-buffers-kill-emacs) |
4952 (save-buffer) | |
4953 (kill-buffer (current-buffer)))) | |
4954 | |
4955 | |
4956 | |
4957 ;;; Bug Report | |
4958 | |
19078 | 4959 (defun viper-submit-report () |
18129 | 4960 "Submit bug report on Viper." |
4961 (interactive) | |
4962 (let ((reporter-prompt-for-summary-p t) | |
19078 | 4963 (viper-device-type (viper-device-type)) |
18129 | 4964 color-display-p frame-parameters |
4965 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face | |
4966 varlist salutation window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4967 |
18129 | 4968 ;; If mode info is needed, add variable to `let' and then set it below, |
4969 ;; 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
|
4970 (setq color-display-p (if (viper-window-display-p) |
19078 | 4971 (viper-color-display-p) |
18129 | 4972 'non-x) |
19078 | 4973 minibuffer-vi-face (if (viper-has-face-support-p) |
4974 (viper-get-face viper-minibuffer-vi-face) | |
18129 | 4975 'non-x) |
19078 | 4976 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
|
4977 (viper-get-face |
19078 | 4978 viper-minibuffer-insert-face) |
18129 | 4979 'non-x) |
19078 | 4980 minibuffer-emacs-face (if (viper-has-face-support-p) |
4981 (viper-get-face | |
4982 viper-minibuffer-emacs-face) | |
18129 | 4983 'non-x) |
4984 frame-parameters (if (fboundp 'frame-parameters) | |
4985 (frame-parameters (selected-frame)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4986 |
19078 | 4987 (setq varlist (list 'viper-vi-minibuffer-minor-mode |
4988 'viper-insert-minibuffer-minor-mode | |
4989 'viper-vi-intercept-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4990 'viper-vi-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4991 'viper-vi-kbd-minor-mode |
19078 | 4992 'viper-vi-global-user-minor-mode |
4993 '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
|
4994 'viper-vi-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4995 'viper-vi-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4996 'viper-replace-minor-mode |
19078 | 4997 'viper-insert-intercept-minor-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4998 'viper-insert-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4999 'viper-insert-kbd-minor-mode |
19078 | 5000 'viper-insert-global-user-minor-mode |
5001 '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
|
5002 'viper-insert-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5003 'viper-insert-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5004 'viper-emacs-intercept-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5005 'viper-emacs-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5006 'viper-emacs-kbd-minor-mode |
19078 | 5007 'viper-emacs-global-user-minor-mode |
5008 'viper-emacs-state-modifier-minor-mode | |
5009 'viper-automatic-iso-accents | |
19462 | 5010 'viper-special-input-method |
19078 | 5011 'viper-want-emacs-keys-in-insert |
5012 'viper-want-emacs-keys-in-vi | |
5013 'viper-keep-point-on-undo | |
5014 'viper-no-multiple-ESC | |
5015 'viper-electric-mode | |
5016 'viper-ESC-key | |
5017 'viper-want-ctl-h-help | |
19462 | 5018 'viper-ex-style-editing |
19078 | 5019 'viper-delete-backwards-in-replace |
5020 'viper-vi-style-in-minibuffer | |
5021 'viper-vi-state-hook | |
5022 'viper-insert-state-hook | |
5023 'viper-replace-state-hook | |
5024 'viper-emacs-state-hook | |
18129 | 5025 'ex-cycle-other-window |
5026 'ex-cycle-through-non-files | |
18839 | 5027 'viper-expert-level |
18129 | 5028 'major-mode |
19078 | 5029 'viper-device-type |
18129 | 5030 'color-display-p |
5031 'frame-parameters | |
5032 'minibuffer-vi-face | |
5033 'minibuffer-insert-face | |
5034 'minibuffer-emacs-face | |
5035 )) | |
5036 (setq salutation " | |
5037 Congratulations! You may have unearthed a bug in Viper! | |
5038 Please mail a concise, accurate summary of the problem to the address above. | |
5039 | |
5040 -------------------------------------------------------------------") | |
5041 (setq window-config (current-window-configuration)) | |
19078 | 5042 (with-output-to-temp-buffer " *viper-info*" |
5043 (switch-to-buffer " *viper-info*") | |
18129 | 5044 (delete-other-windows) |
5045 (princ " | |
5046 PLEASE FOLLOW THESE PROCEDURES | |
5047 ------------------------------ | |
5048 | |
5049 Before reporting a bug, please verify that it is related to Viper, and is | |
106895
181539c8b6a4
Fix typos in docstrings, error messages, etc.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
5050 not caused by other packages you are using. |
18129 | 5051 |
5052 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
|
5053 problem. These warnings are normal and unavoidable. |
18129 | 5054 |
5055 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
|
5056 those advertised in the manual. Such `customization' is likely to crash |
18129 | 5057 Viper, as it would any other improperly customized Emacs package. |
5058 | |
5059 If you are reporting an error message received while executing one of the | |
5060 Viper commands, type: | |
5061 | |
5062 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
|
5063 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5064 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
|
5065 back trace of the execution that leads to the error. Please include this |
18129 | 5066 trace in your bug report. |
5067 | |
5068 If you believe that one of Viper's commands goes into an infinite loop | |
5069 \(e.g., Emacs freezes\), type: | |
5070 | |
5071 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
|
5072 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5073 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
|
5074 the current command. Include the resulting back trace in the bug report. |
18129 | 5075 |
5076 Mail anyway (y or n)? ") | |
5077 (if (y-or-n-p "Mail anyway? ") | |
5078 () | |
5079 (set-window-configuration window-config) | |
5080 (error "Bug report aborted"))) | |
5081 | |
5082 (require 'reporter) | |
5083 (set-window-configuration window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5084 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5085 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
19078 | 5086 (viper-version) |
18129 | 5087 varlist |
5088 nil 'delete-other-windows | |
5089 salutation) | |
5090 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5091 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5092 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
5093 |
18129 | 5094 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
5095 ;; 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
|
5096 ;;; viper-cmd.el ends here |