Mercurial > emacs
annotate lisp/emulation/viper-cmd.el @ 106132:57f23ca20a76
* window.el (display-buffer-mark-dedicated): New var.
(display-buffer): Obey it.
* minibuffer.el (minibuffer-completion-help): Use it.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 19 Nov 2009 22:05:40 +0000 |
parents | 328150f0cf76 |
children | a2ee981efbec |
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, |
100908 | 4 ;; 2005, 2006, 2007, 2008, 2009 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 )) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
482 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
483 ;; This var is not local in Emacs, so we make it local. It must be local |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
484 ;; because although the stack of minor modes can be the same for all buffers, |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
485 ;; the associated *keymaps* can be different. In Viper, |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
486 ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
487 ;; different keymaps for different buffers. Also, the keymaps associated |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
488 ;; with viper-vi/insert-state-modifier-minor-mode can be different. |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
489 ;; ***This is needed only in case emulation-mode-map-alists is not defined. |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
490 ;; In emacs with emulation-mode-map-alists, nothing needs to be done |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
491 (unless |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
492 (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
493 (set (make-local-variable 'minor-mode-map-alist) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
494 (viper-append-filter-alist |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
495 (append viper--intercept-key-maps viper--key-maps) |
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
496 minor-mode-map-alist))) |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
497 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
498 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
499 |
18129 | 500 |
501 ;; Viper mode-changing commands and utilities | |
502 | |
503 ;; Modifies mode-line-buffer-identification. | |
19078 | 504 (defun viper-refresh-mode-line () |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
505 (set (make-local-variable 'viper-mode-string) |
19078 | 506 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id) |
507 ((eq viper-current-state 'vi-state) viper-vi-state-id) | |
508 ((eq viper-current-state 'replace-state) viper-replace-state-id) | |
509 ((eq viper-current-state 'insert-state) viper-insert-state-id))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
510 |
18129 | 511 ;; Sets Viper mode string in global-mode-string |
512 (force-mode-line-update)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
513 |
18129 | 514 |
515 ;; Switch from Insert state to Vi state. | |
19078 | 516 (defun viper-exit-insert-state () |
18129 | 517 (interactive) |
19078 | 518 (viper-change-state-to-vi)) |
519 | |
520 (defun viper-set-mode-vars-for (state) | |
18129 | 521 "Sets Viper minor mode variables to put Viper's state STATE in effect." |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
522 |
18129 | 523 ;; Emacs state |
19078 | 524 (setq viper-vi-minibuffer-minor-mode nil |
525 viper-insert-minibuffer-minor-mode nil | |
526 viper-vi-intercept-minor-mode nil | |
527 viper-insert-intercept-minor-mode nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
528 |
19078 | 529 viper-vi-local-user-minor-mode nil |
530 viper-vi-kbd-minor-mode nil | |
531 viper-vi-global-user-minor-mode nil | |
532 viper-vi-state-modifier-minor-mode nil | |
533 viper-vi-diehard-minor-mode nil | |
534 viper-vi-basic-minor-mode nil | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
535 |
19078 | 536 viper-replace-minor-mode nil |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
537 |
19078 | 538 viper-insert-local-user-minor-mode nil |
539 viper-insert-kbd-minor-mode nil | |
540 viper-insert-global-user-minor-mode nil | |
541 viper-insert-state-modifier-minor-mode nil | |
542 viper-insert-diehard-minor-mode nil | |
543 viper-insert-basic-minor-mode nil | |
544 viper-emacs-intercept-minor-mode t | |
545 viper-emacs-local-user-minor-mode t | |
546 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
547 viper-emacs-global-user-minor-mode t | |
548 viper-emacs-state-modifier-minor-mode t | |
18129 | 549 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
550 |
18129 | 551 ;; Vi state |
552 (if (eq state 'vi-state) ; adjust for vi-state | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
553 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
554 viper-vi-intercept-minor-mode t |
19078 | 555 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer) |
556 viper-vi-local-user-minor-mode t | |
557 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
558 viper-vi-global-user-minor-mode t | |
559 viper-vi-state-modifier-minor-mode t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
560 ;; don't let the diehard keymap block command completion |
18129 | 561 ;; and other things in the minibuffer |
19078 | 562 viper-vi-diehard-minor-mode (not |
563 (or viper-want-emacs-keys-in-vi | |
564 (viper-is-in-minibuffer))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
565 viper-vi-basic-minor-mode t |
19078 | 566 viper-emacs-intercept-minor-mode nil |
567 viper-emacs-local-user-minor-mode nil | |
568 viper-emacs-kbd-minor-mode nil | |
569 viper-emacs-global-user-minor-mode nil | |
570 viper-emacs-state-modifier-minor-mode nil | |
18129 | 571 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
572 |
18129 | 573 ;; Insert and Replace states |
574 (if (member state '(insert-state replace-state)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
575 (setq |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
576 viper-insert-intercept-minor-mode t |
19078 | 577 viper-replace-minor-mode (eq state 'replace-state) |
578 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer) | |
579 viper-insert-local-user-minor-mode t | |
580 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer)) | |
581 viper-insert-global-user-minor-mode t | |
582 viper-insert-state-modifier-minor-mode t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
583 ;; don't let the diehard keymap block command completion |
18129 | 584 ;; and other things in the minibuffer |
19078 | 585 viper-insert-diehard-minor-mode (not |
586 (or | |
587 viper-want-emacs-keys-in-insert | |
588 (viper-is-in-minibuffer))) | |
589 viper-insert-basic-minor-mode t | |
590 viper-emacs-intercept-minor-mode nil | |
591 viper-emacs-local-user-minor-mode nil | |
592 viper-emacs-kbd-minor-mode nil | |
593 viper-emacs-global-user-minor-mode nil | |
594 viper-emacs-state-modifier-minor-mode nil | |
18129 | 595 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
596 |
18129 | 597 ;; minibuffer faces |
19078 | 598 (if (viper-has-face-support-p) |
599 (setq viper-minibuffer-current-face | |
600 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face) | |
601 ((eq state 'vi-state) viper-minibuffer-vi-face) | |
18129 | 602 ((memq state '(insert-state replace-state)) |
19078 | 603 viper-minibuffer-insert-face)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
604 |
19078 | 605 (if (viper-is-in-minibuffer) |
606 (viper-set-minibuffer-overlay)) | |
18129 | 607 ) |
608 | |
609 ;; This also takes care of the annoying incomplete lines in files. | |
610 ;; Also, this fixes `undo' to work vi-style for complex commands. | |
19078 | 611 (defun viper-change-state-to-vi () |
18129 | 612 "Change Viper state to Vi." |
613 (interactive) | |
19078 | 614 (if (and viper-first-time (not (viper-is-in-minibuffer))) |
18129 | 615 (viper-mode) |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
616 (if overwrite-mode (overwrite-mode -1)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
617 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
618 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
619 (viper-hide-replace-overlay) |
18129 | 620 (if abbrev-mode (expand-abbrev)) |
621 (if (and auto-fill-function (> (current-column) fill-column)) | |
622 (funcall auto-fill-function)) | |
623 ;; don't leave whitespace lines around | |
624 (if (and (memq last-command | |
19078 | 625 '(viper-autoindent |
626 viper-open-line viper-Open-line | |
627 viper-replace-state-exit-cmd)) | |
628 (viper-over-whitespace-line)) | |
18129 | 629 (indent-to-left-margin)) |
19078 | 630 (viper-add-newline-at-eob-if-necessary) |
19462 | 631 (viper-adjust-undo) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
632 |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
633 (if (eq viper-current-state 'emacs-state) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
634 (viper-restore-cursor-color 'after-emacs-mode) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
635 (viper-restore-cursor-color 'after-insert-mode)) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
636 |
19078 | 637 (viper-change-state 'vi-state) |
18129 | 638 |
19462 | 639 ;; Protect against user errors in hooks |
18129 | 640 (condition-case conds |
19078 | 641 (run-hooks 'viper-vi-state-hook) |
18129 | 642 (error |
19078 | 643 (viper-message-conditions conds))))) |
644 | |
645 (defun viper-change-state-to-insert () | |
18129 | 646 "Change Viper state to Insert." |
647 (interactive) | |
19078 | 648 (viper-change-state 'insert-state) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
649 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
650 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
651 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
652 (viper-hide-replace-overlay) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
653 |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
654 (let ((icolor (viper-frame-value viper-insert-state-cursor-color))) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
655 (or (stringp (viper-get-saved-cursor-color-in-insert-mode)) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
656 (string= (viper-get-cursor-color) icolor) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
657 (viper-save-cursor-color 'before-insert-mode)) |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
658 (viper-change-cursor-color icolor)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
659 |
19462 | 660 ;; Protect against user errors in hooks |
18129 | 661 (condition-case conds |
19078 | 662 (run-hooks 'viper-insert-state-hook) |
18129 | 663 (error |
19078 | 664 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
665 |
19078 | 666 (defsubst viper-downgrade-to-insert () |
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
667 ;; Protect against user errors in hooks |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
668 (condition-case conds |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
669 (run-hooks 'viper-insert-state-hook) |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
670 (error |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
671 (viper-message-conditions conds))) |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
672 (setq viper-current-state 'insert-state |
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33019
diff
changeset
|
673 viper-replace-minor-mode nil)) |
18129 | 674 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
675 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
676 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
677 ;; Change to replace state. When the end of replacement region is reached, |
18129 | 678 ;; replace state changes to insert state. |
19078 | 679 (defun viper-change-state-to-replace (&optional non-R-cmd) |
680 (viper-change-state 'replace-state) | |
18129 | 681 ;; Run insert-state-hook |
682 (condition-case conds | |
19078 | 683 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook) |
18129 | 684 (error |
19078 | 685 (viper-message-conditions conds))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
686 |
18129 | 687 (if non-R-cmd |
19078 | 688 (viper-start-replace) |
18129 | 689 ;; 'R' is implemented using Emacs's overwrite-mode |
19078 | 690 (viper-start-R-mode)) |
18129 | 691 ) |
692 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
693 |
19078 | 694 (defun viper-change-state-to-emacs () |
18129 | 695 "Change Viper state to Emacs." |
696 (interactive) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
697 (or (viper-overlay-p viper-replace-overlay) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
698 (viper-set-replace-overlay (point-min) (point-min))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
699 (viper-hide-replace-overlay) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
700 |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
701 (let ((ecolor (viper-frame-value viper-emacs-state-cursor-color))) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
702 (when ecolor |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
703 (or (stringp (viper-get-saved-cursor-color-in-emacs-mode)) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
704 (string= (viper-get-cursor-color) ecolor) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
705 (viper-save-cursor-color 'before-emacs-mode)) |
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
706 (viper-change-cursor-color ecolor))) |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
707 |
19078 | 708 (viper-change-state 'emacs-state) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
709 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68648
diff
changeset
|
710 ;; Protect against user errors in hooks |
18129 | 711 (condition-case conds |
19078 | 712 (run-hooks 'viper-emacs-state-hook) |
18129 | 713 (error |
19078 | 714 (viper-message-conditions conds)))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
715 |
18129 | 716 ;; escape to emacs mode termporarily |
19078 | 717 (defun viper-escape-to-emacs (arg &optional events) |
18129 | 718 "Escape to Emacs state from Vi state for one Emacs command. |
719 ARG is used as the prefix value for the executed command. If | |
720 EVENTS is a list of events, which become the beginning of the command." | |
721 (interactive "P") | |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
722 (if (viper= last-command-event ?\\) |
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) |
18129 | 894 "Execute FORM in Vi state, regardless of the Ccurrent Vi state." |
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. |
19078 | 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 |
942 LOAD-FILE is a name of the file where the specific minor mode is defined. | |
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 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
964 function keys such as up,down, etc. ESC will also will also work as |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
965 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions |
18129 | 966 as a Meta key and any number of multiple escapes is allowed." |
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 ?\ ))) | |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1184 (setq last-command-event (or com event-char)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1185 (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
|
1186 `(key-binding (char-to-string ,event-char)))) |
18129 | 1187 (funcall func prefix-arg) |
1188 (setq prefix-arg nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1189 ;; 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
|
1190 (viper-set-unread-command-events event-char)) |
18129 | 1191 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1192 |
18129 | 1193 |
1194 ;; Vi operator as prefix argument." | |
19078 | 1195 (defun viper-prefix-arg-com (char value com) |
18129 | 1196 (let ((cont t) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1197 cmd-info |
18958 | 1198 cmd-to-exec-at-end) |
18129 | 1199 (while (and cont |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1200 (viper-memq-char char |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1201 (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
|
1202 viper-buffer-search-char))) |
18129 | 1203 (if com |
1204 ;; this means that we already have a command character, so we | |
1205 ;; construct a com list and exit while. however, if char is " | |
1206 ;; it is an error. | |
1207 (progn | |
1208 ;; 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
|
1209 (if (viper-memq-char char '(?# ?\")) (error "Viper bell")) |
18129 | 1210 (setq com (cons char com)) |
1211 (setq cont nil)) | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1212 ;; 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
|
1213 ;; ", 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
|
1214 ;; 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
|
1215 ;; loop. |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1216 (cond ((viper-memq-char char '(?! ?=)) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1217 (setq com char) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1218 (setq char (read-char)) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1219 (setq cont nil)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1220 ((viper= char ?#) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1221 ;; 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
|
1222 (setq com (+ 128 (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1223 (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
|
1224 ((viper= char ?\") |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1225 (let ((reg (read-char))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1226 (if (viper-valid-register reg) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1227 (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
|
1228 (error "Viper bell")) |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1229 (setq char (read-char)))) |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1230 (t |
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1231 (setq com char) |
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 |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1234 (if (atom com) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1235 ;; `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
|
1236 ;; 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
|
1237 ;; 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
|
1238 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1239 (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
|
1240 (while (viper= char ?U) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1241 (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
|
1242 (setq char (read-char))) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1243 ;; `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
|
1244 ;; 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
|
1245 (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
|
1246 (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
|
1247 (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
|
1248 (viper= char ?!) ; bang command |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1249 (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
|
1250 (error "Viper bell")) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1251 (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
|
1252 (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
|
1253 `(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
|
1254 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1255 ;; 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
|
1256 (if (viper-memq-char (car com) '(?r ?R)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1257 ;; execute apropriate region command. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1258 (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
|
1259 (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
|
1260 (if (viper= char ?r) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1261 (viper-region prefix-arg) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1262 (viper-Region prefix-arg)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1263 ;; reset prefix-arg |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1264 (setq prefix-arg nil)) |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1265 ;; 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
|
1266 (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
|
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 (cond |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1269 ;; 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
|
1270 ;; 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
|
1271 ;; 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
|
1272 ;; 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
|
1273 ;; with nC. |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1274 ((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
|
1275 ((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
|
1276 ((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
|
1277 ((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
|
1278 ((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
|
1279 ((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
|
1280 ((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
|
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 ;; gg acts as G0 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1283 ((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
|
1284 (t (error "Viper bell"))))) |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1285 |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1286 (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
|
1287 (progn |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1288 (setq last-command-event |
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1289 (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
|
1290 (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
|
1291 (condition-case err |
73486
db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
72974
diff
changeset
|
1292 (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
|
1293 (error |
81331
c3779fe5830e
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75346
diff
changeset
|
1294 (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
|
1295 )) |
18129 | 1296 |
19078 | 1297 (defun viper-describe-arg (arg) |
18129 | 1298 (let (val com) |
19078 | 1299 (setq val (viper-P-val arg) |
1300 com (viper-getcom arg)) | |
18129 | 1301 (if (null val) |
1302 (if (null com) | |
1303 (message "Value is nil, and command is nil") | |
1304 (message "Value is nil, and command is `%c'" com)) | |
1305 (if (null com) | |
1306 (message "Value is `%d', and command is nil" val) | |
1307 (message "Value is `%d', and command is `%c'" val com))))) | |
1308 | |
19078 | 1309 (defun viper-digit-argument (arg) |
18129 | 1310 "Begin numeric argument for the next command." |
1311 (interactive "P") | |
19078 | 1312 (viper-leave-region-active) |
1313 (viper-prefix-arg-value | |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1314 last-command-event (if (consp arg) (cdr arg) nil))) |
18129 | 1315 |
19078 | 1316 (defun viper-command-argument (arg) |
18129 | 1317 "Accept a motion command as an argument." |
1318 (interactive "P") | |
19078 | 1319 (let ((viper-intermediate-command 'viper-command-argument)) |
18129 | 1320 (condition-case nil |
19078 | 1321 (viper-prefix-arg-com |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1322 last-command-event |
18129 | 1323 (cond ((null arg) nil) |
1324 ((consp arg) (car arg)) | |
1325 ((integerp arg) arg) | |
19078 | 1326 (t (error viper-InvalidCommandArgument))) |
18129 | 1327 (cond ((null arg) nil) |
1328 ((consp arg) (cdr arg)) | |
1329 ((integerp arg) nil) | |
19078 | 1330 (t (error viper-InvalidCommandArgument)))) |
1331 (quit (setq viper-use-register nil) | |
18129 | 1332 (signal 'quit nil))) |
19078 | 1333 (viper-deactivate-mark))) |
18129 | 1334 |
1335 | |
1336 ;; repeat last destructive command | |
1337 | |
1338 ;; Append region to text in register REG. | |
1339 ;; START and END are buffer positions indicating what to append. | |
19078 | 1340 (defsubst viper-append-to-register (reg start end) |
18129 | 1341 (set-register reg (concat (if (stringp (get-register reg)) |
1342 (get-register reg) "") | |
1343 (buffer-substring start end)))) | |
1344 | |
19078 | 1345 ;; Saves last inserted text for possible use by viper-repeat command. |
1346 (defun viper-save-last-insertion (beg end) | |
19756 | 1347 (condition-case nil |
1348 (setq viper-last-insertion (buffer-substring beg end)) | |
1349 (error | |
1350 ;; beg or end marker are somehow screwed up | |
1351 (setq viper-last-insertion nil))) | |
19078 | 1352 (setq viper-last-insertion (buffer-substring beg end)) |
1353 (or (< (length viper-d-com) 5) | |
1354 (setcar (nthcdr 4 viper-d-com) viper-last-insertion)) | |
1355 (or (null viper-command-ring) | |
1356 (ring-empty-p viper-command-ring) | |
18129 | 1357 (progn |
19078 | 1358 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring)) |
1359 viper-last-insertion) | |
18129 | 1360 ;; del most recent elt, if identical to the second most-recent |
19078 | 1361 (viper-cleanup-ring viper-command-ring))) |
18129 | 1362 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1363 |
19078 | 1364 (defsubst viper-yank-last-insertion () |
1365 "Inserts the text saved by the previous viper-save-last-insertion command." | |
18129 | 1366 (condition-case nil |
19078 | 1367 (insert viper-last-insertion) |
18129 | 1368 (error nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1369 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1370 |
18129 | 1371 ;; define functions to be executed |
1372 | |
1373 ;; invoked by the `C' command | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1374 (defun viper-exec-change (m-com com) |
19078 | 1375 (or (and (markerp viper-com-point) (marker-position viper-com-point)) |
1376 (set-marker viper-com-point (point) (current-buffer))) | |
18129 | 1377 ;; handle C cmd at the eol and at eob. |
19078 | 1378 (if (or (and (eolp) (= viper-com-point (point))) |
1379 (= viper-com-point (point-max))) | |
18129 | 1380 (progn |
1381 (insert " ")(backward-char 1))) | |
19078 | 1382 (if (= viper-com-point (point)) |
1383 (viper-forward-char-carefully)) | |
1384 (set-mark viper-com-point) | |
1385 (if (eq m-com 'viper-next-line-at-bol) | |
1386 (viper-enlarge-region (mark t) (point))) | |
1387 (if (< (point) (mark t)) | |
1388 (exchange-point-and-mark)) | |
1389 (if (eq (preceding-char) ?\n) | |
1390 (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
|
1391 (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
|
1392 (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
|
1393 (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
|
1394 )) |
19078 | 1395 |
1396 ;; this is invoked by viper-substitute-line | |
1397 (defun viper-exec-Change (m-com com) | |
18129 | 1398 (save-excursion |
19078 | 1399 (set-mark viper-com-point) |
1400 (viper-enlarge-region (mark t) (point)) | |
1401 (if viper-use-register | |
18129 | 1402 (progn |
19078 | 1403 (cond ((viper-valid-register viper-use-register '(letter digit)) |
18129 | 1404 (copy-to-register |
19078 | 1405 viper-use-register (mark t) (point) nil)) |
1406 ((viper-valid-register viper-use-register '(Letter)) | |
1407 (viper-append-to-register | |
1408 (downcase viper-use-register) (mark t) (point))) | |
1409 (t (setq viper-use-register nil) | |
1410 (error viper-InvalidRegister viper-use-register))) | |
1411 (setq viper-use-register nil))) | |
18129 | 1412 (delete-region (mark t) (point))) |
1413 (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
|
1414 (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
|
1415 (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
|
1416 (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
|
1417 )) |
19078 | 1418 |
1419 (defun viper-exec-delete (m-com com) | |
1420 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1421 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1422 (let (chars-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1423 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1424 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1425 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1426 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1427 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1428 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1429 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1430 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1431 (t (setq viper-use-register nil) |
19078 | 1432 (error viper-InvalidRegister viper-use-register))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1433 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1434 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1435 (if (eq last-command 'd-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1436 (setq chars-deleted (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1437 (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
|
1438 (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
|
1439 (message "Deleted %d characters" chars-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1440 (kill-region viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1441 (setq this-command 'd-command) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1442 (if viper-ex-style-motion |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1443 (if (and (eolp) (not (bolp))) (backward-char 1))))) |
18129 | 1444 |
19078 | 1445 (defun viper-exec-Delete (m-com com) |
18129 | 1446 (save-excursion |
19078 | 1447 (set-mark viper-com-point) |
1448 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1449 (let (lines-deleted) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1450 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1451 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1452 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1453 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1454 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1455 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1456 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1457 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1458 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1459 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1460 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1461 (setq last-command |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1462 (if (eq last-command 'D-command) 'kill-region nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1463 (setq lines-deleted (count-lines (point) viper-com-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1464 (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
|
1465 (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
|
1466 (message "Deleted %d lines" lines-deleted))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1467 (kill-region (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1468 (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
|
1469 (back-to-indentation))) |
18129 | 1470 |
21940 | 1471 ;; save region |
19078 | 1472 (defun viper-exec-yank (m-com com) |
1473 (or (and (markerp viper-com-point) (marker-position viper-com-point)) | |
1474 (set-marker viper-com-point (point) (current-buffer))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1475 (let (chars-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1476 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1477 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1478 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1479 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1480 viper-use-register viper-com-point (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1481 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1482 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1483 (downcase viper-use-register) viper-com-point (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1484 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1485 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1486 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1487 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1488 (copy-region-as-kill viper-com-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1489 (setq chars-saved (abs (- (point) viper-com-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1490 (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
|
1491 (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
|
1492 (message "Saved %d characters" chars-saved))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1493 (goto-char viper-com-point))) |
19078 | 1494 |
21940 | 1495 ;; save lines |
19078 | 1496 (defun viper-exec-Yank (m-com com) |
18129 | 1497 (save-excursion |
19078 | 1498 (set-mark viper-com-point) |
1499 (viper-enlarge-region (mark t) (point)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1500 (let (lines-saved) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1501 (if viper-use-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1502 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1503 (cond ((viper-valid-register viper-use-register '(letter digit)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1504 (copy-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1505 viper-use-register (mark t) (point) nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1506 ((viper-valid-register viper-use-register '(Letter)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1507 (viper-append-to-register |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1508 (downcase viper-use-register) (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1509 (t (setq viper-use-register nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1510 (error viper-InvalidRegister viper-use-register))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1511 (setq viper-use-register nil))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1512 (setq last-command nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1513 (copy-region-as-kill (mark t) (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1514 (setq lines-saved (count-lines (mark t) (point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1515 (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
|
1516 (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
|
1517 (message "Saved %d lines" lines-saved))))) |
19078 | 1518 (viper-deactivate-mark) |
1519 (goto-char viper-com-point)) | |
1520 | |
1521 (defun viper-exec-bang (m-com com) | |
18129 | 1522 (save-excursion |
19078 | 1523 (set-mark viper-com-point) |
1524 (viper-enlarge-region (mark t) (point)) | |
18958 | 1525 (exchange-point-and-mark) |
18129 | 1526 (shell-command-on-region |
1527 (mark t) (point) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1528 (if (viper= com ?!) |
19078 | 1529 (setq viper-last-shell-com |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1530 (viper-read-string-with-history |
18129 | 1531 "!" |
1532 nil | |
19078 | 1533 'viper-shell-history |
1534 (car viper-shell-history) | |
18129 | 1535 )) |
19078 | 1536 viper-last-shell-com) |
18129 | 1537 t))) |
1538 | |
19078 | 1539 (defun viper-exec-equals (m-com com) |
18129 | 1540 (save-excursion |
19078 | 1541 (set-mark viper-com-point) |
1542 (viper-enlarge-region (mark t) (point)) | |
18129 | 1543 (if (> (mark t) (point)) (exchange-point-and-mark)) |
1544 (indent-region (mark t) (point) nil))) | |
1545 | |
19078 | 1546 (defun viper-exec-shift (m-com com) |
18129 | 1547 (save-excursion |
19078 | 1548 (set-mark viper-com-point) |
1549 (viper-enlarge-region (mark t) (point)) | |
18129 | 1550 (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
|
1551 (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
|
1552 (if (viper= com ?>) |
19078 | 1553 viper-shift-width |
1554 (- viper-shift-width)))) | |
18129 | 1555 ;; return point to where it was before shift |
19078 | 1556 (goto-char viper-com-point)) |
18129 | 1557 |
1558 ;; this is needed because some commands fake com by setting it to ?r, which | |
1559 ;; denotes repeated insert command. | |
19078 | 1560 (defsubst viper-exec-dummy (m-com com) |
18129 | 1561 nil) |
1562 | |
19078 | 1563 (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
|
1564 (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
|
1565 (regexp-quote (buffer-substring (point) viper-com-point))) |
19078 | 1566 (setq viper-s-forward t) |
1567 (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
|
1568 (setq viper-intermediate-command 'viper-exec-buffer-search) |
19078 | 1569 (viper-search viper-s-string viper-s-forward 1)) |
1570 | |
1571 (defvar viper-exec-array (make-vector 128 nil)) | |
18129 | 1572 |
1573 ;; 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
|
1574 ;; without affecting other functions. Buffer search can now be bound |
18129 | 1575 ;; to any character. |
1576 | |
19078 | 1577 (aset viper-exec-array ?c 'viper-exec-change) |
1578 (aset viper-exec-array ?C 'viper-exec-Change) | |
1579 (aset viper-exec-array ?d 'viper-exec-delete) | |
1580 (aset viper-exec-array ?D 'viper-exec-Delete) | |
1581 (aset viper-exec-array ?y 'viper-exec-yank) | |
1582 (aset viper-exec-array ?Y 'viper-exec-Yank) | |
1583 (aset viper-exec-array ?r 'viper-exec-dummy) | |
1584 (aset viper-exec-array ?! 'viper-exec-bang) | |
1585 (aset viper-exec-array ?< 'viper-exec-shift) | |
1586 (aset viper-exec-array ?> 'viper-exec-shift) | |
1587 (aset viper-exec-array ?= 'viper-exec-equals) | |
18129 | 1588 |
1589 | |
1590 | |
1591 ;; 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
|
1592 ;; destructive command on the region specified by the movement command. For |
19078 | 1593 ;; instance, if the user types cw, then the command viper-forward-word will |
1594 ;; call viper-execute-com to execute viper-exec-change, which eventually will | |
1595 ;; call viper-change to invoke the replace mode on the region. | |
18129 | 1596 ;; |
19078 | 1597 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) |
1598 ;; via a call to viper-set-destructive-command, for later use by viper-repeat. | |
1599 (defun viper-execute-com (m-com val com) | |
1600 (let ((reg viper-use-register)) | |
18129 | 1601 ;; this is the special command `#' |
1602 (if (> com 128) | |
19078 | 1603 (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
|
1604 (let ((fn (aref viper-exec-array com))) |
18129 | 1605 (if (null fn) |
19078 | 1606 (error "%c: %s" com viper-InvalidViCommand) |
18129 | 1607 (funcall fn m-com com)))) |
19078 | 1608 (if (viper-dotable-command-p com) |
1609 (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
|
1610 (list m-com val com reg nil nil))) |
18129 | 1611 )) |
1612 | |
1613 | |
19078 | 1614 (defun viper-repeat (arg) |
18129 | 1615 "Re-execute last destructive command. |
19078 | 1616 Use the info in viper-d-com, which has the form |
18129 | 1617 \(com val ch reg inserted-text command-keys\), |
1618 where `com' is the command to be re-executed, `val' is the | |
1619 argument to `com', `ch' is a flag for repeat, and `reg' is optional; | |
1620 if it exists, it is the name of the register for `com'. | |
1621 If the prefix argument, ARG, is non-nil, it is used instead of `val'." | |
1622 (interactive "P") | |
1623 (let ((save-point (point)) ; save point before repeating prev cmd | |
1624 ;; Pass along that we are repeating a destructive command | |
19078 | 1625 ;; This tells viper-set-destructive-command not to update |
1626 ;; viper-command-ring | |
1627 (viper-intermediate-command 'viper-repeat)) | |
1628 (if (eq last-command 'viper-undo) | |
1629 ;; if the last command was viper-undo, then undo-more | |
1630 (viper-undo-more) | |
1631 ;; otherwise execute the command stored in viper-d-com. if arg is | |
1632 ;; non-nil its prefix value is used as new prefix value for the command. | |
1633 (let ((m-com (car viper-d-com)) | |
1634 (val (viper-P-val arg)) | |
1635 (com (nth 2 viper-d-com)) | |
1636 (reg (nth 3 viper-d-com))) | |
1637 (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
|
1638 (if (null m-com) (error "No previous command to repeat")) |
19078 | 1639 (setq viper-use-register reg) |
1640 (if (nth 4 viper-d-com) ; text inserted by command | |
1641 (setq viper-last-insertion (nth 4 viper-d-com) | |
1642 viper-d-char (nth 4 viper-d-com))) | |
18129 | 1643 (funcall m-com (cons val com)) |
19078 | 1644 (cond ((and (< save-point (point)) viper-keep-point-on-repeat) |
18839 | 1645 (goto-char save-point)) ; go back to before repeat. |
19462 | 1646 ((and (< save-point (point)) viper-ex-style-editing) |
18839 | 1647 (or (bolp) (backward-char 1)))) |
18129 | 1648 (if (and (eolp) (not (bolp))) |
1649 (backward-char 1)) | |
1650 )) | |
19462 | 1651 (viper-adjust-undo) ; take care of undo |
18129 | 1652 ;; 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
|
1653 ;; just executed a command from that ring. So, push it on the ring again. |
19078 | 1654 ;; If we are just executing previous command , then don't push viper-d-com |
1655 ;; 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
|
1656 ;; the inserted text may be nil). Besides, in this case, the command |
18129 | 1657 ;; executed by `.' is already on the ring. |
19078 | 1658 (if (eq last-command 'viper-display-current-destructive-command) |
1659 (viper-push-onto-ring viper-d-com 'viper-command-ring)) | |
1660 (viper-deactivate-mark) | |
18129 | 1661 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1662 |
19078 | 1663 (defun viper-repeat-from-history () |
18129 | 1664 "Repeat a destructive command from history. |
19078 | 1665 Doesn't change viper-command-ring in any way, so `.' will work as before |
18129 | 1666 executing this command. |
1667 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
|
1668 the second character is a digit 0 to 9. The digit indicates which |
18129 | 1669 history command to execute. `<char>0' is equivalent to `.', `<char>1' |
1670 invokes the command before that, etc." | |
1671 (interactive) | |
19078 | 1672 (let* ((viper-intermediate-command 'repeating-display-destructive-command) |
1673 (idx (cond (viper-this-kbd-macro | |
18129 | 1674 (string-to-number |
19078 | 1675 (symbol-name (elt viper-this-kbd-macro 1)))) |
18129 | 1676 (t 0))) |
1677 (num idx) | |
19078 | 1678 (viper-d-com viper-d-com)) |
18129 | 1679 |
1680 (or (and (numberp num) (<= 0 num) (<= num 9)) | |
1681 (progn | |
1682 (setq idx 0 | |
1683 num 0) | |
1684 (message | |
19078 | 1685 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'"))) |
18129 | 1686 (while (< 0 num) |
19078 | 1687 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1)) |
18129 | 1688 (setq num (1- num))) |
19078 | 1689 (viper-repeat nil) |
18129 | 1690 (while (> idx num) |
19078 | 1691 (viper-special-ring-rotate1 viper-command-ring 1) |
18129 | 1692 (setq num (1+ num))) |
1693 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1694 |
18129 | 1695 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
1696 ;; The hash-command. It is invoked interactively by the key sequence #<char>. |
19078 | 1697 ;; The chars that can follow `#' are determined by viper-hash-command-p |
1698 (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
|
1699 (cond ((viper= char ?c) |
19078 | 1700 (downcase-region (min viper-com-point (point)) |
1701 (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
|
1702 ((viper= char ?C) |
19078 | 1703 (upcase-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 ?g) |
19078 | 1706 (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
|
1707 ;; execute the last emacs kbd macro on each line of the region |
19078 | 1708 (viper-global-execute)) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1709 ((viper= char ?q) |
19078 | 1710 (push-mark viper-com-point t) |
1711 (viper-quote-region)) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1712 ((viper= char ?s) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
1713 (funcall viper-spell-function viper-com-point (point))) |
19078 | 1714 (t (error "#%c: %s" char viper-InvalidViCommand)))) |
18129 | 1715 |
1716 | |
1717 ;; undoing | |
1718 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1719 ;; hook used inside undo |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1720 (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
|
1721 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1722 ;; 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
|
1723 (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
|
1724 (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
|
1725 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1726 (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
|
1727 |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1728 ;; 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
|
1729 (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
|
1730 (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
|
1731 (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
|
1732 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
|
1733 ;; 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
|
1734 ;; 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
|
1735 ;; its repeated invocation |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1736 (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
|
1737 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1738 |
19078 | 1739 (defun viper-undo () |
18129 | 1740 "Undo previous change." |
1741 (interactive) | |
1742 (message "undo!") | |
1743 (let ((modified (buffer-modified-p)) | |
1744 (before-undo-pt (point-marker)) | |
1745 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
|
1746 |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1747 ;; 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
|
1748 (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
|
1749 |
18129 | 1750 (undo-start) |
1751 (undo-more 2) | |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1752 ;;(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
|
1753 ;; 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
|
1754 ;;(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
|
1755 ;; 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
|
1756 |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1757 (if (and undo-beg-posn undo-end-posn) |
18129 | 1758 (progn |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1759 (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
|
1760 (sit-for 0) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1761 (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
|
1762 (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
|
1763 (progn |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1764 (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
|
1765 (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
|
1766 (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
|
1767 (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
|
1768 (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
|
1769 (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
|
1770 (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
|
1771 (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
|
1772 )) |
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
1773 |
18129 | 1774 (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
|
1775 ) |
19078 | 1776 (setq this-command 'viper-undo)) |
18129 | 1777 |
1778 ;; Continue undoing previous changes. | |
19078 | 1779 (defun viper-undo-more () |
18129 | 1780 (message "undo more!") |
1781 (condition-case nil | |
1782 (undo-more 1) | |
1783 (error (beep) | |
1784 (message "No further undo information in this buffer"))) | |
1785 (if (and (eolp) (not (bolp))) (backward-char 1)) | |
19078 | 1786 (setq this-command 'viper-undo)) |
18129 | 1787 |
1788 ;; The following two functions are used to set up undo properly. | |
1789 ;; 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
|
1790 ;; they are undone all at once. |
19078 | 1791 (defun viper-adjust-undo () |
19462 | 1792 (if viper-undo-needs-adjustment |
1793 (let ((inhibit-quit t) | |
1794 tmp tmp2) | |
1795 (setq viper-undo-needs-adjustment nil) | |
1796 (if (listp buffer-undo-list) | |
1797 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list)) | |
1798 (progn | |
1799 (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
|
1800 |
19462 | 1801 ;; cut tail from buffer-undo-list temporarily by direct |
1802 ;; manipulation with pointers in buffer-undo-list | |
1803 (setcdr tmp nil) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1804 |
19462 | 1805 (setq buffer-undo-list (delq nil buffer-undo-list)) |
1806 (setq buffer-undo-list | |
1807 (delq viper-buffer-undo-list-mark buffer-undo-list)) | |
1808 ;; restore tail of buffer-undo-list | |
1809 (setq buffer-undo-list (nconc buffer-undo-list tmp2))) | |
1810 (setq buffer-undo-list (delq nil buffer-undo-list))))) | |
1811 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1812 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1813 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1814 (defun viper-set-complex-command-for-undo () |
18129 | 1815 (if (listp buffer-undo-list) |
19078 | 1816 (if (not viper-undo-needs-adjustment) |
18129 | 1817 (let ((inhibit-quit t)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1818 (setq buffer-undo-list |
19078 | 1819 (cons viper-buffer-undo-list-mark buffer-undo-list)) |
1820 (setq viper-undo-needs-adjustment t))))) | |
18129 | 1821 |
1822 | |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1823 ;;; 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
|
1824 |
19078 | 1825 (defun viper-display-current-destructive-command () |
1826 (let ((text (nth 4 viper-d-com)) | |
1827 (keys (nth 5 viper-d-com)) | |
18129 | 1828 (max-text-len 30)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1829 |
19078 | 1830 (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
|
1831 |
18129 | 1832 (message " `.' runs %s%s" |
19078 | 1833 (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
|
1834 (viper-abbreviate-string |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
1835 (if (featurep 'xemacs) |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1836 (replace-in-string ; xemacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1837 (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
|
1838 ((stringp text) text) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1839 (t "")) |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1840 "\n" "^J") |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1841 text ; emacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
1842 ) |
19079 | 1843 max-text-len |
1844 " inserting `" "'" " .......")) | |
18129 | 1845 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1846 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1847 |
19078 | 1848 ;; don't change viper-d-com if it was viper-repeat command invoked with `.' |
18129 | 1849 ;; or in some other way (non-interactively). |
19078 | 1850 (defun viper-set-destructive-command (list) |
1851 (or (eq viper-intermediate-command 'viper-repeat) | |
18129 | 1852 (progn |
19078 | 1853 (setq viper-d-com list) |
1854 (setcar (nthcdr 5 viper-d-com) | |
1855 (viper-array-to-string (if (arrayp viper-this-command-keys) | |
1856 viper-this-command-keys | |
1857 (this-command-keys)))) | |
1858 (viper-push-onto-ring viper-d-com 'viper-command-ring))) | |
1859 (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
|
1860 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1861 |
19078 | 1862 (defun viper-prev-destructive-command (next) |
18129 | 1863 "Find previous destructive command in the history of destructive commands. |
1864 With prefix argument, find next destructive command." | |
1865 (interactive "P") | |
19078 | 1866 (let (cmd viper-intermediate-command) |
1867 (if (eq last-command 'viper-display-current-destructive-command) | |
18129 | 1868 ;; repeated search through command history |
19078 | 1869 (setq viper-intermediate-command |
1870 'repeating-display-destructive-command) | |
18129 | 1871 ;; 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
|
1872 (setq viper-temp-command-ring (ring-copy viper-command-ring))) |
18129 | 1873 (setq cmd (if next |
19078 | 1874 (viper-special-ring-rotate1 viper-temp-command-ring 1) |
1875 (viper-special-ring-rotate1 viper-temp-command-ring -1))) | |
18129 | 1876 (if (null cmd) |
1877 () | |
19078 | 1878 (setq viper-d-com cmd)) |
1879 (viper-display-current-destructive-command))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1880 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1881 |
19078 | 1882 (defun viper-next-destructive-command () |
18129 | 1883 "Find next destructive command in the history of destructive commands." |
1884 (interactive) | |
19078 | 1885 (viper-prev-destructive-command 'next)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
1886 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1887 |
19078 | 1888 (defun viper-insert-prev-from-insertion-ring (arg) |
18129 | 1889 "Cycle through insertion ring in the direction of older insertions. |
1890 Undoes previous insertion and inserts new. | |
1891 With prefix argument, cycles in the direction of newer elements. | |
1892 In minibuffer, this command executes whatever the invocation key is bound | |
1893 to in the global map, instead of cycling through the insertion ring." | |
1894 (interactive "P") | |
19078 | 1895 (let (viper-intermediate-command) |
1896 (if (eq last-command 'viper-insert-from-insertion-ring) | |
18129 | 1897 (progn ; repeated search through insertion history |
19078 | 1898 (setq viper-intermediate-command 'repeating-insertion-from-ring) |
1899 (if (eq viper-current-state 'replace-state) | |
18129 | 1900 (undo 1) |
19078 | 1901 (if viper-last-inserted-string-from-insertion-ring |
18129 | 1902 (backward-delete-char |
19078 | 1903 (length viper-last-inserted-string-from-insertion-ring)))) |
18129 | 1904 ) |
1905 ;;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
|
1906 (setq viper-temp-insertion-ring (ring-copy viper-insertion-ring))) |
19078 | 1907 (setq this-command 'viper-insert-from-insertion-ring) |
18129 | 1908 ;; so that things will be undone properly |
1909 (setq buffer-undo-list (cons nil buffer-undo-list)) | |
19078 | 1910 (setq viper-last-inserted-string-from-insertion-ring |
1911 (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
|
1912 |
19078 | 1913 ;; this change of viper-intermediate-command must come after |
1914 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the | |
18129 | 1915 ;; insertion. |
19078 | 1916 (setq viper-intermediate-command nil) |
1917 (if viper-last-inserted-string-from-insertion-ring | |
1918 (insert viper-last-inserted-string-from-insertion-ring)) | |
18129 | 1919 )) |
1920 | |
19078 | 1921 (defun viper-insert-next-from-insertion-ring () |
18129 | 1922 "Cycle through insertion ring in the direction of older insertions. |
1923 Undo previous insertion and inserts new." | |
1924 (interactive) | |
19078 | 1925 (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
|
1926 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
1927 |
18129 | 1928 |
1929 ;; some region utilities | |
1930 | |
1931 ;; If at the last line of buffer, add \\n before eob, if newline is missing. | |
19078 | 1932 (defun viper-add-newline-at-eob-if-necessary () |
18129 | 1933 (save-excursion |
1934 (end-of-line) | |
1935 ;; make sure all lines end with newline, unless in the minibuffer or | |
1936 ;; 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
|
1937 (save-restriction |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1938 (widen) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1939 (if (and (eobp) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1940 (not (bolp)) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1941 require-final-newline |
74857
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1942 ;; 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
|
1943 ;; might unintentionally modify binary buffers |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1944 (buffer-modified-p) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1945 (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
|
1946 (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
|
1947 ;; 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
|
1948 (condition-case nil |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1949 (insert "\n") |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1950 (error nil)) |
2e5f946f7726
2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
73486
diff
changeset
|
1951 )) |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
1952 )) |
18129 | 1953 |
19078 | 1954 (defun viper-yank-defun () |
18129 | 1955 (mark-defun) |
1956 (copy-region-as-kill (point) (mark t))) | |
1957 | |
1958 ;; Enlarge region between BEG and END. | |
19078 | 1959 (defun viper-enlarge-region (beg end) |
18129 | 1960 (or beg (setq beg end)) ; if beg is nil, set to end |
1961 (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
|
1962 |
18129 | 1963 (if (< beg end) |
1964 (progn (goto-char beg) (set-mark end)) | |
1965 (goto-char end) | |
1966 (set-mark beg)) | |
1967 (beginning-of-line) | |
1968 (exchange-point-and-mark) | |
1969 (if (or (not (eobp)) (not (bolp))) (forward-line 1)) | |
1970 (if (not (eobp)) (beginning-of-line)) | |
1971 (if (> beg end) (exchange-point-and-mark))) | |
1972 | |
1973 | |
1974 ;; Quote region by each line with a user supplied string. | |
19078 | 1975 (defun viper-quote-region () |
20343 | 1976 (let ((quote-str viper-quote-string) |
1977 (donot-change-dafault t)) | |
1978 (setq quote-str | |
1979 (viper-read-string-with-history | |
1980 "Quote string: " | |
1981 nil | |
1982 'viper-quote-region-history | |
1983 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%") | |
1984 ((string-match "java.*-mode" (symbol-name major-mode)) "//") | |
1985 ((string-match "perl.*-mode" (symbol-name major-mode)) "#") | |
1986 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | |
1987 ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | |
1988 ((memq major-mode '(sh-mode shell-mode)) "#") | |
1989 (t (setq donot-change-dafault nil) | |
1990 quote-str)))) | |
1991 (or donot-change-dafault | |
1992 (setq viper-quote-string quote-str)) | |
1993 (viper-enlarge-region (point) (mark t)) | |
1994 (if (> (point) (mark t)) (exchange-point-and-mark)) | |
1995 (insert quote-str) | |
18129 | 1996 (beginning-of-line) |
20343 | 1997 (forward-line 1) |
1998 (while (and (< (point) (mark t)) (bolp)) | |
1999 (insert quote-str) | |
2000 (beginning-of-line) | |
2001 (forward-line 1)))) | |
18129 | 2002 |
2003 ;; Tells whether BEG is on the same line as END. | |
2004 ;; If one of the args is nil, it'll return nil. | |
19078 | 2005 (defun viper-same-line (beg end) |
18129 | 2006 (let ((selective-display nil) |
2007 (incr 0) | |
2008 temp) | |
2009 (if (and beg end (> beg end)) | |
2010 (setq temp beg | |
2011 beg end | |
2012 end temp)) | |
2013 (if (and beg end) | |
2014 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range | |
2015 nil) | |
2016 (t | |
2017 ;; This 'if' is needed because Emacs treats the next empty line | |
2018 ;; as part of the previous line. | |
19078 | 2019 (if (= (viper-line-pos 'start) end) |
18129 | 2020 (setq incr 1)) |
2021 (<= (+ incr (count-lines beg end)) 1)))) | |
2022 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2023 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2024 |
18129 | 2025 ;; Check if the string ends with a newline. |
19078 | 2026 (defun viper-end-with-a-newline-p (string) |
18129 | 2027 (or (string= string "") |
19078 | 2028 (= (viper-seq-last-elt string) ?\n))) |
2029 | |
2030 (defun viper-tmp-insert-at-eob (msg) | |
18129 | 2031 (let ((savemax (point-max))) |
2032 (goto-char savemax) | |
2033 (insert msg) | |
2034 (sit-for 2) | |
2035 (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
|
2036 )) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2037 |
18129 | 2038 |
2039 | |
2040 ;;; Minibuffer business | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2041 |
19078 | 2042 (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
|
2043 (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
|
2044 (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
|
2045 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2046 |
19078 | 2047 (defun viper-minibuffer-setup-sentinel () |
2048 (let ((hook (if viper-vi-style-in-minibuffer | |
2049 'viper-change-state-to-insert | |
2050 '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
|
2051 ;; 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
|
2052 ;; 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
|
2053 ;; 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
|
2054 ;; the normal buffers |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2055 (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
|
2056 (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
|
2057 (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
|
2058 (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
|
2059 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
|
2060 viper-command-ring nil) |
18129 | 2061 (funcall hook) |
2062 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2063 |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2064 ;; 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
|
2065 ;; 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
|
2066 ;; 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
|
2067 ;; viper-read-string-with-history |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2068 (defun viper-minibuffer-standard-hook () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2069 (if (stringp init-message) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2070 (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
|
2071 (if (stringp initial) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2072 (progn |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2073 ;; 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
|
2074 (or unread-command-events |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2075 executing-kbd-macro |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2076 (sit-for 840)) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2077 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2078 (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
|
2079 (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
|
2080 (insert initial)))) |
26743
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2081 |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2082 (defsubst viper-minibuffer-real-start () |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2083 (if (fboundp 'minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2084 (minibuffer-prompt-end) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2085 (point-min))) |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2086 |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2087 (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
|
2088 (when (active-minibuffer-window) |
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64750
diff
changeset
|
2089 (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
|
2090 (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
|
2091 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2092 |
19756 | 2093 ;; Interpret last event in the local map first; if fails, use exit-minibuffer. |
2094 ;; Run viper-minibuffer-exit-hook before exiting. | |
19078 | 2095 (defun viper-exit-minibuffer () |
19756 | 2096 "Exit minibuffer Viper way." |
18129 | 2097 (interactive) |
2098 (let (command) | |
101009
ad9d2270860e
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2099 (setq command (local-key-binding (char-to-string last-command-event))) |
19756 | 2100 (run-hooks 'viper-minibuffer-exit-hook) |
18129 | 2101 (if command |
2102 (command-execute command) | |
2103 (exit-minibuffer)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2104 |
19756 | 2105 |
2106 (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
|
2107 '("" "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
|
2108 "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
|
2109 "*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
|
2110 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
|
2111 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
|
2112 represents an editable file. However, file completion will stop at the `.' |
19756 | 2113 The smart suffix feature lets you hit RET in such a case, and Viper will |
2114 select the appropriate suffix. | |
2115 | |
2116 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
|
2117 corresponding file exists is selected. If no file exists for any of the |
19756 | 2118 suffixes, the user is asked to confirm. |
2119 | |
2120 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
|
2121 :type '(repeat string) |
20003 | 2122 :group 'viper-misc) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2123 |
19756 | 2124 |
2125 ;; Try to add a suitable suffix to files whose name ends with a `.' | |
2126 ;; Useful when the user hits RET on a non-completed file name. | |
2127 ;; Used as a minibuffer exit hook in read-file-name | |
2128 (defun viper-file-add-suffix () | |
2129 (let ((count 0) | |
2130 (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
|
2131 (file (buffer-substring-no-properties |
2ddbff6366e9
* viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26702
diff
changeset
|
2132 (viper-minibuffer-real-start) (point-max))) |
19756 | 2133 found key cmd suff) |
2134 (goto-char (point-max)) | |
2135 (if (and viper-smart-suffix-list (string-match "\\.$" file)) | |
2136 (progn | |
2137 (while (and (not found) (< count len)) | |
2138 (setq suff (nth count viper-smart-suffix-list) | |
2139 count (1+ count)) | |
2140 (if (file-exists-p | |
2141 (format "%s%s" (substitute-in-file-name file) suff)) | |
2142 (progn | |
2143 (setq found t) | |
2144 (insert suff)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2145 |
19756 | 2146 (if found |
2147 () | |
2148 (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
|
2149 (unwind-protect |
19756 | 2150 (while (not (memq cmd |
2151 '(exit-minibuffer viper-exit-minibuffer))) | |
2152 (setq cmd | |
2153 (key-binding (setq key (read-key-sequence nil)))) | |
2154 (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
|
2155 (if (featurep 'xemacs) |
93615
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
2156 (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
|
2157 (insert key) ; emacs |
34417c118a39
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92379
diff
changeset
|
2158 )) |
19756 | 2159 ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) |
2160 nil) | |
2161 (t (command-execute cmd))) | |
2162 ))) | |
2163 )))) | |
2164 | |
2165 | |
2166 (defun viper-minibuffer-trim-tail () | |
2167 "Delete junk at the end of the first line of the minibuffer input. | |
2168 Remove this function from `viper-minibuffer-exit-hook', if this causes | |
2169 problems." | |
2170 (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
|
2171 (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
|
2172 (goto-char (viper-minibuffer-real-start)) |
19756 | 2173 (end-of-line) |
2174 (delete-region (point) (point-max))))) | |
2175 | |
18129 | 2176 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2177 ;;; Reading string with history |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2178 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2179 (defun viper-read-string-with-history (prompt &optional initial |
20343 | 2180 history-var default keymap |
2181 init-message) | |
18129 | 2182 ;; Read string, prompting with PROMPT and inserting the INITIAL |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2183 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the |
20343 | 2184 ;; input is an empty string. |
18129 | 2185 ;; 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
|
2186 ;; minibuffer. |
20343 | 2187 ;; KEYMAP is used, if given, instead of minibuffer-local-map. |
2188 ;; INIT-MESSAGE is the message temporarily displayed after entering the | |
2189 ;; minibuffer. | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2190 (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
|
2191 ;; 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
|
2192 (let ((old |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2193 (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
|
2194 minibuffer-setup-hook |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2195 nil))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2196 (cons |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2197 '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
|
2198 (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
|
2199 (list old) old)))) |
18129 | 2200 (val "") |
2201 (padding "") | |
2202 temp-msg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2203 |
18129 | 2204 (setq keymap (or keymap minibuffer-local-map) |
2205 initial (or initial "") | |
2206 temp-msg (if default | |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2207 (format "(default %s) " default) |
18129 | 2208 "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2209 |
19078 | 2210 (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
|
2211 (setq val (read-from-minibuffer prompt |
18129 | 2212 (concat temp-msg initial val padding) |
2213 keymap nil history-var)) | |
2214 (setq minibuffer-setup-hook nil | |
19078 | 2215 padding (viper-array-to-string (this-command-keys)) |
18129 | 2216 temp-msg "") |
2217 ;; the following tries to be smart about what to put in history | |
2218 (if (not (string= val (car (eval history-var)))) | |
2219 (set history-var (cons val (eval history-var)))) | |
2220 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var))) | |
2221 (string= (nth 0 (eval history-var)) "")) | |
2222 (set history-var (cdr (eval history-var)))) | |
19078 | 2223 ;; 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
|
2224 ;; viper-command-argument, or `! shell-command', this probably means |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2225 ;; that the user typed something then erased. Return "" in this case, not |
18129 | 2226 ;; the default---the default is too confusing in this case. |
2227 (cond ((and (string= val "") | |
2228 (not (string= prompt "!")) ; was a `! shell-command' | |
2229 (not (memq last-command | |
19078 | 2230 '(viper-ex |
2231 viper-command-argument | |
18129 | 2232 t) |
2233 ))) | |
2234 "") | |
2235 ((string= val "") (or default "")) | |
2236 (t val)) | |
2237 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2238 |
18129 | 2239 |
2240 | |
2241 ;; insertion commands | |
2242 | |
2243 ;; Called when state changes from Insert Vi command mode. | |
2244 ;; Repeats the insertion command if Insert state was entered with prefix | |
2245 ;; argument > 1. | |
19078 | 2246 (defun viper-repeat-insert-command () |
2247 (let ((i-com (car viper-d-com)) | |
2248 (val (nth 1 viper-d-com)) | |
2249 (char (nth 2 viper-d-com))) | |
18129 | 2250 (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
|
2251 (progn |
19078 | 2252 (setq viper-d-com (list i-com (1- val) ?r nil nil nil)) |
2253 (viper-repeat nil) | |
2254 (setq viper-d-com (list i-com val char nil nil nil)) | |
18129 | 2255 )))) |
2256 | |
19078 | 2257 (defun viper-insert (arg) |
18129 | 2258 "Insert before point." |
2259 (interactive "P") | |
19078 | 2260 (viper-set-complex-command-for-undo) |
2261 (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
|
2262 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2263 ) |
19078 | 2264 (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
|
2265 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2266 (viper-loop val (viper-yank-last-insertion)) |
2267 (viper-change-state-to-insert)))) | |
2268 | |
2269 (defun viper-append (arg) | |
18129 | 2270 "Append after point." |
2271 (interactive "P") | |
19078 | 2272 (viper-set-complex-command-for-undo) |
2273 (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
|
2274 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2275 ) |
19078 | 2276 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil)) |
18129 | 2277 (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
|
2278 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2279 (viper-loop val (viper-yank-last-insertion)) |
2280 (viper-change-state-to-insert)))) | |
2281 | |
2282 (defun viper-Append (arg) | |
18129 | 2283 "Append at end of line." |
2284 (interactive "P") | |
19078 | 2285 (viper-set-complex-command-for-undo) |
2286 (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
|
2287 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2288 ) |
19078 | 2289 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil)) |
18129 | 2290 (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
|
2291 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2292 (viper-loop val (viper-yank-last-insertion)) |
2293 (viper-change-state-to-insert)))) | |
2294 | |
2295 (defun viper-Insert (arg) | |
18129 | 2296 "Insert before first non-white." |
2297 (interactive "P") | |
19078 | 2298 (viper-set-complex-command-for-undo) |
2299 (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
|
2300 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2301 ) |
19078 | 2302 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil)) |
18129 | 2303 (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
|
2304 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2305 (viper-loop val (viper-yank-last-insertion)) |
2306 (viper-change-state-to-insert)))) | |
2307 | |
2308 (defun viper-open-line (arg) | |
18129 | 2309 "Open line below." |
2310 (interactive "P") | |
19078 | 2311 (viper-set-complex-command-for-undo) |
2312 (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
|
2313 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2314 ) |
19078 | 2315 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil)) |
18129 | 2316 (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
|
2317 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2318 (viper-loop val |
18129 | 2319 (end-of-line) |
2320 (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
|
2321 (viper-indent-line col) |
19462 | 2322 (viper-yank-last-insertion)) |
18129 | 2323 (end-of-line) |
2324 (newline 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2325 (viper-indent-line col) |
19078 | 2326 (viper-change-state-to-insert))))) |
2327 | |
2328 (defun viper-Open-line (arg) | |
18129 | 2329 "Open line above." |
2330 (interactive "P") | |
19078 | 2331 (viper-set-complex-command-for-undo) |
2332 (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
|
2333 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2334 ) |
19078 | 2335 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil)) |
18129 | 2336 (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
|
2337 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2338 (viper-loop val |
18129 | 2339 (beginning-of-line) |
2340 (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
|
2341 (viper-indent-line col) |
19462 | 2342 (viper-yank-last-insertion)) |
18129 | 2343 (beginning-of-line) |
2344 (open-line 1) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2345 (viper-indent-line col) |
19078 | 2346 (viper-change-state-to-insert))))) |
2347 | |
2348 (defun viper-open-line-at-point (arg) | |
18129 | 2349 "Open line at point." |
2350 (interactive "P") | |
19078 | 2351 (viper-set-complex-command-for-undo) |
2352 (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
|
2353 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2354 ) |
19078 | 2355 (viper-set-destructive-command |
2356 (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
|
2357 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2358 (viper-loop val |
18129 | 2359 (open-line 1) |
19462 | 2360 (viper-yank-last-insertion)) |
18129 | 2361 (open-line 1) |
19078 | 2362 (viper-change-state-to-insert)))) |
2363 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2364 ;; bound to s |
19078 | 2365 (defun viper-substitute (arg) |
18129 | 2366 "Substitute characters." |
2367 (interactive "P") | |
19078 | 2368 (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
|
2369 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2370 ) |
18129 | 2371 (push-mark nil t) |
2372 (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
|
2373 (if (eq viper-intermediate-command 'viper-repeat) |
19078 | 2374 (viper-change-subr (mark t) (point)) |
2375 (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
|
2376 ;; com is set to ?r when we repeat this comand with dot |
19078 | 2377 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) |
18129 | 2378 )) |
2379 | |
19078 | 2380 ;; Command bound to S |
2381 (defun viper-substitute-line (arg) | |
18129 | 2382 "Substitute lines." |
2383 (interactive "p") | |
19078 | 2384 (viper-set-complex-command-for-undo) |
2385 (viper-line (cons arg ?C))) | |
18129 | 2386 |
2387 ;; Prepare for replace | |
19078 | 2388 (defun viper-start-replace () |
2389 (setq viper-began-as-replace t | |
2390 viper-sitting-in-replace t | |
19462 | 2391 viper-replace-chars-to-delete 0) |
21940 | 2392 (add-hook |
2393 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local) | |
2394 (add-hook | |
2395 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local) | |
18129 | 2396 ;; this will get added repeatedly, but no harm |
19078 | 2397 (add-hook 'after-change-functions 'viper-after-change-sentinel t) |
2398 (add-hook 'before-change-functions 'viper-before-change-sentinel t) | |
21940 | 2399 (viper-move-marker-locally |
2400 'viper-last-posn-in-replace-region (viper-replace-start)) | |
2401 (add-hook | |
2402 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel | |
2403 t 'local) | |
2404 (add-hook | |
2405 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2406 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2407 (remove-hook |
2408 '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
|
2409 (if overwrite-mode (overwrite-mode -1)) |
18129 | 2410 ) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2411 |
18129 | 2412 |
19078 | 2413 (defun viper-replace-mode-spy-before (beg end) |
19462 | 2414 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end)) |
2415 ) | |
2416 | |
2417 ;; 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
|
2418 ;; 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
|
2419 ;; if this command performs several separate buffer changes. Therefore, if |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2420 ;; 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
|
2421 ;; deleted. |
19078 | 2422 (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
|
2423 (if (memq viper-intermediate-command |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2424 '(dabbrev-expand hippie-expand repeating-insertion-from-ring)) |
19462 | 2425 ;; Take special care of text insertion from insertion ring inside |
2426 ;; replacement overlays. | |
18129 | 2427 (progn |
19078 | 2428 (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
|
2429 (viper-move-marker-locally |
19078 | 2430 '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
|
2431 |
19462 | 2432 (let* ((real-end (min end (viper-replace-end))) |
2433 (column-shift (- (save-excursion (goto-char real-end) | |
2434 (current-column)) | |
2435 (save-excursion (goto-char beg) | |
2436 (current-column)))) | |
2437 (chars-deleted 0)) | |
2438 | |
2439 (if (> length 0) | |
2440 (setq chars-deleted viper-replace-region-chars-deleted)) | |
2441 (setq viper-replace-region-chars-deleted 0) | |
2442 (setq viper-replace-chars-to-delete | |
2443 (+ viper-replace-chars-to-delete | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2444 (- |
19462 | 2445 ;; if column shift is bigger, due to a TAB insertion, take |
2446 ;; column-shift instead of the number of inserted chars | |
2447 (max (viper-chars-in-region beg real-end) | |
2448 ;; This test accounts for Chinese/Japanese/... chars, | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2449 ;; which occupy 2 columns instead of one. If we use |
19462 | 2450 ;; 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
|
2451 ;; one when the user types one Chinese character. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2452 ;; Deleting two would be OK, if they were European chars, |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2453 ;; but it is not OK if they are Chinese chars. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2454 ;; Since it is hard to |
19462 | 2455 ;; figure out which characters are being deleted in any |
2456 ;; given region, we decided to treat Eastern and European | |
2457 ;; characters equally, even though Eastern chars may | |
2458 ;; occupy more columns. | |
2459 (if (memq this-command '(self-insert-command | |
2460 quoted-insert viper-insert-tab)) | |
2461 column-shift | |
2462 0)) | |
2463 ;; the number of deleted chars | |
2464 chars-deleted))) | |
2465 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2466 (viper-move-marker-locally |
19078 | 2467 'viper-last-posn-in-replace-region |
19462 | 2468 (max (if (> end (viper-replace-end)) (viper-replace-end) end) |
19078 | 2469 (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
|
2470 (viper-replace-start)) |
18129 | 2471 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2472 |
18129 | 2473 ))) |
2474 | |
19462 | 2475 |
2476 ;; Delete stuff between viper-last-posn-in-replace-region and the end of | |
2477 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within | |
2478 ;; the overlay and current point is before the end of the overlay. | |
2479 ;; Don't delete anything if current point is past the end of the overlay. | |
2480 (defun viper-finish-change () | |
21940 | 2481 (remove-hook |
2482 'viper-after-change-functions 'viper-replace-mode-spy-after 'local) | |
2483 (remove-hook | |
2484 'viper-before-change-functions 'viper-replace-mode-spy-before 'local) | |
2485 (remove-hook | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2486 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) |
21940 | 2487 (remove-hook |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2488 '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
|
2489 (viper-restore-cursor-color 'after-replace-mode) |
19078 | 2490 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it |
18129 | 2491 (save-excursion |
19462 | 2492 (if (and viper-replace-overlay |
2493 (viper-pos-within-region viper-last-posn-in-replace-region | |
2494 (viper-replace-start) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2495 (viper-replace-end)) |
19462 | 2496 (< (point) (viper-replace-end))) |
2497 (delete-region | |
2498 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
|
2499 |
19078 | 2500 (if (eq viper-current-state 'replace-state) |
2501 (viper-downgrade-to-insert)) | |
2502 ;; replace mode ended => nullify viper-last-posn-in-replace-region | |
2503 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil) | |
2504 (viper-hide-replace-overlay) | |
2505 (viper-refresh-mode-line) | |
2506 (viper-put-string-on-kill-ring viper-last-replace-region) | |
18129 | 2507 ) |
2508 | |
2509 ;; Make STRING be the first element of the kill ring. | |
19078 | 2510 (defun viper-put-string-on-kill-ring (string) |
18129 | 2511 (setq kill-ring (cons string kill-ring)) |
2512 (if (> (length kill-ring) kill-ring-max) | |
2513 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)) | |
2514 (setq kill-ring-yank-pointer kill-ring)) | |
2515 | |
19078 | 2516 (defun viper-finish-R-mode () |
21940 | 2517 (remove-hook |
2518 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local) | |
2519 (remove-hook | |
2520 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local) | |
19078 | 2521 (viper-downgrade-to-insert)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2522 |
19078 | 2523 (defun viper-start-R-mode () |
18129 | 2524 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number |
2525 (overwrite-mode 1) | |
21940 | 2526 (add-hook |
2527 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local) | |
2528 (add-hook | |
2529 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local) | |
18129 | 2530 ;; guard against a smartie who switched from R-replace to normal replace |
21940 | 2531 (remove-hook |
2532 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local) | |
18129 | 2533 ) |
2534 | |
2535 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2536 |
19078 | 2537 (defun viper-replace-state-exit-cmd () |
18129 | 2538 "Binding for keys that cause Replace state to switch to Vi or to Insert. |
2539 These keys are ESC, RET, and LineFeed" | |
2540 (interactive) | |
19462 | 2541 (if overwrite-mode ; if in replace mode invoked via 'R' |
19078 | 2542 (viper-finish-R-mode) |
19462 | 2543 (viper-finish-change)) |
18129 | 2544 (let (com) |
19078 | 2545 (if (eq this-command 'viper-intercept-ESC-key) |
2546 (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
|
2547 (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
|
2548 (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
|
2549 |
18129 | 2550 (condition-case conds |
2551 (command-execute com) | |
2552 (error | |
19078 | 2553 (viper-message-conditions conds))) |
18129 | 2554 ) |
19078 | 2555 (viper-hide-replace-overlay)) |
2556 | |
2557 | |
2558 (defun viper-replace-state-carriage-return () | |
2559 "Carriage return in Viper replace state." | |
18129 | 2560 (interactive) |
2561 ;; If Emacs start supporting overlay maps, as it currently supports | |
19078 | 2562 ;; 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
|
2563 ;; just have keymap attached to replace overlay. Then the "if part" of this |
18129 | 2564 ;; statement can be deleted. |
19078 | 2565 (if (or (< (point) (viper-replace-start)) |
2566 (> (point) (viper-replace-end))) | |
2567 (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
|
2568 (viper-set-unread-command-events last-input-event) |
18129 | 2569 (setq com (key-binding (read-key-sequence nil))) |
2570 (condition-case conds | |
2571 (command-execute com) | |
2572 (error | |
19078 | 2573 (viper-message-conditions conds)))) |
2574 (if (not viper-allow-multiline-replace-regions) | |
2575 (viper-replace-state-exit-cmd) | |
2576 (if (viper-same-line (point) (viper-replace-end)) | |
2577 (viper-replace-state-exit-cmd) | |
2578 ;; delete the rest of line | |
2579 (delete-region (point) (viper-line-pos 'end)) | |
2580 (save-excursion | |
2581 (end-of-line) | |
2582 (if (eobp) (error "Last line in buffer"))) | |
2583 ;; skip to the next line | |
2584 (forward-line 1) | |
2585 (back-to-indentation) | |
2586 )))) | |
18129 | 2587 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2588 |
18129 | 2589 ;; This is the function bound to 'R'---unlimited replace. |
2590 ;; 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
|
2591 (defun viper-overwrite (arg) |
18129 | 2592 "Begin overwrite mode." |
2593 (interactive "P") | |
19078 | 2594 (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
|
2595 ;;(com (viper-getcom arg)) |
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2596 (len)) |
19078 | 2597 (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
|
2598 (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
|
2599 (progn |
19078 | 2600 ;; Viper saves inserted text in viper-last-insertion |
2601 (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
|
2602 (delete-char (min len (- (point-max) (point) 1))) |
19078 | 2603 (viper-loop val (viper-yank-last-insertion))) |
2604 (setq last-command 'viper-overwrite) | |
2605 (viper-set-complex-command-for-undo) | |
2606 (viper-set-replace-overlay (point) (viper-line-pos 'end)) | |
2607 (viper-change-state-to-replace) | |
18129 | 2608 ))) |
2609 | |
2610 | |
2611 ;; line commands | |
2612 | |
19078 | 2613 (defun viper-line (arg) |
18129 | 2614 (let ((val (car arg)) |
2615 (com (cdr arg))) | |
19078 | 2616 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2617 (if (not (eobp)) |
19078 | 2618 (viper-next-line-carefully (1- val))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2619 ;; 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
|
2620 ;; last line of buffer when this line has no \n. |
19078 | 2621 (viper-add-newline-at-eob-if-necessary) |
2622 (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
|
2623 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
18129 | 2624 ) |
2625 | |
19078 | 2626 (defun viper-yank-line (arg) |
18129 | 2627 "Yank ARG lines (in Vi's sense)." |
2628 (interactive "P") | |
19078 | 2629 (let ((val (viper-p-val arg))) |
2630 (viper-line (cons val ?Y)))) | |
18129 | 2631 |
2632 | |
2633 ;; region commands | |
2634 | |
19078 | 2635 (defun viper-region (arg) |
18129 | 2636 "Execute command on a region." |
2637 (interactive "P") | |
19078 | 2638 (let ((val (viper-P-val arg)) |
2639 (com (viper-getcom arg))) | |
2640 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2641 (exchange-point-and-mark) |
19078 | 2642 (viper-execute-com 'viper-region val com))) |
2643 | |
2644 (defun viper-Region (arg) | |
18129 | 2645 "Execute command on a Region." |
2646 (interactive "P") | |
19078 | 2647 (let ((val (viper-P-val arg)) |
2648 (com (viper-getCom arg))) | |
2649 (viper-move-marker-locally 'viper-com-point (point)) | |
18129 | 2650 (exchange-point-and-mark) |
19078 | 2651 (viper-execute-com 'viper-Region val com))) |
2652 | |
2653 (defun viper-replace-char (arg) | |
18129 | 2654 "Replace the following ARG chars by the character read." |
2655 (interactive "P") | |
2656 (if (and (eolp) (bolp)) (error "No character to replace here")) | |
19078 | 2657 (let ((val (viper-p-val arg)) |
2658 (com (viper-getcom arg))) | |
2659 (viper-replace-char-subr com val) | |
18129 | 2660 (if (and (eolp) (not (bolp))) (forward-char 1)) |
19462 | 2661 (setq viper-this-command-keys |
2662 (format "%sr" (if (integerp arg) arg ""))) | |
19078 | 2663 (viper-set-destructive-command |
2664 (list 'viper-replace-char val ?r nil viper-d-char nil)) | |
18129 | 2665 )) |
2666 | |
19078 | 2667 (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
|
2668 (let ((inhibit-quit t) |
25dc021070bc
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
2669 char) |
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
2670 (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
|
2671 (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
|
2672 (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
|
2673 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2674 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2675 (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
|
2676 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2677 (if com (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2678 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2679 (setq viper-d-char char) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2680 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2681 (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
|
2682 (delete-char 1 t) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2683 (insert char)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
2684 |
39901
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2685 (viper-adjust-undo) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2686 (backward-char arg) |
50f67a72ea1b
2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39288
diff
changeset
|
2687 )) |
18129 | 2688 |
2689 | |
2690 ;; basic cursor movement. j, k, l, h commands. | |
2691 | |
19078 | 2692 (defun viper-forward-char (arg) |
18129 | 2693 "Move point right ARG characters (left if ARG negative). |
2694 On reaching end of line, stop and signal error." | |
2695 (interactive "P") | |
19078 | 2696 (viper-leave-region-active) |
2697 (let ((val (viper-p-val arg)) | |
2698 (com (viper-getcom arg))) | |
2699 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2700 (if viper-ex-style-motion | |
18129 | 2701 (progn |
2702 ;; the boundary condition check gets weird here because | |
2703 ;; forward-char may be the parameter of a delete, and 'dl' works | |
2704 ;; just like 'x' for the last char on a line, so we have to allow | |
19078 | 2705 ;; the forward motion before the 'viper-execute-com', but, of |
18129 | 2706 ;; course, 'dl' doesn't work on an empty line, so we have to |
19078 | 2707 ;; 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
|
2708 (if (and (eolp) (bolp)) (error "Viper bell") (forward-char val)) |
19078 | 2709 (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
|
2710 (if (eolp) (progn (backward-char 1) (error "Viper bell")))) |
18129 | 2711 (forward-char val) |
19078 | 2712 (if com (viper-execute-com 'viper-forward-char val com))))) |
2713 | |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2714 |
19078 | 2715 (defun viper-backward-char (arg) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2716 "Move point left ARG characters (right if ARG negative). |
18129 | 2717 On reaching beginning of line, stop and signal error." |
2718 (interactive "P") | |
19078 | 2719 (viper-leave-region-active) |
2720 (let ((val (viper-p-val arg)) | |
2721 (com (viper-getcom arg))) | |
2722 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2723 (if viper-ex-style-motion | |
18129 | 2724 (progn |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
2725 (if (bolp) (error "Viper bell") (backward-char val)) |
19078 | 2726 (if com (viper-execute-com 'viper-backward-char val com))) |
18129 | 2727 (backward-char val) |
19078 | 2728 (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
|
2729 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2730 |
18129 | 2731 ;; 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
|
2732 ;; Returns distance traveled |
19462 | 2733 ;; (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
|
2734 (defun viper-forward-char-carefully (&optional arg) |
18129 | 2735 (setq arg (or arg 1)) |
19462 | 2736 (let ((pt (point))) |
2737 (condition-case nil | |
2738 (forward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2739 (error nil)) |
19462 | 2740 (if (< (point) pt) ; arg was negative |
2741 (- (viper-chars-in-region pt (point))) | |
2742 (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
|
2743 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2744 |
19462 | 2745 ;; Like backward-char, but doesn't move at beg of buffer. |
2746 ;; Returns distance traveled | |
2747 ;; (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
|
2748 (defun viper-backward-char-carefully (&optional arg) |
18129 | 2749 (setq arg (or arg 1)) |
19462 | 2750 (let ((pt (point))) |
2751 (condition-case nil | |
2752 (backward-char arg) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2753 (error nil)) |
19462 | 2754 (if (> (point) pt) ; arg was negative |
2755 (viper-chars-in-region pt (point)) | |
2756 (- (viper-chars-in-region pt (point)))))) | |
18129 | 2757 |
19078 | 2758 (defun viper-next-line-carefully (arg) |
18129 | 2759 (condition-case nil |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
2760 ;; 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
|
2761 (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
|
2762 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
2763 (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
|
2764 (next-line arg))) |
18129 | 2765 (error nil))) |
2766 | |
2767 | |
2768 | |
2769 ;;; Word command | |
2770 | |
19078 | 2771 ;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators for |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2772 ;; word movement. When executed with a destructive command, \n is usually left |
19078 | 2773 ;; untouched for the last word. Viper uses syntax table to determine what is a |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2774 ;; word and what is a separator. However, \n is always a separator. Also, if |
19078 | 2775 ;; viper-syntax-preference is 'vi, then `_' is part of the word. |
18129 | 2776 |
2777 ;; skip only one \n | |
19078 | 2778 (defun viper-skip-separators (forward) |
18129 | 2779 (if forward |
2780 (progn | |
19078 | 2781 (viper-skip-all-separators-forward 'within-line) |
18129 | 2782 (if (looking-at "\n") |
2783 (progn | |
2784 (forward-char) | |
19078 | 2785 (viper-skip-all-separators-forward 'within-line)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2786 ;; check for eob and white space before it. move off of eob |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2787 (if (and (eobp) (save-excursion |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2788 (viper-backward-char-carefully) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2789 (viper-looking-at-separator))) |
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
2790 (viper-backward-char-carefully)) |
19078 | 2791 (viper-skip-all-separators-backward 'within-line) |
19462 | 2792 (viper-backward-char-carefully) |
18129 | 2793 (if (looking-at "\n") |
19078 | 2794 (viper-skip-all-separators-backward 'within-line) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2795 (or (viper-looking-at-separator) (forward-char))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2796 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
2797 |
19078 | 2798 (defun viper-forward-word-kernel (val) |
18129 | 2799 (while (> val 0) |
19078 | 2800 (cond ((viper-looking-at-alpha) |
2801 (viper-skip-alpha-forward "_") | |
2802 (viper-skip-separators t)) | |
2803 ((viper-looking-at-separator) | |
2804 (viper-skip-separators t)) | |
2805 ((not (viper-looking-at-alphasep)) | |
2806 (viper-skip-nonalphasep-forward) | |
2807 (viper-skip-separators t))) | |
18129 | 2808 (setq val (1- val)))) |
2809 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
2810 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is |
19462 | 2811 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM. |
2812 (defun viper-separator-skipback-special (twice lim) | |
2813 (let ((prev-char (viper-char-at-pos 'backward)) | |
2814 (saved-point (point))) | |
2815 ;; skip non-newline separators backward | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2816 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2817 (< lim (point)) |
2818 ;; must be non-newline separator | |
2819 (if (eq viper-syntax-preference 'strict-vi) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2820 (viper-memq-char prev-char '(?\ ?\t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2821 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2822 (viper-backward-char-carefully) |
2823 (setq prev-char (viper-char-at-pos 'backward))) | |
2824 | |
2825 (if (and (< lim (point)) (eq prev-char ?\n)) | |
2826 (backward-char) | |
2827 ;; If we skipped to the next word and the prefix of this line doesn't | |
2828 ;; consist of separators preceded by a newline, then don't skip backwards | |
2829 ;; at all. | |
2830 (goto-char saved-point)) | |
2831 (setq prev-char (viper-char-at-pos 'backward)) | |
2832 | |
2833 ;; skip again, but make sure we don't overshoot the limit | |
2834 (if twice | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2835 (while (and (not (viper-memq-char prev-char '(nil \n))) |
19462 | 2836 (< lim (point)) |
2837 ;; must be non-newline separator | |
2838 (if (eq viper-syntax-preference 'strict-vi) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2839 (viper-memq-char prev-char '(?\ ?\t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
2840 (viper-memq-char (char-syntax prev-char) '(?\ ?-)))) |
19462 | 2841 (viper-backward-char-carefully) |
2842 (setq prev-char (viper-char-at-pos 'backward)))) | |
2843 | |
2844 (if (= (point) lim) | |
2845 (viper-forward-char-carefully)) | |
2846 )) | |
18129 | 2847 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2848 |
19078 | 2849 (defun viper-forward-word (arg) |
18129 | 2850 "Forward word." |
2851 (interactive "P") | |
19078 | 2852 (viper-leave-region-active) |
2853 (let ((val (viper-p-val arg)) | |
2854 (com (viper-getcom arg))) | |
2855 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2856 (viper-forward-word-kernel val) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2857 (if com |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2858 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2859 (cond ((viper-char-equal com ?c) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2860 (viper-separator-skipback-special 'twice viper-com-point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2861 ;; Yank words including the whitespace, but not newline |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2862 ((viper-char-equal com ?y) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2863 (viper-separator-skipback-special nil viper-com-point)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2864 ((viper-dotable-command-p com) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2865 (viper-separator-skipback-special nil viper-com-point))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2866 (viper-execute-com 'viper-forward-word val com))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2867 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2868 |
18129 | 2869 |
19078 | 2870 (defun viper-forward-Word (arg) |
18129 | 2871 "Forward word delimited by white characters." |
2872 (interactive "P") | |
19078 | 2873 (viper-leave-region-active) |
2874 (let ((val (viper-p-val arg)) | |
2875 (com (viper-getcom arg))) | |
2876 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2877 (viper-loop val | |
2878 (viper-skip-nonseparators 'forward) | |
19462 | 2879 (viper-skip-separators t)) |
18129 | 2880 (if com (progn |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2881 (cond ((viper-char-equal com ?c) |
19462 | 2882 (viper-separator-skipback-special 'twice viper-com-point)) |
18129 | 2883 ;; Yank words including the whitespace, but not newline |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
2884 ((viper-char-equal com ?y) |
19462 | 2885 (viper-separator-skipback-special nil viper-com-point)) |
19078 | 2886 ((viper-dotable-command-p com) |
19462 | 2887 (viper-separator-skipback-special nil viper-com-point))) |
19078 | 2888 (viper-execute-com 'viper-forward-Word val com))))) |
18129 | 2889 |
2890 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2891 ;; this is a bit different from Vi, but Vi's end of word |
18129 | 2892 ;; makes no sense whatsoever |
19078 | 2893 (defun viper-end-of-word-kernel () |
2894 (if (viper-end-of-word-p) (forward-char)) | |
2895 (if (viper-looking-at-separator) | |
2896 (viper-skip-all-separators-forward)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2897 |
19078 | 2898 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_")) |
2899 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward))) | |
2900 (viper-backward-char-carefully)) | |
2901 | |
2902 (defun viper-end-of-word-p () | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2903 (or (eobp) |
18129 | 2904 (save-excursion |
19078 | 2905 (cond ((viper-looking-at-alpha) |
18129 | 2906 (forward-char) |
19078 | 2907 (not (viper-looking-at-alpha))) |
2908 ((not (viper-looking-at-alphasep)) | |
18129 | 2909 (forward-char) |
19078 | 2910 (viper-looking-at-alphasep)))))) |
2911 | |
2912 | |
2913 (defun viper-end-of-word (arg &optional careful) | |
18129 | 2914 "Move point to end of current word." |
2915 (interactive "P") | |
19078 | 2916 (viper-leave-region-active) |
2917 (let ((val (viper-p-val arg)) | |
2918 (com (viper-getcom arg))) | |
2919 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2920 (viper-loop val (viper-end-of-word-kernel)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2921 (if com |
18129 | 2922 (progn |
2923 (forward-char) | |
19078 | 2924 (viper-execute-com 'viper-end-of-word val com))))) |
2925 | |
2926 (defun viper-end-of-Word (arg) | |
18129 | 2927 "Forward to end of word delimited by white character." |
2928 (interactive "P") | |
19078 | 2929 (viper-leave-region-active) |
2930 (let ((val (viper-p-val arg)) | |
2931 (com (viper-getcom arg))) | |
2932 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
2933 (viper-loop val | |
2934 (viper-end-of-word-kernel) | |
2935 (viper-skip-nonseparators 'forward) | |
19462 | 2936 (backward-char)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
2937 (if com |
18129 | 2938 (progn |
2939 (forward-char) | |
19078 | 2940 (viper-execute-com 'viper-end-of-Word val com))))) |
2941 | |
2942 (defun viper-backward-word-kernel (val) | |
18129 | 2943 (while (> val 0) |
19462 | 2944 (viper-backward-char-carefully) |
19078 | 2945 (cond ((viper-looking-at-alpha) |
2946 (viper-skip-alpha-backward "_")) | |
2947 ((viper-looking-at-separator) | |
18129 | 2948 (forward-char) |
19078 | 2949 (viper-skip-separators nil) |
19462 | 2950 (viper-backward-char-carefully) |
19078 | 2951 (cond ((viper-looking-at-alpha) |
2952 (viper-skip-alpha-backward "_")) | |
2953 ((not (viper-looking-at-alphasep)) | |
2954 (viper-skip-nonalphasep-backward)) | |
19462 | 2955 ((bobp)) ; could still be at separator, but at beg of buffer |
18129 | 2956 (t (forward-char)))) |
19078 | 2957 ((not (viper-looking-at-alphasep)) |
2958 (viper-skip-nonalphasep-backward))) | |
18129 | 2959 (setq val (1- val)))) |
2960 | |
19078 | 2961 (defun viper-backward-word (arg) |
18129 | 2962 "Backward word." |
2963 (interactive "P") | |
19078 | 2964 (viper-leave-region-active) |
2965 (let ((val (viper-p-val arg)) | |
2966 (com (viper-getcom arg))) | |
18129 | 2967 (if com |
2968 (let (i) | |
2969 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
2970 (backward-char)) | |
19078 | 2971 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2972 (if i (forward-char)))) |
19078 | 2973 (viper-backward-word-kernel val) |
2974 (if com (viper-execute-com 'viper-backward-word val com)))) | |
2975 | |
2976 (defun viper-backward-Word (arg) | |
18129 | 2977 "Backward word delimited by white character." |
2978 (interactive "P") | |
19078 | 2979 (viper-leave-region-active) |
2980 (let ((val (viper-p-val arg)) | |
2981 (com (viper-getcom arg))) | |
18129 | 2982 (if com |
2983 (let (i) | |
2984 (if (setq i (save-excursion (backward-char) (looking-at "\n"))) | |
2985 (backward-char)) | |
19078 | 2986 (viper-move-marker-locally 'viper-com-point (point)) |
18129 | 2987 (if i (forward-char)))) |
19078 | 2988 (viper-loop val |
19462 | 2989 (viper-skip-separators nil) ; nil means backward here |
2990 (viper-skip-nonseparators 'backward)) | |
19078 | 2991 (if com (viper-execute-com 'viper-backward-Word val com)))) |
18129 | 2992 |
2993 | |
2994 | |
2995 ;; line commands | |
2996 | |
19078 | 2997 (defun viper-beginning-of-line (arg) |
18129 | 2998 "Go to beginning of line." |
2999 (interactive "P") | |
19078 | 3000 (viper-leave-region-active) |
3001 (let ((val (viper-p-val arg)) | |
3002 (com (viper-getcom arg))) | |
3003 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3004 (beginning-of-line val) |
19078 | 3005 (if com (viper-execute-com 'viper-beginning-of-line val com)))) |
3006 | |
3007 (defun viper-bol-and-skip-white (arg) | |
18129 | 3008 "Beginning of line at first non-white character." |
3009 (interactive "P") | |
19078 | 3010 (viper-leave-region-active) |
3011 (let ((val (viper-p-val arg)) | |
3012 (com (viper-getcom arg))) | |
3013 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3014 (forward-to-indentation (1- val)) |
19078 | 3015 (if com (viper-execute-com 'viper-bol-and-skip-white val com)))) |
3016 | |
3017 (defun viper-goto-eol (arg) | |
18129 | 3018 "Go to end of line." |
3019 (interactive "P") | |
19078 | 3020 (viper-leave-region-active) |
3021 (let ((val (viper-p-val arg)) | |
3022 (com (viper-getcom arg))) | |
3023 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3024 (end-of-line val) |
19078 | 3025 (if com (viper-execute-com 'viper-goto-eol val com)) |
3026 (if viper-ex-style-motion | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3027 (if (and (eolp) (not (bolp)) |
19078 | 3028 ;; a fix for viper-change-to-eol |
3029 (not (equal viper-current-state 'insert-state))) | |
18129 | 3030 (backward-char 1) |
3031 )))) | |
3032 | |
3033 | |
19078 | 3034 (defun viper-goto-col (arg) |
18129 | 3035 "Go to ARG's column." |
3036 (interactive "P") | |
19078 | 3037 (viper-leave-region-active) |
3038 (let ((val (viper-p-val arg)) | |
3039 (com (viper-getcom arg)) | |
18129 | 3040 line-len) |
19462 | 3041 (setq line-len |
3042 (viper-chars-in-region | |
3043 (viper-line-pos 'start) (viper-line-pos 'end))) | |
19078 | 3044 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3045 (beginning-of-line) |
3046 (forward-char (1- (min line-len val))) | |
3047 (while (> (current-column) (1- val)) | |
3048 (backward-char 1)) | |
19078 | 3049 (if com (viper-execute-com 'viper-goto-col val com)) |
18129 | 3050 (save-excursion |
3051 (end-of-line) | |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3052 (if (> val (current-column)) (error "Viper bell"))) |
18129 | 3053 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3054 |
18129 | 3055 |
19078 | 3056 (defun viper-next-line (arg) |
18129 | 3057 "Go to next line." |
3058 (interactive "P") | |
19078 | 3059 (viper-leave-region-active) |
3060 (let ((val (viper-p-val arg)) | |
3061 (com (viper-getCom arg))) | |
3062 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82467
diff
changeset
|
3063 ;; 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
|
3064 (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
|
3065 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3066 (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
|
3067 (next-line val))) |
19078 | 3068 (if viper-ex-style-motion |
18129 | 3069 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3070 (setq this-command 'next-line) | |
19078 | 3071 (if com (viper-execute-com 'viper-next-line val com)))) |
3072 | |
87691
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
3073 (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
|
3074 (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
|
3075 (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
|
3076 |
19078 | 3077 (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
|
3078 "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
|
3079 If point is on a widget or a button, simulate clicking on that widget/button." |
18129 | 3080 (interactive "P") |
71382
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3081 (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
|
3082 (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
|
3083 (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
|
3084 (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
|
3085 (if (and widget |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3086 (if (symbolp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3087 (get widget 'widget-type) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3088 (and (consp widget) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3089 (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
|
3090 (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
|
3091 (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
|
3092 (push-button) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3093 ;; 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
|
3094 (viper-leave-region-active) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3095 (save-excursion |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3096 (end-of-line) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3097 (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
|
3098 (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
|
3099 (com (viper-getCom arg))) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3100 (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
|
3101 (forward-line val) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3102 (back-to-indentation) |
4033086b16b6
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
3103 (if com (viper-execute-com 'viper-next-line-at-bol val com))))))) |
19078 | 3104 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
3105 |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3106 (defun viper-previous-line (arg) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3107 "Go to previous line." |
18129 | 3108 (interactive "P") |
19078 | 3109 (viper-leave-region-active) |
3110 (let ((val (viper-p-val arg)) | |
3111 (com (viper-getCom arg))) | |
3112 (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
|
3113 ;; 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
|
3114 (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
|
3115 (if (featurep 'emacs) |
eb7532b56b78
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94658
diff
changeset
|
3116 (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
|
3117 (previous-line val))) |
19078 | 3118 (if viper-ex-style-motion |
18129 | 3119 (if (and (eolp) (not (bolp))) (backward-char 1))) |
3120 (setq this-command 'previous-line) | |
19078 | 3121 (if com (viper-execute-com 'viper-previous-line val com)))) |
3122 | |
3123 | |
3124 (defun viper-previous-line-at-bol (arg) | |
18129 | 3125 "Previous line at beginning of line." |
3126 (interactive "P") | |
19078 | 3127 (viper-leave-region-active) |
18129 | 3128 (save-excursion |
3129 (beginning-of-line) | |
3130 (if (bobp) (error "First line in buffer"))) | |
19078 | 3131 (let ((val (viper-p-val arg)) |
3132 (com (viper-getCom arg))) | |
3133 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3134 (forward-line (- val)) |
3135 (back-to-indentation) | |
19078 | 3136 (if com (viper-execute-com 'viper-previous-line val com)))) |
3137 | |
3138 (defun viper-change-to-eol (arg) | |
18129 | 3139 "Change to end of line." |
3140 (interactive "P") | |
19078 | 3141 (viper-goto-eol (cons arg ?c))) |
3142 | |
3143 (defun viper-kill-line (arg) | |
18129 | 3144 "Delete line." |
3145 (interactive "P") | |
19078 | 3146 (viper-goto-eol (cons arg ?d))) |
3147 | |
3148 (defun viper-erase-line (arg) | |
18129 | 3149 "Erase line." |
3150 (interactive "P") | |
19078 | 3151 (viper-beginning-of-line (cons arg ?d))) |
18129 | 3152 |
3153 | |
3154 ;;; Moving around | |
3155 | |
19078 | 3156 (defun viper-goto-line (arg) |
18129 | 3157 "Go to ARG's line. Without ARG go to end of buffer." |
3158 (interactive "P") | |
19078 | 3159 (let ((val (viper-P-val arg)) |
3160 (com (viper-getCom arg))) | |
3161 (viper-move-marker-locally 'viper-com-point (point)) | |
3162 (viper-deactivate-mark) | |
18129 | 3163 (push-mark nil t) |
3164 (if (null val) | |
3165 (goto-char (point-max)) | |
3166 (goto-char (point-min)) | |
3167 (forward-line (1- val))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3168 |
18129 | 3169 ;; positioning is done twice: before and after command execution |
3170 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3171 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3172 |
19078 | 3173 (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
|
3174 |
18129 | 3175 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3176 (back-to-indentation) | |
3177 )) | |
3178 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3179 ;; Find ARG's occurrence of CHAR on the current line. |
18129 | 3180 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to |
3181 ;; adjust point after search. | |
19078 | 3182 (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
|
3183 (or (char-or-string-p char) (error "Viper bell")) |
18129 | 3184 (let ((arg (if forward arg (- arg))) |
19078 | 3185 (cmd (if (eq viper-intermediate-command 'viper-repeat) |
3186 (nth 5 viper-d-com) | |
3187 (viper-array-to-string (this-command-keys)))) | |
21940 | 3188 point region-beg region-end) |
18129 | 3189 (save-excursion |
3190 (save-restriction | |
21940 | 3191 (if (> arg 0) ; forward |
3192 (progn | |
3193 (setq region-beg (point)) | |
3194 (if viper-allow-multiline-replace-regions | |
3195 (viper-forward-paragraph 1) | |
3196 (end-of-line)) | |
3197 (setq region-end (point))) | |
3198 (setq region-end (point)) | |
3199 (if viper-allow-multiline-replace-regions | |
3200 (viper-backward-paragraph 1) | |
3201 (beginning-of-line)) | |
3202 (setq region-beg (point))) | |
3203 (if (or (and (< arg 0) | |
3204 (< (- region-end region-beg) | |
3205 (if viper-allow-multiline-replace-regions | |
3206 2 1)) | |
3207 (bolp)) | |
3208 (and (> arg 0) | |
3209 (< (- region-end region-beg) | |
3210 (if viper-allow-multiline-replace-regions | |
3211 3 2)) | |
3212 (eolp))) | |
3213 (error "Command `%s': At %s of %s" | |
3214 cmd | |
3215 (if (> arg 0) "end" "beginning") | |
3216 (if viper-allow-multiline-replace-regions | |
3217 "paragraph" "line"))) | |
3218 (narrow-to-region region-beg region-end) | |
18129 | 3219 ;; if arg > 0, point is forwarded before search. |
3220 (if (> arg 0) (goto-char (1+ (point-min))) | |
3221 (goto-char (point-max))) | |
3222 (if (let ((case-fold-search nil)) | |
3223 (search-forward (char-to-string char) nil 0 arg)) | |
3224 (setq point (point)) | |
3225 (error "Command `%s': `%c' not found" cmd char)))) | |
19462 | 3226 (goto-char point) |
3227 (if (> arg 0) | |
3228 (backward-char (if offset 2 1)) | |
3229 (forward-char (if offset 1 0))))) | |
18129 | 3230 |
19078 | 3231 (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
|
3232 "Find char on the line. |
18129 | 3233 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
|
3234 called from viper-repeat, the char last used is used. This behavior is |
18129 | 3235 controlled by the sign of prefix numeric value." |
3236 (interactive "P") | |
19078 | 3237 (let ((val (viper-p-val arg)) |
3238 (com (viper-getcom arg)) | |
3239 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3240 (if (> val 0) |
3241 ;; this means that the function was called interactively | |
19078 | 3242 (setq viper-f-char (read-char) |
3243 viper-f-forward t | |
3244 viper-f-offset nil) | |
3245 ;; viper-repeat --- set viper-F-char from command-keys | |
3246 (setq viper-F-char (if (stringp cmd-representation) | |
3247 (viper-seq-last-elt cmd-representation) | |
3248 viper-F-char) | |
3249 viper-f-char viper-F-char) | |
18129 | 3250 (setq val (- val))) |
19078 | 3251 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3252 (viper-find-char | |
3253 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil) | |
18129 | 3254 (setq val (- val)) |
3255 (if com | |
3256 (progn | |
19078 | 3257 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3258 (forward-char) |
19078 | 3259 (viper-execute-com 'viper-find-char-forward val com))))) |
3260 | |
3261 (defun viper-goto-char-forward (arg) | |
18129 | 3262 "Go up to char ARG forward on line." |
3263 (interactive "P") | |
19078 | 3264 (let ((val (viper-p-val arg)) |
3265 (com (viper-getcom arg)) | |
3266 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3267 (if (> val 0) |
3268 ;; this means that the function was called interactively | |
19078 | 3269 (setq viper-f-char (read-char) |
3270 viper-f-forward t | |
3271 viper-f-offset t) | |
3272 ;; viper-repeat --- set viper-F-char from command-keys | |
3273 (setq viper-F-char (if (stringp cmd-representation) | |
3274 (viper-seq-last-elt cmd-representation) | |
3275 viper-F-char) | |
3276 viper-f-char viper-F-char) | |
18129 | 3277 (setq val (- val))) |
19078 | 3278 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3279 (viper-find-char | |
3280 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t) | |
18129 | 3281 (setq val (- val)) |
3282 (if com | |
3283 (progn | |
19078 | 3284 (setq viper-F-char viper-f-char) ; set new viper-F-char |
18129 | 3285 (forward-char) |
19078 | 3286 (viper-execute-com 'viper-goto-char-forward val com))))) |
3287 | |
3288 (defun viper-find-char-backward (arg) | |
18129 | 3289 "Find char ARG on line backward." |
3290 (interactive "P") | |
19078 | 3291 (let ((val (viper-p-val arg)) |
3292 (com (viper-getcom arg)) | |
3293 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3294 (if (> val 0) |
3295 ;; this means that the function was called interactively | |
19078 | 3296 (setq viper-f-char (read-char) |
3297 viper-f-forward nil | |
3298 viper-f-offset nil) | |
3299 ;; viper-repeat --- set viper-F-char from command-keys | |
3300 (setq viper-F-char (if (stringp cmd-representation) | |
3301 (viper-seq-last-elt cmd-representation) | |
3302 viper-F-char) | |
3303 viper-f-char viper-F-char) | |
18129 | 3304 (setq val (- val))) |
19078 | 3305 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3306 (viper-find-char | |
3307 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil) | |
18129 | 3308 (setq val (- val)) |
3309 (if com | |
3310 (progn | |
19078 | 3311 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3312 (viper-execute-com 'viper-find-char-backward val com))))) | |
3313 | |
3314 (defun viper-goto-char-backward (arg) | |
18129 | 3315 "Go up to char ARG backward on line." |
3316 (interactive "P") | |
19078 | 3317 (let ((val (viper-p-val arg)) |
3318 (com (viper-getcom arg)) | |
3319 (cmd-representation (nth 5 viper-d-com))) | |
18129 | 3320 (if (> val 0) |
3321 ;; this means that the function was called interactively | |
19078 | 3322 (setq viper-f-char (read-char) |
3323 viper-f-forward nil | |
3324 viper-f-offset t) | |
3325 ;; viper-repeat --- set viper-F-char from command-keys | |
3326 (setq viper-F-char (if (stringp cmd-representation) | |
3327 (viper-seq-last-elt cmd-representation) | |
3328 viper-F-char) | |
3329 viper-f-char viper-F-char) | |
18129 | 3330 (setq val (- val))) |
19078 | 3331 (if com (viper-move-marker-locally 'viper-com-point (point))) |
3332 (viper-find-char | |
3333 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t) | |
18129 | 3334 (setq val (- val)) |
3335 (if com | |
3336 (progn | |
19078 | 3337 (setq viper-F-char viper-f-char) ; set new viper-F-char |
3338 (viper-execute-com 'viper-goto-char-backward val com))))) | |
3339 | |
3340 (defun viper-repeat-find (arg) | |
18129 | 3341 "Repeat previous find command." |
3342 (interactive "P") | |
19078 | 3343 (let ((val (viper-p-val arg)) |
3344 (com (viper-getcom arg))) | |
3345 (viper-deactivate-mark) | |
3346 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3347 (viper-find-char val viper-f-char viper-f-forward viper-f-offset) | |
18129 | 3348 (if com |
3349 (progn | |
19078 | 3350 (if viper-f-forward (forward-char)) |
3351 (viper-execute-com 'viper-repeat-find val com))))) | |
3352 | |
3353 (defun viper-repeat-find-opposite (arg) | |
18129 | 3354 "Repeat previous find command in the opposite direction." |
3355 (interactive "P") | |
19078 | 3356 (let ((val (viper-p-val arg)) |
3357 (com (viper-getcom arg))) | |
3358 (viper-deactivate-mark) | |
3359 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3360 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset) | |
18129 | 3361 (if com |
3362 (progn | |
19078 | 3363 (if viper-f-forward (forward-char)) |
3364 (viper-execute-com 'viper-repeat-find-opposite val com))))) | |
18129 | 3365 |
3366 | |
3367 ;; window scrolling etc. | |
3368 | |
19078 | 3369 (defun viper-window-top (arg) |
18129 | 3370 "Go to home window line." |
3371 (interactive "P") | |
19078 | 3372 (let ((val (viper-p-val arg)) |
3373 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3374 (viper-leave-region-active) |
19078 | 3375 (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
|
3376 (push-mark nil t) |
18129 | 3377 (move-to-window-line (1- val)) |
3378 | |
3379 ;; positioning is done twice: before and after command execution | |
3380 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3381 (back-to-indentation) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3382 |
19078 | 3383 (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
|
3384 |
18129 | 3385 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3386 (back-to-indentation) | |
3387 )) | |
3388 | |
19078 | 3389 (defun viper-window-middle (arg) |
18129 | 3390 "Go to middle window line." |
3391 (interactive "P") | |
19078 | 3392 (let ((val (viper-p-val arg)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3393 (com (viper-getCom arg))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3394 (viper-leave-region-active) |
19078 | 3395 (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
|
3396 (push-mark nil t) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3397 (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
|
3398 |
18129 | 3399 ;; positioning is done twice: before and after command execution |
3400 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3401 (back-to-indentation) | |
3402 | |
19078 | 3403 (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
|
3404 |
18129 | 3405 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3406 (back-to-indentation) | |
3407 )) | |
3408 | |
19078 | 3409 (defun viper-window-bottom (arg) |
18129 | 3410 "Go to last window line." |
3411 (interactive "P") | |
19078 | 3412 (let ((val (viper-p-val arg)) |
3413 (com (viper-getCom arg))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3414 (viper-leave-region-active) |
19078 | 3415 (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
|
3416 (push-mark nil t) |
18129 | 3417 (move-to-window-line (- val)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3418 |
18129 | 3419 ;; positioning is done twice: before and after command execution |
3420 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) | |
3421 (back-to-indentation) | |
3422 | |
19078 | 3423 (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
|
3424 |
18129 | 3425 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) |
3426 (back-to-indentation) | |
3427 )) | |
3428 | |
19078 | 3429 (defun viper-line-to-top (arg) |
18129 | 3430 "Put current line on the home line." |
3431 (interactive "p") | |
3432 (recenter (1- arg))) | |
3433 | |
19078 | 3434 (defun viper-line-to-middle (arg) |
18129 | 3435 "Put current line on the middle line." |
3436 (interactive "p") | |
3437 (recenter (+ (1- arg) (/ (1- (window-height)) 2)))) | |
3438 | |
19078 | 3439 (defun viper-line-to-bottom (arg) |
18129 | 3440 "Put current line on the last line." |
3441 (interactive "p") | |
3442 (recenter (- (window-height) (1+ arg)))) | |
3443 | |
19078 | 3444 ;; If point is within viper-search-scroll-threshold of window top or bottom, |
18129 | 3445 ;; 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
|
3446 ;; 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
|
3447 ;; (which is called from viper-search-forward/backward/next). If the value of |
19078 | 3448 ;; viper-search-scroll-threshold is negative - don't scroll. |
3449 (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
|
3450 (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
|
3451 (window-displayed-height) |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
3452 (1- (window-height)))) ; adjust for modeline |
18129 | 3453 (pt (point)) |
3454 at-top-p at-bottom-p | |
3455 min-scroll direction) | |
3456 (save-excursion | |
3457 (move-to-window-line 0) ; top | |
3458 (setq at-top-p | |
3459 (<= (count-lines pt (point)) | |
19078 | 3460 viper-search-scroll-threshold)) |
18129 | 3461 (move-to-window-line -1) ; bottom |
3462 (setq at-bottom-p | |
92379
3b2c0edcb428
(zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
87691
diff
changeset
|
3463 (<= (count-lines pt (point)) viper-search-scroll-threshold))) |
19078 | 3464 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold) |
18129 | 3465 direction 1)) |
19078 | 3466 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold) |
18129 | 3467 direction -1))) |
3468 (if min-scroll | |
3469 (recenter | |
3470 (* (max min-scroll (/ win-height 7)) direction))) | |
3471 )) | |
3472 | |
3473 | |
3474 ;; paren match | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3475 ;; must correct this to only match ( to ) etc. On the other hand |
18129 | 3476 ;; 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
|
3477 ;; catch _all_ imbalances. |
18129 | 3478 |
19078 | 3479 (defun viper-paren-match (arg) |
18129 | 3480 "Go to the matching parenthesis." |
3481 (interactive "P") | |
19078 | 3482 (viper-leave-region-active) |
3483 (let ((com (viper-getcom arg)) | |
3484 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments) | |
18129 | 3485 anchor-point) |
3486 (if (integerp arg) | |
3487 (if (or (> arg 99) (< arg 1)) | |
3488 (error "Prefix must be between 1 and 99") | |
3489 (goto-char | |
3490 (if (> (point-max) 80000) | |
3491 (* (/ (point-max) 100) arg) | |
3492 (/ (* (point-max) arg) 100))) | |
3493 (back-to-indentation)) | |
3494 (let (beg-lim end-lim) | |
3495 (if (and (eolp) (not (bolp))) (forward-char -1)) | |
3496 (if (not (looking-at "[][(){}]")) | |
3497 (setq anchor-point (point))) | |
3498 (save-excursion | |
3499 (beginning-of-line) | |
3500 (setq beg-lim (point)) | |
3501 (end-of-line) | |
3502 (setq end-lim (point))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3503 (cond ((re-search-forward "[][(){}]" end-lim t) |
18129 | 3504 (backward-char) ) |
3505 ((re-search-backward "[][(){}]" beg-lim t)) | |
3506 (t | |
3507 (error "No matching character on line")))) | |
3508 (cond ((looking-at "[\(\[{]") | |
19078 | 3509 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3510 (forward-sexp 1) |
3511 (if com | |
19078 | 3512 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3513 (backward-char))) |
3514 (anchor-point | |
3515 (if com | |
3516 (progn | |
19078 | 3517 (viper-move-marker-locally 'viper-com-point anchor-point) |
18129 | 3518 (forward-char 1) |
19078 | 3519 (viper-execute-com 'viper-paren-match nil com) |
18129 | 3520 ))) |
3521 ((looking-at "[])}]") | |
3522 (forward-char) | |
19078 | 3523 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3524 (backward-sexp 1) |
19078 | 3525 (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
|
3526 (t (error "Viper bell")))))) |
18129 | 3527 |
19078 | 3528 (defun viper-toggle-parse-sexp-ignore-comments () |
18129 | 3529 (interactive) |
19078 | 3530 (setq viper-parse-sexp-ignore-comments |
3531 (not viper-parse-sexp-ignore-comments)) | |
18839 | 3532 (princ (format |
3533 "From now on, `%%' will %signore parentheses inside comment fields" | |
19078 | 3534 (if viper-parse-sexp-ignore-comments "" "NOT ")))) |
18129 | 3535 |
3536 | |
21940 | 3537 ;; sentence, paragraph and heading |
18129 | 3538 |
19078 | 3539 (defun viper-forward-sentence (arg) |
18129 | 3540 "Forward sentence." |
3541 (interactive "P") | |
20003 | 3542 (or (eq last-command this-command) |
3543 (push-mark nil t)) | |
19078 | 3544 (let ((val (viper-p-val arg)) |
3545 (com (viper-getcom arg))) | |
3546 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3547 (forward-sentence val) |
19078 | 3548 (if com (viper-execute-com 'viper-forward-sentence nil com)))) |
3549 | |
3550 (defun viper-backward-sentence (arg) | |
18129 | 3551 "Backward sentence." |
3552 (interactive "P") | |
20003 | 3553 (or (eq last-command this-command) |
3554 (push-mark nil t)) | |
19078 | 3555 (let ((val (viper-p-val arg)) |
3556 (com (viper-getcom arg))) | |
3557 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3558 (backward-sentence val) |
19078 | 3559 (if com (viper-execute-com 'viper-backward-sentence nil com)))) |
3560 | |
3561 (defun viper-forward-paragraph (arg) | |
18129 | 3562 "Forward paragraph." |
3563 (interactive "P") | |
20003 | 3564 (or (eq last-command this-command) |
3565 (push-mark nil t)) | |
19078 | 3566 (let ((val (viper-p-val arg)) |
21940 | 3567 ;; if you want d} operate on whole lines, change viper-getcom to |
3568 ;; viper-getCom below | |
3569 (com (viper-getcom arg))) | |
19078 | 3570 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3571 (forward-paragraph val) |
3572 (if com | |
3573 (progn | |
3574 (backward-char 1) | |
19078 | 3575 (viper-execute-com 'viper-forward-paragraph nil com))))) |
3576 | |
3577 (defun viper-backward-paragraph (arg) | |
18129 | 3578 "Backward paragraph." |
3579 (interactive "P") | |
20003 | 3580 (or (eq last-command this-command) |
3581 (push-mark nil t)) | |
19078 | 3582 (let ((val (viper-p-val arg)) |
21940 | 3583 ;; if you want d{ operate on whole lines, change viper-getcom to |
3584 ;; viper-getCom below | |
3585 (com (viper-getcom arg))) | |
19078 | 3586 (if com (viper-move-marker-locally 'viper-com-point (point))) |
18129 | 3587 (backward-paragraph val) |
3588 (if com | |
3589 (progn | |
3590 (forward-char 1) | |
19078 | 3591 (viper-execute-com 'viper-backward-paragraph nil com) |
18129 | 3592 (backward-char 1))))) |
3593 | |
20003 | 3594 ;; should be mode-specific |
19078 | 3595 (defun viper-prev-heading (arg) |
18129 | 3596 (interactive "P") |
19078 | 3597 (let ((val (viper-p-val arg)) |
3598 (com (viper-getCom arg))) | |
3599 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3600 (re-search-backward viper-heading-start nil t val) | |
18129 | 3601 (goto-char (match-beginning 0)) |
19078 | 3602 (if com (viper-execute-com 'viper-prev-heading nil com)))) |
3603 | |
3604 (defun viper-heading-end (arg) | |
18129 | 3605 (interactive "P") |
19078 | 3606 (let ((val (viper-p-val arg)) |
3607 (com (viper-getCom arg))) | |
3608 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
3609 (re-search-forward viper-heading-end nil t val) | |
18129 | 3610 (goto-char (match-beginning 0)) |
19078 | 3611 (if com (viper-execute-com 'viper-heading-end nil com)))) |
3612 | |
3613 (defun viper-next-heading (arg) | |
18129 | 3614 (interactive "P") |
19078 | 3615 (let ((val (viper-p-val arg)) |
3616 (com (viper-getCom arg))) | |
3617 (if com (viper-move-marker-locally 'viper-com-point (point))) | |
18129 | 3618 (end-of-line) |
19078 | 3619 (re-search-forward viper-heading-start nil t val) |
18129 | 3620 (goto-char (match-beginning 0)) |
19078 | 3621 (if com (viper-execute-com 'viper-next-heading nil com)))) |
18129 | 3622 |
3623 | |
3624 ;; scrolling | |
3625 | |
19078 | 3626 (defun viper-scroll-screen (arg) |
18129 | 3627 "Scroll to next screen." |
3628 (interactive "p") | |
3629 (condition-case nil | |
3630 (if (> arg 0) | |
3631 (while (> arg 0) | |
3632 (scroll-up) | |
3633 (setq arg (1- arg))) | |
3634 (while (> 0 arg) | |
3635 (scroll-down) | |
3636 (setq arg (1+ arg)))) | |
3637 (error (beep 1) | |
3638 (if (> arg 0) | |
3639 (progn | |
3640 (message "End of buffer") | |
3641 (goto-char (point-max))) | |
3642 (message "Beginning of buffer") | |
3643 (goto-char (point-min)))) | |
3644 )) | |
3645 | |
19078 | 3646 (defun viper-scroll-screen-back (arg) |
18129 | 3647 "Scroll to previous screen." |
3648 (interactive "p") | |
19078 | 3649 (viper-scroll-screen (- arg))) |
3650 | |
3651 (defun viper-scroll-down (arg) | |
18129 | 3652 "Pull down half screen." |
3653 (interactive "P") | |
3654 (condition-case nil | |
3655 (if (null arg) | |
3656 (scroll-down (/ (window-height) 2)) | |
3657 (scroll-down arg)) | |
3658 (error (beep 1) | |
3659 (message "Beginning of buffer") | |
3660 (goto-char (point-min))))) | |
3661 | |
19078 | 3662 (defun viper-scroll-down-one (arg) |
18129 | 3663 "Scroll up one line." |
3664 (interactive "p") | |
3665 (scroll-down arg)) | |
3666 | |
19078 | 3667 (defun viper-scroll-up (arg) |
18129 | 3668 "Pull up half screen." |
3669 (interactive "P") | |
3670 (condition-case nil | |
3671 (if (null arg) | |
3672 (scroll-up (/ (window-height) 2)) | |
3673 (scroll-up arg)) | |
3674 (error (beep 1) | |
3675 (message "End of buffer") | |
3676 (goto-char (point-max))))) | |
3677 | |
19078 | 3678 (defun viper-scroll-up-one (arg) |
18129 | 3679 "Scroll down one line." |
3680 (interactive "p") | |
3681 (scroll-up arg)) | |
3682 | |
3683 | |
3684 ;; searching | |
3685 | |
104277
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3686 (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
|
3687 "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
|
3688 (interactive) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3689 (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
|
3690 |
19078 | 3691 (defun viper-if-string (prompt) |
3692 (if (memq viper-intermediate-command | |
3693 '(viper-command-argument viper-digit-argument viper-repeat)) | |
3694 (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
|
3695 (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
|
3696 (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
|
3697 keymap)) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3698 (s (viper-read-string-with-history |
18129 | 3699 prompt |
3700 nil ; no initial | |
19078 | 3701 'viper-search-history |
104277
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3702 (car viper-search-history) |
affb617d6101
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
101013
diff
changeset
|
3703 keymap))) |
18129 | 3704 (if (not (string= s "")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3705 (setq viper-s-string s)))) |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3706 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3707 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3708 (defun viper-toggle-search-style (arg) |
19078 | 3709 "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
|
3710 Without prefix argument, will ask which search style to toggle. With prefix |
19078 | 3711 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search. |
3712 | |
3713 Although this function is bound to \\[viper-toggle-search-style], the most | |
18129 | 3714 convenient way to use it is to bind `//' to the macro |
19078 | 3715 `1 M-x viper-toggle-search-style' and `///' to |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3716 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will |
18129 | 3717 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
|
3718 search. Macros are more convenient in this case because they don't affect |
18129 | 3719 the Emacs binding of `/'." |
3720 (interactive "P") | |
3721 (let (msg) | |
3722 (cond ((or (eq arg 1) | |
3723 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3724 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3725 (if viper-case-fold-search |
18129 | 3726 "case-insensitive" "case-sensitive") |
19078 | 3727 (if viper-case-fold-search |
18129 | 3728 "case-sensitive" |
3729 "case-insensitive"))))) | |
19078 | 3730 (setq viper-case-fold-search (null viper-case-fold-search)) |
3731 (if viper-case-fold-search | |
18129 | 3732 (setq msg "Search becomes case-insensitive") |
3733 (setq msg "Search becomes case-sensitive"))) | |
3734 ((or (eq arg 2) | |
3735 (and (null arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
3736 (y-or-n-p (format "Search style: '%s'. Want '%s'? " |
19078 | 3737 (if viper-re-search |
18129 | 3738 "regexp-search" "vanilla-search") |
19078 | 3739 (if viper-re-search |
18129 | 3740 "vanilla-search" |
3741 "regexp-search"))))) | |
19078 | 3742 (setq viper-re-search (null viper-re-search)) |
3743 (if viper-re-search | |
18129 | 3744 (setq msg "Search becomes regexp-style") |
3745 (setq msg "Search becomes vanilla-style"))) | |
3746 (t | |
3747 (setq msg "Search style remains unchanged"))) | |
18839 | 3748 (princ msg t))) |
3749 | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3750 (defun viper-set-searchstyle-toggling-macros (unset &optional major-mode) |
18129 | 3751 "Set the macros for toggling the search style in Viper's vi-state. |
3752 The macro that toggles case sensitivity is bound to `//', and the one that | |
3753 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
|
3754 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
|
3755 If MAJOR-MODE is set, set the macros only in that major mode." |
18129 | 3756 (interactive "P") |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3757 (let (scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3758 (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
|
3759 (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
|
3760 (setq scope 't)) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3761 (or noninteractive |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3762 (if (not unset) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3763 (progn |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3764 ;; 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
|
3765 (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
|
3766 "//" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3767 [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
|
3768 scope) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3769 ;; 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
|
3770 (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
|
3771 "///" 'vi-state |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3772 [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
|
3773 scope) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
104277
diff
changeset
|
3774 (if (called-interactively-p 'interactive) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3775 (message |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3776 "// 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
|
3777 (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
|
3778 (sit-for 2) |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3779 (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
|
3780 )) |
63268
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3781 |
b9bfb8457681
(viper-find-char-forward): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62440
diff
changeset
|
3782 |
19078 | 3783 (defun viper-set-parsing-style-toggling-macro (unset) |
18839 | 3784 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses. |
3785 This is used in conjunction with the `%' command. | |
3786 | |
3787 With a prefix argument, unsets the macro." | |
3788 (interactive "P") | |
3789 (or noninteractive | |
3790 (if (not unset) | |
3791 (progn | |
3792 ;; Make %%% toggle parsing comments for matching parentheses | |
19078 | 3793 (viper-record-kbd-macro |
18839 | 3794 "%%%" 'vi-state |
19078 | 3795 [(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 | 3796 't) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
104277
diff
changeset
|
3797 (if (called-interactively-p 'interactive) |
18839 | 3798 (message |
3799 "%%%%%% now toggles whether comments should be parsed for matching parentheses"))) | |
19078 | 3800 (viper-unrecord-kbd-macro "%%%" 'vi-state)))) |
3801 | |
3802 | |
3803 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode) | |
18129 | 3804 "Set the macros for toggling the search style in Viper's emacs-state. |
3805 The macro that toggles case sensitivity is bound to `//', and the one that | |
3806 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
|
3807 With a prefix argument, this function unsets the macros. |
18129 | 3808 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
|
3809 this sets the macros only in the macros in that major mode. Otherwise, |
18129 | 3810 the macros are set in the current major mode. |
3811 \(When unsetting the macros, the second argument has no effect.\)" | |
3812 (interactive "P") | |
3813 (or noninteractive | |
3814 (if (not unset) | |
3815 (progn | |
3816 ;; toggle case sensitivity in search | |
19078 | 3817 (viper-record-kbd-macro |
18129 | 3818 "//" 'emacs-state |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3819 [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 | 3820 (or arg-majormode major-mode)) |
3821 ;; toggle regexp/vanila search | |
19078 | 3822 (viper-record-kbd-macro |
18129 | 3823 "///" 'emacs-state |
19078 | 3824 [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 | 3825 (or arg-majormode major-mode)) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
104277
diff
changeset
|
3826 (if (called-interactively-p 'interactive) |
18129 | 3827 (message |
3828 "// and /// now toggle case-sensitivity and regexp search."))) | |
19078 | 3829 (viper-unrecord-kbd-macro "//" 'emacs-state) |
18129 | 3830 (sit-for 2) |
19078 | 3831 (viper-unrecord-kbd-macro "///" 'emacs-state)))) |
3832 | |
3833 | |
3834 (defun viper-search-forward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3835 "Search a string forward. |
18129 | 3836 ARG is used to find the ARG's occurrence of the string. |
3837 Null string will repeat previous search." | |
3838 (interactive "P") | |
19078 | 3839 (let ((val (viper-P-val arg)) |
3840 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3841 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3842 debug-on-error) |
19078 | 3843 (setq viper-s-forward t) |
3844 (viper-if-string "/") | |
18129 | 3845 ;; this is not used at present, but may be used later |
19078 | 3846 (if (or (not (equal old-str viper-s-string)) |
3847 (not (markerp viper-local-search-start-marker)) | |
3848 (not (marker-buffer viper-local-search-start-marker))) | |
3849 (setq viper-local-search-start-marker (point-marker))) | |
3850 (viper-search viper-s-string t val) | |
18129 | 3851 (if com |
3852 (progn | |
19078 | 3853 (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
|
3854 (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
|
3855 )) |
19078 | 3856 |
3857 (defun viper-search-backward (arg) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3858 "Search a string backward. |
18129 | 3859 ARG is used to find the ARG's occurrence of the string. |
3860 Null string will repeat previous search." | |
3861 (interactive "P") | |
19078 | 3862 (let ((val (viper-P-val arg)) |
3863 (com (viper-getcom arg)) | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3864 (old-str viper-s-string) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3865 debug-on-error) |
19078 | 3866 (setq viper-s-forward nil) |
3867 (viper-if-string "?") | |
18129 | 3868 ;; this is not used at present, but may be used later |
19078 | 3869 (if (or (not (equal old-str viper-s-string)) |
3870 (not (markerp viper-local-search-start-marker)) | |
3871 (not (marker-buffer viper-local-search-start-marker))) | |
3872 (setq viper-local-search-start-marker (point-marker))) | |
3873 (viper-search viper-s-string nil val) | |
18129 | 3874 (if com |
3875 (progn | |
19078 | 3876 (viper-move-marker-locally 'viper-com-point (mark t)) |
3877 (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
|
3878 |
18129 | 3879 |
3880 ;; Search for COUNT's occurrence of STRING. | |
3881 ;; Search is forward if FORWARD is non-nil, otherwise backward. | |
3882 ;; INIT-POINT is the position where search is to start. | |
3883 ;; Arguments: | |
3884 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND) | |
19078 | 3885 (defun viper-search (string forward arg |
3886 &optional no-offset init-point fail-if-not-found) | |
18129 | 3887 (if (not (equal string "")) |
19078 | 3888 (let ((val (viper-p-val arg)) |
3889 (com (viper-getcom arg)) | |
18129 | 3890 (offset (not no-offset)) |
19078 | 3891 (case-fold-search viper-case-fold-search) |
18129 | 3892 (start-point (or init-point (point)))) |
19078 | 3893 (viper-deactivate-mark) |
18129 | 3894 (if forward |
3895 (condition-case nil | |
3896 (progn | |
19078 | 3897 (if offset (viper-forward-char-carefully)) |
3898 (if viper-re-search | |
18129 | 3899 (progn |
3900 (re-search-forward string nil nil val) | |
3901 (re-search-backward string)) | |
3902 (search-forward string nil nil val) | |
3903 (search-backward string)) | |
3904 (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
|
3905 (push-mark start-point t))) |
18129 | 3906 (search-failed |
93773
d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
93615
diff
changeset
|
3907 (if (and (not fail-if-not-found) viper-search-wrap-around) |
18129 | 3908 (progn |
3909 (message "Search wrapped around BOTTOM of buffer") | |
3910 (goto-char (point-min)) | |
19078 | 3911 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3912 ;; don't wait in macros |
19078 | 3913 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3914 (memq viper-intermediate-command |
19078 | 3915 '(viper-repeat |
3916 viper-digit-argument | |
3917 viper-command-argument)) | |
3918 (sit-for 2)) | |
18129 | 3919 ;; delete the wrap-around message |
3920 (message "") | |
3921 ) | |
3922 (goto-char start-point) | |
3923 (error "`%s': %s not found" | |
3924 string | |
19078 | 3925 (if viper-re-search "Pattern" "String")) |
18129 | 3926 ))) |
3927 ;; backward | |
3928 (condition-case nil | |
3929 (progn | |
19078 | 3930 (if viper-re-search |
18129 | 3931 (re-search-backward string nil nil val) |
3932 (search-backward string nil nil val)) | |
3933 (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
|
3934 (push-mark start-point t))) |
18129 | 3935 (search-failed |
93773
d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
93615
diff
changeset
|
3936 (if (and (not fail-if-not-found) viper-search-wrap-around) |
18129 | 3937 (progn |
3938 (message "Search wrapped around TOP of buffer") | |
3939 (goto-char (point-max)) | |
19078 | 3940 (viper-search string forward (cons 1 com) t start-point 'fail) |
18129 | 3941 ;; don't wait in macros |
19078 | 3942 (or executing-kbd-macro |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3943 (memq viper-intermediate-command |
19078 | 3944 '(viper-repeat |
3945 viper-digit-argument | |
3946 viper-command-argument)) | |
3947 (sit-for 2)) | |
18129 | 3948 ;; delete the wrap-around message |
3949 (message "") | |
3950 ) | |
3951 (goto-char start-point) | |
3952 (error "`%s': %s not found" | |
3953 string | |
19078 | 3954 (if viper-re-search "Pattern" "String")) |
18129 | 3955 )))) |
3956 ;; pull up or down if at top/bottom of window | |
19078 | 3957 (viper-adjust-window) |
18129 | 3958 ;; highlight the result of search |
3959 ;; don't wait and don't highlight in macros | |
3960 (or executing-kbd-macro | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
3961 (memq viper-intermediate-command |
19078 | 3962 '(viper-repeat viper-digit-argument viper-command-argument)) |
3963 (viper-flash-search-pattern)) | |
18129 | 3964 ))) |
3965 | |
19078 | 3966 (defun viper-search-next (arg) |
18129 | 3967 "Repeat previous search." |
3968 (interactive "P") | |
19078 | 3969 (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
|
3970 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3971 debug-on-error) |
72516
aba79a1f03ed
2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
71382
diff
changeset
|
3972 (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
|
3973 (error viper-NoPrevSearch)) |
19078 | 3974 (viper-search viper-s-string viper-s-forward arg) |
18129 | 3975 (if com |
3976 (progn | |
19078 | 3977 (viper-move-marker-locally 'viper-com-point (mark t)) |
3978 (viper-execute-com 'viper-search-next val com))))) | |
3979 | |
3980 (defun viper-search-Next (arg) | |
18129 | 3981 "Repeat previous search in the reverse direction." |
3982 (interactive "P") | |
19078 | 3983 (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
|
3984 (com (viper-getcom arg)) |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64085
diff
changeset
|
3985 debug-on-error) |
19078 | 3986 (if (null viper-s-string) (error viper-NoPrevSearch)) |
3987 (viper-search viper-s-string (not viper-s-forward) arg) | |
18129 | 3988 (if com |
3989 (progn | |
19078 | 3990 (viper-move-marker-locally 'viper-com-point (mark t)) |
3991 (viper-execute-com 'viper-search-Next val com))))) | |
18129 | 3992 |
3993 | |
3994 ;; Search contents of buffer defined by one of Viper's motion commands. | |
3995 ;; Repeatable via `n' and `N'. | |
19078 | 3996 (defun viper-buffer-search-enable (&optional c) |
3997 (cond (c (setq viper-buffer-search-char c)) | |
3998 ((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
|
3999 ;; ?g acts as a default value for viper-buffer-search-char |
19078 | 4000 (setq viper-buffer-search-char ?g))) |
4001 (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
|
4002 (cond ((viper-characterp viper-buffer-search-char) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4003 (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
|
4004 (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
|
4005 viper-buffer-search-char))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4006 'viper-command-argument) |
19078 | 4007 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search) |
4008 (setq viper-prefix-commands | |
4009 (cons viper-buffer-search-char viper-prefix-commands))) | |
18129 | 4010 |
4011 ;; This is a Viper wraper for isearch-forward. | |
19078 | 4012 (defun viper-isearch-forward (arg) |
18129 | 4013 "Do incremental search forward." |
4014 (interactive "P") | |
4015 ;; emacs bug workaround | |
4016 (if (listp arg) (setq arg (car arg))) | |
19078 | 4017 (viper-exec-form-in-emacs (list 'isearch-forward arg))) |
18129 | 4018 |
4019 ;; This is a Viper wraper for isearch-backward." | |
19078 | 4020 (defun viper-isearch-backward (arg) |
18129 | 4021 "Do incremental search backward." |
4022 (interactive "P") | |
4023 ;; emacs bug workaround | |
4024 (if (listp arg) (setq arg (car arg))) | |
19078 | 4025 (viper-exec-form-in-emacs (list 'isearch-backward arg))) |
18129 | 4026 |
4027 | |
4028 ;; visiting and killing files, buffers | |
4029 | |
19078 | 4030 (defun viper-switch-to-buffer () |
18129 | 4031 "Switch to buffer in the current window." |
4032 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4033 (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
|
4034 buffer) |
18129 | 4035 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4036 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4037 "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
|
4038 (switch-to-buffer buffer))) |
18129 | 4039 |
19078 | 4040 (defun viper-switch-to-buffer-other-window () |
18129 | 4041 "Switch to buffer in another window." |
4042 (interactive) | |
22283
3649674ebf29
(viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
4043 (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
|
4044 buffer) |
18129 | 4045 (setq buffer |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4046 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4047 "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
|
4048 (switch-to-buffer-other-window buffer))) |
18129 | 4049 |
19078 | 4050 (defun viper-kill-buffer () |
18129 | 4051 "Kill a buffer." |
4052 (interactive) | |
4053 (let (buffer buffer-name) | |
4054 (setq buffer-name | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4055 (funcall viper-read-buffer-function |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4056 (format "Kill buffer \(%s\): " |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4057 (buffer-name (current-buffer))))) |
18129 | 4058 (setq buffer |
4059 (if (null buffer-name) | |
4060 (current-buffer) | |
4061 (get-buffer buffer-name))) | |
4062 (if (null buffer) (error "`%s': No such buffer" buffer-name)) | |
4063 (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
|
4064 (y-or-n-p |
18129 | 4065 (format |
4066 "Buffer `%s' is modified, are you sure you want to kill it? " | |
4067 buffer-name))) | |
4068 (kill-buffer buffer) | |
4069 (error "Buffer not killed")))) | |
4070 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4071 |
18129 | 4072 |
4073 ;; yank and pop | |
4074 | |
19078 | 4075 (defsubst viper-yank (text) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4076 "Yank TEXT silently. This works correctly with Emacs's yank-pop command." |
18129 | 4077 (insert text) |
4078 (setq this-command 'yank)) | |
4079 | |
19078 | 4080 (defun viper-put-back (arg) |
18129 | 4081 "Put back after point/below line." |
4082 (interactive "P") | |
19078 | 4083 (let ((val (viper-p-val arg)) |
4084 (text (if viper-use-register | |
4085 (cond ((viper-valid-register viper-use-register '(digit)) | |
4086 (current-kill | |
4087 (- viper-use-register ?1) 'do-not-rotate)) | |
4088 ((viper-valid-register viper-use-register) | |
4089 (get-register (downcase viper-use-register))) | |
4090 (t (error viper-InvalidRegister viper-use-register))) | |
21940 | 4091 (current-kill 0))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4092 sv-point chars-inserted lines-inserted) |
18129 | 4093 (if (null text) |
19078 | 4094 (if viper-use-register |
4095 (let ((reg viper-use-register)) | |
4096 (setq viper-use-register nil) | |
4097 (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
|
4098 (error "Viper bell"))) |
19078 | 4099 (setq viper-use-register nil) |
4100 (if (viper-end-with-a-newline-p text) | |
18129 | 4101 (progn |
4102 (end-of-line) | |
4103 (if (eobp) | |
4104 (insert "\n") | |
4105 (forward-line 1)) | |
4106 (beginning-of-line)) | |
19078 | 4107 (if (not (eolp)) (viper-forward-char-carefully))) |
4108 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
4109 (viper-set-destructive-command | |
4110 (list 'viper-put-back val nil viper-use-register nil nil)) | |
21940 | 4111 (setq sv-point (point)) |
4112 (viper-loop val (viper-yank text)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4113 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4114 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4115 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4116 (> 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
|
4117 (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
|
4118 (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
|
4119 chars-inserted lines-inserted)))) |
18129 | 4120 ;; 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
|
4121 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4122 ;; a newline |
19078 | 4123 (if (viper-same-line (point) (mark)) |
4124 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4125 (exchange-point-and-mark) |
4126 (if (bolp) | |
4127 (back-to-indentation))) | |
19078 | 4128 (viper-deactivate-mark)) |
4129 | |
4130 (defun viper-Put-back (arg) | |
18129 | 4131 "Put back at point/above line." |
4132 (interactive "P") | |
19078 | 4133 (let ((val (viper-p-val arg)) |
4134 (text (if viper-use-register | |
4135 (cond ((viper-valid-register viper-use-register '(digit)) | |
4136 (current-kill | |
4137 (- viper-use-register ?1) 'do-not-rotate)) | |
4138 ((viper-valid-register viper-use-register) | |
4139 (get-register (downcase viper-use-register))) | |
4140 (t (error viper-InvalidRegister viper-use-register))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4141 (current-kill 0))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4142 sv-point chars-inserted lines-inserted) |
18129 | 4143 (if (null text) |
19078 | 4144 (if viper-use-register |
4145 (let ((reg viper-use-register)) | |
4146 (setq viper-use-register nil) | |
4147 (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
|
4148 (error "Viper bell"))) |
19078 | 4149 (setq viper-use-register nil) |
4150 (if (viper-end-with-a-newline-p text) (beginning-of-line)) | |
4151 (viper-set-destructive-command | |
4152 (list 'viper-Put-back val nil viper-use-register nil nil)) | |
4153 (set-marker (viper-mark-marker) (point) (current-buffer)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4154 (setq sv-point (point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4155 (viper-loop val (viper-yank text)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4156 (setq chars-inserted (abs (- (point) sv-point)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4157 lines-inserted (abs (count-lines (point) sv-point))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4158 (if (or (> chars-inserted viper-change-notification-threshold) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4159 (> 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
|
4160 (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
|
4161 (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
|
4162 chars-inserted lines-inserted)))) |
18129 | 4163 ;; 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
|
4164 ;; newline; it leaves the cursor at the beginning when the text contains |
18129 | 4165 ;; a newline |
19078 | 4166 (if (viper-same-line (point) (mark)) |
4167 (or (= (point) (mark)) (viper-backward-char-carefully)) | |
18129 | 4168 (exchange-point-and-mark) |
4169 (if (bolp) | |
4170 (back-to-indentation))) | |
19078 | 4171 (viper-deactivate-mark)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4172 |
18129 | 4173 |
4174 ;; Copy region to kill-ring. | |
4175 ;; If BEG and END do not belong to the same buffer, copy empty region. | |
19078 | 4176 (defun viper-copy-region-as-kill (beg end) |
18129 | 4177 (condition-case nil |
4178 (copy-region-as-kill beg end) | |
4179 (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
|
4180 |
18129 | 4181 |
19078 | 4182 (defun viper-delete-char (arg) |
19462 | 4183 "Delete next character." |
18129 | 4184 (interactive "P") |
19462 | 4185 (let ((val (viper-p-val arg)) |
4186 end-del-pos) | |
19078 | 4187 (viper-set-destructive-command |
4188 (list 'viper-delete-char val nil nil nil nil)) | |
19462 | 4189 (if (and viper-ex-style-editing |
4190 (> val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
4191 (setq val (viper-chars-in-region (point) (viper-line-pos 'end)))) | |
19078 | 4192 (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
|
4193 (if (bolp) (error "Viper bell") (setq val 0))) ; not bol---simply back 1 ch |
19462 | 4194 (save-excursion |
4195 (viper-forward-char-carefully val) | |
4196 (setq end-del-pos (point))) | |
19078 | 4197 (if viper-use-register |
18129 | 4198 (progn |
19078 | 4199 (cond ((viper-valid-register viper-use-register '((Letter))) |
4200 (viper-append-to-register | |
19462 | 4201 (downcase viper-use-register) (point) end-del-pos)) |
19078 | 4202 ((viper-valid-register viper-use-register) |
18129 | 4203 (copy-to-register |
19462 | 4204 viper-use-register (point) end-del-pos nil)) |
19078 | 4205 (t (error viper-InvalidRegister viper-use-register))) |
4206 (setq viper-use-register nil))) | |
19462 | 4207 |
4208 (delete-char val t) | |
19078 | 4209 (if viper-ex-style-motion |
19462 | 4210 (if (and (eolp) (not (bolp))) (backward-char 1))) |
4211 )) | |
18129 | 4212 |
19078 | 4213 (defun viper-delete-backward-char (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4214 "Delete previous character. On reaching beginning of line, stop and beep." |
18129 | 4215 (interactive "P") |
19462 | 4216 (let ((val (viper-p-val arg)) |
4217 end-del-pos) | |
19078 | 4218 (viper-set-destructive-command |
4219 (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
|
4220 (if (and |
19462 | 4221 viper-ex-style-editing |
4222 (> val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4223 (setq val (viper-chars-in-region (viper-line-pos 'start) (point)))) | |
4224 (save-excursion | |
4225 (viper-backward-char-carefully val) | |
4226 (setq end-del-pos (point))) | |
19078 | 4227 (if viper-use-register |
18129 | 4228 (progn |
19078 | 4229 (cond ((viper-valid-register viper-use-register '(Letter)) |
4230 (viper-append-to-register | |
19462 | 4231 (downcase viper-use-register) end-del-pos (point))) |
19078 | 4232 ((viper-valid-register viper-use-register) |
18129 | 4233 (copy-to-register |
19462 | 4234 viper-use-register end-del-pos (point) nil)) |
19078 | 4235 (t (error viper-InvalidRegister viper-use-register))) |
4236 (setq viper-use-register nil))) | |
19462 | 4237 (if (and (bolp) viper-ex-style-editing) |
4238 (ding)) | |
4239 (delete-backward-char val t))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4240 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4241 |
19078 | 4242 (defun viper-del-backward-char-in-insert () |
18129 | 4243 "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
|
4244 (interactive) |
19462 | 4245 (if (and viper-ex-style-editing (bolp)) |
18129 | 4246 (beep 1) |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4247 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4248 (delete-backward-char 1 nil))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4249 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4250 |
19078 | 4251 (defun viper-del-backward-char-in-replace () |
18129 | 4252 "Delete one character in replace mode. |
19078 | 4253 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4254 charecters. If it is nil, then the cursor just moves backwards, similarly |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4255 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the |
18129 | 4256 cursor move past the beginning of line." |
4257 (interactive) | |
19078 | 4258 (cond (viper-delete-backwards-in-replace |
18129 | 4259 (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
|
4260 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4261 (delete-backward-char 1 nil)) |
19462 | 4262 (viper-ex-style-editing |
18129 | 4263 (beep 1)) |
4264 ((bobp) | |
4265 (beep 1)) | |
4266 (t | |
60168
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4267 ;; don't put on kill ring |
d96e54250eea
* viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
4268 (delete-backward-char 1 nil)))) |
19462 | 4269 (viper-ex-style-editing |
18129 | 4270 (if (bolp) |
4271 (beep 1) | |
4272 (backward-char 1))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4273 (t |
18129 | 4274 (backward-char 1)))) |
4275 | |
4276 | |
4277 | |
4278 ;; join lines. | |
4279 | |
19078 | 4280 (defun viper-join-lines (arg) |
18129 | 4281 "Join this line to next, if ARG is nil. Otherwise, join ARG lines." |
4282 (interactive "*P") | |
19078 | 4283 (let ((val (viper-P-val arg))) |
4284 (viper-set-destructive-command | |
4285 (list 'viper-join-lines val nil nil nil nil)) | |
4286 (viper-loop (if (null val) 1 (1- val)) | |
18129 | 4287 (end-of-line) |
4288 (if (not (eobp)) | |
4289 (progn | |
4290 (forward-line 1) | |
4291 (delete-region (point) (1- (point))) | |
18839 | 4292 (fixup-whitespace) |
4293 ;; fixup-whitespace sometimes does not leave space | |
4294 ;; between objects, so we insert it as in Vi | |
4295 (or (looking-at " ") | |
4296 (insert " ") | |
4297 (backward-char 1)) | |
19462 | 4298 ))))) |
18129 | 4299 |
4300 | |
4301 ;; Replace state | |
4302 | |
19078 | 4303 (defun viper-change (beg end) |
18129 | 4304 (if (markerp beg) (setq beg (marker-position beg))) |
4305 (if (markerp end) (setq end (marker-position end))) | |
4306 ;; beg is sometimes (mark t), which may be nil | |
4307 (or beg (setq beg end)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4308 |
19078 | 4309 (viper-set-complex-command-for-undo) |
4310 (if viper-use-register | |
18129 | 4311 (progn |
19078 | 4312 (copy-to-register viper-use-register beg end nil) |
4313 (setq viper-use-register nil))) | |
4314 (viper-set-replace-overlay beg end) | |
18129 | 4315 (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
|
4316 |
19078 | 4317 (if (= (viper-replace-start) (point-max)) |
18129 | 4318 (error "End of buffer")) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4319 |
19078 | 4320 (setq viper-last-replace-region |
4321 (buffer-substring (viper-replace-start) | |
4322 (viper-replace-end))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4323 |
18129 | 4324 ;; protect against error while inserting "@" and other disasters |
4325 ;; (e.g., read-only buff) | |
4326 (condition-case conds | |
19078 | 4327 (if (or viper-allow-multiline-replace-regions |
4328 (viper-same-line (viper-replace-start) | |
19203 | 4329 (viper-replace-end))) |
18129 | 4330 (progn |
4331 ;; tabs cause problems in replace, so untabify | |
19078 | 4332 (goto-char (viper-replace-end)) |
18129 | 4333 (insert-before-markers "@") ; put placeholder after the TAB |
19078 | 4334 (untabify (viper-replace-start) (point)) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4335 ;; del @, don't put on kill ring |
18129 | 4336 (delete-backward-char 1) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4337 |
19078 | 4338 (viper-set-replace-overlay-glyphs |
4339 viper-replace-region-start-delimiter | |
4340 viper-replace-region-end-delimiter) | |
18129 | 4341 ;; 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
|
4342 ;; has to be shifted because of insert. We can't simply insert |
18129 | 4343 ;; "$" before-markers because then overlay-start will shift the |
4344 ;; 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
|
4345 ;; character. This fixes the bug with `s' and `cl' commands. |
19078 | 4346 (viper-move-replace-overlay (viper-replace-start) (point)) |
4347 (goto-char (viper-replace-start)) | |
4348 (viper-change-state-to-replace t)) | |
4349 (kill-region (viper-replace-start) | |
4350 (viper-replace-end)) | |
4351 (viper-hide-replace-overlay) | |
4352 (viper-change-state-to-insert)) | |
18129 | 4353 (error ;; make sure that the overlay doesn't stay. |
4354 ;; go back to the original point | |
19078 | 4355 (goto-char (viper-replace-start)) |
4356 (viper-hide-replace-overlay) | |
4357 (viper-message-conditions conds)))) | |
4358 | |
4359 | |
4360 (defun viper-change-subr (beg end) | |
18129 | 4361 ;; beg is sometimes (mark t), which may be nil |
4362 (or beg (setq beg end)) | |
19078 | 4363 (if viper-use-register |
18129 | 4364 (progn |
19078 | 4365 (copy-to-register viper-use-register beg end nil) |
4366 (setq viper-use-register nil))) | |
18129 | 4367 (kill-region beg end) |
19078 | 4368 (setq this-command 'viper-change) |
4369 (viper-yank-last-insertion)) | |
4370 | |
4371 (defun viper-toggle-case (arg) | |
18129 | 4372 "Toggle character case." |
4373 (interactive "P") | |
19078 | 4374 (let ((val (viper-p-val arg)) (c)) |
4375 (viper-set-destructive-command | |
4376 (list 'viper-toggle-case val nil nil nil nil)) | |
18129 | 4377 (while (> val 0) |
4378 (setq c (following-char)) | |
4379 (delete-char 1 nil) | |
4380 (if (eq c (upcase c)) | |
4381 (insert-char (downcase c) 1) | |
4382 (insert-char (upcase c) 1)) | |
4383 (if (eolp) (backward-char 1)) | |
4384 (setq val (1- val))))) | |
4385 | |
4386 | |
4387 ;; query replace | |
4388 | |
19078 | 4389 (defun viper-query-replace () |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4390 "Query replace. |
18129 | 4391 If a null string is suplied as the string to be replaced, |
4392 the query replace mode will toggle between string replace | |
4393 and regexp replace." | |
4394 (interactive) | |
4395 (let (str) | |
19078 | 4396 (setq str (viper-read-string-with-history |
4397 (if viper-re-query-replace "Query replace regexp: " | |
18129 | 4398 "Query replace: ") |
4399 nil ; no initial | |
19078 | 4400 'viper-replace1-history |
4401 (car viper-replace1-history) ; default | |
18129 | 4402 )) |
4403 (if (string= str "") | |
4404 (progn | |
19078 | 4405 (setq viper-re-query-replace (not viper-re-query-replace)) |
18129 | 4406 (message "Query replace mode changed to %s" |
19078 | 4407 (if viper-re-query-replace "regexp replace" |
18129 | 4408 "string replace"))) |
19078 | 4409 (if viper-re-query-replace |
18129 | 4410 (query-replace-regexp |
4411 str | |
19078 | 4412 (viper-read-string-with-history |
18129 | 4413 (format "Query replace regexp `%s' with: " str) |
4414 nil ; no initial | |
19078 | 4415 'viper-replace1-history |
4416 (car viper-replace1-history) ; default | |
18129 | 4417 )) |
4418 (query-replace | |
4419 str | |
19078 | 4420 (viper-read-string-with-history |
18129 | 4421 (format "Query replace `%s' with: " str) |
4422 nil ; no initial | |
19078 | 4423 'viper-replace1-history |
4424 (car viper-replace1-history) ; default | |
18129 | 4425 )))))) |
4426 | |
4427 | |
4428 ;; marking | |
4429 | |
19078 | 4430 (defun viper-mark-beginning-of-buffer () |
18129 | 4431 "Mark beginning of buffer." |
4432 (interactive) | |
4433 (push-mark (point)) | |
4434 (goto-char (point-min)) | |
4435 (exchange-point-and-mark) | |
4436 (message "Mark set at the beginning of buffer")) | |
4437 | |
19078 | 4438 (defun viper-mark-end-of-buffer () |
18129 | 4439 "Mark end of buffer." |
4440 (interactive) | |
4441 (push-mark (point)) | |
4442 (goto-char (point-max)) | |
4443 (exchange-point-and-mark) | |
4444 (message "Mark set at the end of buffer")) | |
4445 | |
19078 | 4446 (defun viper-mark-point () |
18129 | 4447 "Set mark at point of buffer." |
4448 (interactive) | |
4449 (let ((char (read-char))) | |
4450 (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
|
4451 (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
|
4452 ((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
|
4453 ((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
|
4454 ((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
|
4455 ((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
|
4456 ((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
|
4457 ((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
|
4458 (t (error "Viper bell")) |
18129 | 4459 ))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4460 |
18129 | 4461 ;; Algorithm: If first invocation of this command save mark on ring, goto |
4462 ;; mark, M0, and pop the most recent elt from the mark ring into mark, | |
4463 ;; making it into the new mark, M1. | |
4464 ;; Push this mark back and set mark to the original point position, p1. | |
4465 ;; So, if you hit '' or `` then you can return to p1. | |
4466 ;; | |
4467 ;; 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
|
4468 ;; jump there. This forgets the position, p1, and puts M1 back into mark. |
18129 | 4469 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from |
4470 ;; the ring into mark. Push M2 back on the ring and set mark to M0. | |
4471 ;; etc. | |
19078 | 4472 (defun viper-cycle-through-mark-ring () |
18129 | 4473 "Visit previous locations on the mark ring. |
4474 One can use `` and '' to temporarily jump 1 step back." | |
4475 (let* ((sv-pt (point))) | |
4476 ;; if repeated `m,' command, pop the previously saved mark. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4477 ;; 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
|
4478 ;; user types `` or '' and is discarded |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4479 ;; from the mark ring by the next `m,' command. |
18129 | 4480 ;; In any case, go to the previous or previously saved mark. |
4481 ;; 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
|
4482 ;; point to be the mark. Current pt as mark is discarded by the next |
18129 | 4483 ;; m, command. |
19078 | 4484 (if (eq last-command 'viper-cycle-through-mark-ring) |
18129 | 4485 () |
4486 ;; save current mark if the first iteration | |
19078 | 4487 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4488 (if (mark t) |
4489 (push-mark (mark t) t)) ) | |
4490 (pop-mark) | |
4491 (set-mark-command 1) | |
4492 ;; don't duplicate mark on the ring | |
19078 | 4493 (setq mark-ring (delete (viper-mark-marker) mark-ring)) |
18129 | 4494 (push-mark sv-pt t) |
19078 | 4495 (viper-deactivate-mark) |
4496 (setq this-command 'viper-cycle-through-mark-ring) | |
18129 | 4497 )) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4498 |
18129 | 4499 |
19078 | 4500 (defun viper-goto-mark (arg) |
18129 | 4501 "Go to mark." |
4502 (interactive "P") | |
4503 (let ((char (read-char)) | |
19078 | 4504 (com (viper-getcom arg))) |
4505 (viper-goto-mark-subr char com nil))) | |
4506 | |
4507 (defun viper-goto-mark-and-skip-white (arg) | |
18129 | 4508 "Go to mark and skip to first non-white character on line." |
4509 (interactive "P") | |
4510 (let ((char (read-char)) | |
19078 | 4511 (com (viper-getCom arg))) |
4512 (viper-goto-mark-subr char com t))) | |
4513 | |
4514 (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
|
4515 (if (eobp) |
18129 | 4516 (if (bobp) |
4517 (error "Empty buffer") | |
4518 (backward-char 1))) | |
19078 | 4519 (cond ((viper-valid-register char '(letter)) |
18129 | 4520 (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
|
4521 (reg (viper-int-to-char (1+ (- char ?a)))) |
18129 | 4522 (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
|
4523 ;; 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
|
4524 ;; 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
|
4525 (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
|
4526 (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
|
4527 (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
|
4528 (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
|
4529 (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
|
4530 (save-excursion |
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26743
diff
changeset
|
4531 (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
|
4532 (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
|
4533 (<= (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
|
4534 (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
|
4535 (set-register reg text-marker)))) |
19078 | 4536 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4537 (if (not (viper-valid-marker text-marker)) | |
4538 (error viper-EmptyTextmarker char)) | |
4539 (if (and (viper-same-line (point) viper-last-jump) | |
4540 (= (point) viper-last-jump-ignore)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4541 (push-mark viper-last-jump t) |
18129 | 4542 (push-mark nil t)) ; no msg |
19078 | 4543 (viper-register-to-point reg) |
4544 (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
|
4545 (cond (skip-white |
18129 | 4546 (back-to-indentation) |
19078 | 4547 (setq viper-last-jump-ignore (point)))) |
18129 | 4548 (if com |
4549 (if (equal buff (current-buffer)) | |
19078 | 4550 (viper-execute-com (if skip-white |
4551 'viper-goto-mark-and-skip-white | |
4552 'viper-goto-mark) | |
18129 | 4553 nil com) |
4554 (switch-to-buffer buff) | |
19078 | 4555 (goto-char viper-com-point) |
4556 (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
|
4557 (error "Viper bell"))))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4558 ((and (not skip-white) (viper= char ?`)) |
19078 | 4559 (if com (viper-move-marker-locally 'viper-com-point (point))) |
4560 (if (and (viper-same-line (point) viper-last-jump) | |
4561 (= (point) viper-last-jump-ignore)) | |
4562 (goto-char viper-last-jump)) | |
18129 | 4563 (if (null (mark t)) (error "Mark is not set in this buffer")) |
4564 (if (= (point) (mark t)) (pop-mark)) | |
4565 (exchange-point-and-mark) | |
19078 | 4566 (setq viper-last-jump (point-marker) |
4567 viper-last-jump-ignore 0) | |
4568 (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
|
4569 ((and 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 (= (point) (mark t)) (pop-mark)) |
4575 (exchange-point-and-mark) | |
19078 | 4576 (setq viper-last-jump (point)) |
18129 | 4577 (back-to-indentation) |
19078 | 4578 (setq viper-last-jump-ignore (point)) |
4579 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com))) | |
4580 (t (error viper-InvalidTextmarker char)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4581 |
19078 | 4582 (defun viper-insert-tab () |
18129 | 4583 (interactive) |
4584 (insert-tab)) | |
4585 | |
19078 | 4586 (defun viper-exchange-point-and-mark () |
18129 | 4587 (interactive) |
4588 (exchange-point-and-mark) | |
4589 (back-to-indentation)) | |
4590 | |
4591 ;; Input Mode Indentation | |
4592 | |
4593 ;; Returns t, if the string before point matches the regexp STR. | |
19078 | 4594 (defsubst viper-looking-back (str) |
18129 | 4595 (and (save-excursion (re-search-backward str nil t)) |
4596 (= (point) (match-end 0)))) | |
4597 | |
4598 | |
19078 | 4599 (defun viper-forward-indent () |
18129 | 4600 "Indent forward -- `C-t' in Vi." |
4601 (interactive) | |
19078 | 4602 (setq viper-cted t) |
4603 (indent-to (+ (current-column) viper-shift-width))) | |
4604 | |
4605 (defun viper-backward-indent () | |
18129 | 4606 "Backtab, C-d in VI" |
4607 (interactive) | |
19078 | 4608 (if viper-cted |
18129 | 4609 (let ((p (point)) (c (current-column)) bol (indent t)) |
19078 | 4610 (if (viper-looking-back "[0^]") |
18129 | 4611 (progn |
4612 (if (eq ?^ (preceding-char)) | |
19078 | 4613 (setq viper-preserve-indent t)) |
18129 | 4614 (delete-backward-char 1) |
4615 (setq p (point)) | |
4616 (setq indent nil))) | |
4617 (save-excursion | |
4618 (beginning-of-line) | |
4619 (setq bol (point))) | |
4620 (if (re-search-backward "[^ \t]" bol 1) (forward-char)) | |
4621 (delete-region (point) p) | |
4622 (if indent | |
19078 | 4623 (indent-to (- c viper-shift-width))) |
4624 (if (or (bolp) (viper-looking-back "[^ \t]")) | |
4625 (setq viper-cted nil))))) | |
4626 | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4627 ;; 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
|
4628 (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
|
4629 (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
|
4630 (progn |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4631 (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
|
4632 (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
|
4633 (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
|
4634 text-mode |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4635 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
|
4636 (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
|
4637 (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
|
4638 |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4639 |
19078 | 4640 (defun viper-autoindent () |
18129 | 4641 "Auto Indentation, Vi-style." |
4642 (interactive) | |
4643 (let ((col (current-indentation))) | |
4644 (if abbrev-mode (expand-abbrev)) | |
19078 | 4645 (if viper-preserve-indent |
4646 (setq viper-preserve-indent nil) | |
4647 (setq viper-current-indent col)) | |
18129 | 4648 ;; don't leave whitespace lines around |
4649 (if (memq last-command | |
19078 | 4650 '(viper-autoindent |
4651 viper-open-line viper-Open-line | |
4652 viper-replace-state-exit-cmd)) | |
18129 | 4653 (indent-to-left-margin)) |
4654 ;; use \n instead of newline, or else <Return> will move the insert point | |
4655 ;;(newline 1) | |
4656 (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
|
4657 (viper-indent-line viper-current-indent) |
18129 | 4658 )) |
4659 | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4660 |
18129 | 4661 ;; Viewing registers |
4662 | |
19078 | 4663 (defun viper-ket-function (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4664 "Function called by \], the ket. View registers and call \]\]." |
18129 | 4665 (interactive "P") |
4666 (let ((reg (read-char))) | |
19078 | 4667 (cond ((viper-valid-register reg '(letter Letter)) |
18129 | 4668 (view-register (downcase reg))) |
19078 | 4669 ((viper-valid-register reg '(digit)) |
18129 | 4670 (let ((text (current-kill (- reg ?1) 'do-not-rotate))) |
20003 | 4671 (with-output-to-temp-buffer " *viper-info*" |
4672 (princ (format "Register %c contains the string:\n" reg)) | |
4673 (princ text)) | |
4674 )) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
29412
diff
changeset
|
4675 ((viper= ?\] reg) |
19078 | 4676 (viper-next-heading arg)) |
18129 | 4677 (t (error |
19078 | 4678 viper-InvalidRegister reg))))) |
4679 | |
4680 (defun viper-brac-function (arg) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4681 "Function called by \[, the brac. View textmarkers and call \[\[" |
18129 | 4682 (interactive "P") |
4683 (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
|
4684 (cond ((viper= ?\[ reg) |
19078 | 4685 (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
|
4686 ((viper= ?\] reg) |
19078 | 4687 (viper-heading-end arg)) |
4688 ((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
|
4689 (let* ((val (get-register (viper-int-to-char (1+ (- reg ?a))))) |
20003 | 4690 (buf (if (not (markerp val)) |
19078 | 4691 (error viper-EmptyTextmarker reg) |
18129 | 4692 (marker-buffer val))) |
4693 (pos (marker-position val)) | |
4694 line-no text (s pos) (e pos)) | |
20003 | 4695 (with-output-to-temp-buffer " *viper-info*" |
18129 | 4696 (if (and buf pos) |
4697 (progn | |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105372
diff
changeset
|
4698 (with-current-buffer buf |
18129 | 4699 (setq line-no (1+ (count-lines (point-min) val))) |
4700 (goto-char pos) | |
4701 (beginning-of-line) | |
4702 (if (re-search-backward "[^ \t]" nil t) | |
4703 (progn | |
4704 (beginning-of-line) | |
4705 (setq s (point)))) | |
4706 (goto-char pos) | |
4707 (forward-line 1) | |
4708 (if (re-search-forward "[^ \t]" nil t) | |
4709 (progn | |
4710 (end-of-line) | |
4711 (setq e (point)))) | |
4712 (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
|
4713 (setq text (format "%s<%c>%s" |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4714 (substring text 0 (- pos s)) |
18129 | 4715 reg (substring text (- pos s))))) |
20003 | 4716 (princ |
18129 | 4717 (format |
4718 "Textmarker `%c' is in buffer `%s' at line %d.\n" | |
4719 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
|
4720 (princ (format "Here is some text around %c:\n\n %s" |
18129 | 4721 reg text))) |
20003 | 4722 (princ (format viper-EmptyTextmarker reg)))) |
4723 )) | |
19078 | 4724 (t (error viper-InvalidTextmarker reg))))) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4725 |
18129 | 4726 |
4727 | |
19078 | 4728 (defun viper-delete-backward-word (arg) |
18129 | 4729 "Delete previous word." |
4730 (interactive "p") | |
4731 (save-excursion | |
4732 (push-mark nil t) | |
4733 (backward-word arg) | |
4734 (delete-region (point) (mark t)) | |
4735 (pop-mark))) | |
4736 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4737 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4738 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4739 ;; 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
|
4740 ;; 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
|
4741 ;; 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
|
4742 (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
|
4743 (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
|
4744 (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
|
4745 (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
|
4746 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4747 |
18129 | 4748 |
18839 | 4749 (defun viper-set-expert-level (&optional dont-change-unless) |
18129 | 4750 "Sets the expert level for a Viper user. |
4751 Can be called interactively to change (temporarily or permanently) the | |
4752 current expert level. | |
4753 | |
18289 | 4754 The optional argument DONT-CHANGE-UNLESS, if not nil, says that |
18129 | 4755 the level should not be changed, unless its current value is |
4756 meaningless (i.e., not one of 1,2,3,4,5). | |
4757 | |
4758 User level determines the setting of Viper variables that are most | |
4759 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
|
4760 |
18129 | 4761 (interactive) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4762 |
18839 | 4763 (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
|
4764 |
18129 | 4765 (save-window-excursion |
4766 (delete-other-windows) | |
18839 | 4767 ;; if 0 < viper-expert-level < viper-max-expert-level |
18129 | 4768 ;; & dont-change-unless = t -- use it; else ask |
19078 | 4769 (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
|
4770 |
19078 | 4771 (setq viper-always t |
4772 viper-ex-style-motion t | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4773 viper-ex-style-editing t |
19078 | 4774 viper-want-ctl-h-help nil) |
18129 | 4775 |
18839 | 4776 (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
|
4777 (global-set-key ; in emacs-state |
19078 | 4778 viper-toggle-key |
4779 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | |
4780 (setq viper-no-multiple-ESC t | |
4781 viper-re-search t | |
4782 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
|
4783 viper-search-wrap-around t |
19078 | 4784 viper-electric-mode nil |
4785 viper-want-emacs-keys-in-vi nil | |
4786 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
|
4787 |
18839 | 4788 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |
18129 | 4789 ;; intermediate to guru |
19078 | 4790 (setq viper-no-multiple-ESC (if (viper-window-display-p) |
4791 t 'twice) | |
4792 viper-electric-mode t | |
4793 viper-want-emacs-keys-in-vi t | |
4794 viper-want-emacs-keys-in-insert (> viper-expert-level 2)) | |
4795 | |
4796 (if (eq viper-expert-level 4) ; respect user's ex-style motion | |
4797 ; and viper-no-multiple-ESC | |
18129 | 4798 (progn |
18839 | 4799 (setq-default |
19462 | 4800 viper-ex-style-editing |
4801 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4802 viper-ex-style-motion |
4803 (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
|
4804 (setq viper-ex-style-motion |
19078 | 4805 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4806 viper-ex-style-editing |
4807 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4808 viper-re-search |
4809 (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
|
4810 viper-no-multiple-ESC |
19078 | 4811 (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
|
4812 |
18129 | 4813 ;; A wizard!! |
4814 ;; Ideally, if 5 is selected, a buffer should pop up to let the | |
4815 ;; user toggle the values of variables. | |
19462 | 4816 (t (setq-default viper-ex-style-editing |
4817 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4818 viper-ex-style-motion |
4819 (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
|
4820 (setq viper-want-ctl-h-help |
19078 | 4821 (viper-standard-value 'viper-want-ctl-h-help) |
18289 | 4822 viper-always |
18839 | 4823 (viper-standard-value 'viper-always) |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4824 viper-no-multiple-ESC |
19078 | 4825 (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
|
4826 viper-ex-style-motion |
19078 | 4827 (viper-standard-value 'viper-ex-style-motion) |
19462 | 4828 viper-ex-style-editing |
4829 (viper-standard-value 'viper-ex-style-editing) | |
19078 | 4830 viper-re-search |
4831 (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
|
4832 viper-electric-mode |
19078 | 4833 (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
|
4834 viper-want-emacs-keys-in-vi |
19078 | 4835 (viper-standard-value 'viper-want-emacs-keys-in-vi) |
4836 viper-want-emacs-keys-in-insert | |
4837 (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
|
4838 |
19078 | 4839 (viper-set-mode-vars-for viper-current-state) |
18289 | 4840 (if (or viper-always |
18839 | 4841 (and (> viper-expert-level 0) (> 5 viper-expert-level))) |
19078 | 4842 (viper-set-hooks))) |
18129 | 4843 |
26588
76b6a75471e1
* viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26429
diff
changeset
|
4844 |
18129 | 4845 ;; Ask user expert level. |
19078 | 4846 (defun viper-ask-level (dont-change-unless) |
4847 (let ((ask-buffer " *viper-ask-level*") | |
18129 | 4848 level-changed repeated) |
4849 (save-window-excursion | |
4850 (switch-to-buffer ask-buffer) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4851 |
18839 | 4852 (while (or (> viper-expert-level viper-max-expert-level) |
4853 (< viper-expert-level 1) | |
18129 | 4854 (null dont-change-unless)) |
4855 (erase-buffer) | |
4856 (if repeated | |
4857 (progn | |
4858 (message "Invalid user level") | |
4859 (beep 1)) | |
4860 (setq repeated t)) | |
4861 (setq dont-change-unless t | |
4862 level-changed t) | |
4863 (insert " | |
4864 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
|
4865 \(and the VI Plan for Emacs Rescue). |
18839 | 4866 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
|
4867 |
18129 | 4868 1 -- BEGINNER: Almost all Emacs features are suppressed. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4869 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
|
4870 command history in the minibuffer are thrown in as a bonus. |
19078 | 4871 To use Emacs productively, you must reach level 3 or higher. |
18129 | 4872 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state, |
19078 | 4873 so most Emacs commands can be used when Viper is in Vi state. |
4874 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
|
4875 3 -- GRAND MASTER: Like 2, but most Emacs commands are available also |
19078 | 4876 in Viper's insert state. |
4877 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC, | |
19462 | 4878 viper-ex-style-motion, viper-ex-style-editing, and |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
4879 viper-re-search variables. Adjust these settings to your taste. |
18289 | 4880 5 -- WIZARD: Like 4, but user settings are also respected for viper-always, |
19078 | 4881 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
|
4882 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
|
4883 |
18129 | 4884 Please, specify your level now: ") |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4885 |
19078 | 4886 (setq viper-expert-level (- (viper-read-char-exclusive) ?0)) |
18129 | 4887 ) ; end while |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4888 |
18129 | 4889 ;; tell the user if level was changed |
4890 (and level-changed | |
4891 (progn | |
4892 (insert | |
4893 (format "\n\n\n\n\n\t\tYou have selected user level %d" | |
18839 | 4894 viper-expert-level)) |
18129 | 4895 (if (y-or-n-p "Do you wish to make this change permanent? ") |
18839 | 4896 ;; save the setting for viper-expert-level |
19078 | 4897 (viper-save-setting |
18839 | 4898 'viper-expert-level |
4899 (format "Saving user level %d ..." viper-expert-level) | |
19078 | 4900 viper-custom-file-name)) |
18129 | 4901 )) |
4902 (bury-buffer) ; remove ask-buffer from screen | |
4903 (message "") | |
4904 ))) | |
4905 | |
4906 | |
19078 | 4907 (defun viper-nil () |
18129 | 4908 (interactive) |
4909 (beep 1)) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4910 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4911 |
18129 | 4912 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer |
19078 | 4913 (defun viper-register-to-point (char &optional enforce-buffer) |
18129 | 4914 "Like jump-to-register, but switches to another buffer in another window." |
4915 (interactive "cViper register to point: ") | |
4916 (let ((val (get-register char))) | |
4917 (cond | |
4918 ((and (fboundp 'frame-configuration-p) | |
4919 (frame-configuration-p val)) | |
4920 (set-frame-configuration val)) | |
4921 ((window-configuration-p val) | |
4922 (set-window-configuration val)) | |
19078 | 4923 ((viper-valid-marker val) |
18129 | 4924 (if (and enforce-buffer |
4925 (not (equal (current-buffer) (marker-buffer val)))) | |
19078 | 4926 (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
|
4927 (viper-int-to-char (1- (+ char ?a))))) |
18129 | 4928 (pop-to-buffer (marker-buffer val)) |
4929 (goto-char val)) | |
4930 ((and (consp val) (eq (car val) 'file)) | |
4931 (find-file (cdr val))) | |
4932 (t | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
4933 (error viper-EmptyTextmarker (viper-int-to-char (1- (+ char ?a)))))))) |
19078 | 4934 |
4935 | |
4936 (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
|
4937 "Save then kill current buffer." |
18129 | 4938 (interactive) |
18839 | 4939 (if (< viper-expert-level 2) |
18129 | 4940 (save-buffers-kill-emacs) |
4941 (save-buffer) | |
4942 (kill-buffer (current-buffer)))) | |
4943 | |
4944 | |
4945 | |
4946 ;;; Bug Report | |
4947 | |
19078 | 4948 (defun viper-submit-report () |
18129 | 4949 "Submit bug report on Viper." |
4950 (interactive) | |
4951 (let ((reporter-prompt-for-summary-p t) | |
19078 | 4952 (viper-device-type (viper-device-type)) |
18129 | 4953 color-display-p frame-parameters |
4954 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face | |
4955 varlist salutation window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4956 |
18129 | 4957 ;; If mode info is needed, add variable to `let' and then set it below, |
4958 ;; 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
|
4959 (setq color-display-p (if (viper-window-display-p) |
19078 | 4960 (viper-color-display-p) |
18129 | 4961 'non-x) |
19078 | 4962 minibuffer-vi-face (if (viper-has-face-support-p) |
4963 (viper-get-face viper-minibuffer-vi-face) | |
18129 | 4964 'non-x) |
19078 | 4965 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
|
4966 (viper-get-face |
19078 | 4967 viper-minibuffer-insert-face) |
18129 | 4968 'non-x) |
19078 | 4969 minibuffer-emacs-face (if (viper-has-face-support-p) |
4970 (viper-get-face | |
4971 viper-minibuffer-emacs-face) | |
18129 | 4972 'non-x) |
4973 frame-parameters (if (fboundp 'frame-parameters) | |
4974 (frame-parameters (selected-frame)))) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4975 |
19078 | 4976 (setq varlist (list 'viper-vi-minibuffer-minor-mode |
4977 'viper-insert-minibuffer-minor-mode | |
4978 'viper-vi-intercept-minor-mode | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4979 'viper-vi-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4980 'viper-vi-kbd-minor-mode |
19078 | 4981 'viper-vi-global-user-minor-mode |
4982 '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
|
4983 'viper-vi-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4984 'viper-vi-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4985 'viper-replace-minor-mode |
19078 | 4986 'viper-insert-intercept-minor-mode |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4987 'viper-insert-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4988 'viper-insert-kbd-minor-mode |
19078 | 4989 'viper-insert-global-user-minor-mode |
4990 '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
|
4991 'viper-insert-diehard-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4992 'viper-insert-basic-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4993 'viper-emacs-intercept-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4994 'viper-emacs-local-user-minor-mode |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
4995 'viper-emacs-kbd-minor-mode |
19078 | 4996 'viper-emacs-global-user-minor-mode |
4997 'viper-emacs-state-modifier-minor-mode | |
4998 'viper-automatic-iso-accents | |
19462 | 4999 'viper-special-input-method |
19078 | 5000 'viper-want-emacs-keys-in-insert |
5001 'viper-want-emacs-keys-in-vi | |
5002 'viper-keep-point-on-undo | |
5003 'viper-no-multiple-ESC | |
5004 'viper-electric-mode | |
5005 'viper-ESC-key | |
5006 'viper-want-ctl-h-help | |
19462 | 5007 'viper-ex-style-editing |
19078 | 5008 'viper-delete-backwards-in-replace |
5009 'viper-vi-style-in-minibuffer | |
5010 'viper-vi-state-hook | |
5011 'viper-insert-state-hook | |
5012 'viper-replace-state-hook | |
5013 'viper-emacs-state-hook | |
18129 | 5014 'ex-cycle-other-window |
5015 'ex-cycle-through-non-files | |
18839 | 5016 'viper-expert-level |
18129 | 5017 'major-mode |
19078 | 5018 'viper-device-type |
18129 | 5019 'color-display-p |
5020 'frame-parameters | |
5021 'minibuffer-vi-face | |
5022 'minibuffer-insert-face | |
5023 'minibuffer-emacs-face | |
5024 )) | |
5025 (setq salutation " | |
5026 Congratulations! You may have unearthed a bug in Viper! | |
5027 Please mail a concise, accurate summary of the problem to the address above. | |
5028 | |
5029 -------------------------------------------------------------------") | |
5030 (setq window-config (current-window-configuration)) | |
19078 | 5031 (with-output-to-temp-buffer " *viper-info*" |
5032 (switch-to-buffer " *viper-info*") | |
18129 | 5033 (delete-other-windows) |
5034 (princ " | |
5035 PLEASE FOLLOW THESE PROCEDURES | |
5036 ------------------------------ | |
5037 | |
5038 Before reporting a bug, please verify that it is related to Viper, and is | |
5039 not cause by other packages you are using. | |
5040 | |
5041 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
|
5042 problem. These warnings are normal and unavoidable. |
18129 | 5043 |
5044 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
|
5045 those advertised in the manual. Such `customization' is likely to crash |
18129 | 5046 Viper, as it would any other improperly customized Emacs package. |
5047 | |
5048 If you are reporting an error message received while executing one of the | |
5049 Viper commands, type: | |
5050 | |
5051 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
|
5052 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5053 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
|
5054 back trace of the execution that leads to the error. Please include this |
18129 | 5055 trace in your bug report. |
5056 | |
5057 If you believe that one of Viper's commands goes into an infinite loop | |
5058 \(e.g., Emacs freezes\), type: | |
5059 | |
5060 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
|
5061 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
23313
diff
changeset
|
5062 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
|
5063 the current command. Include the resulting back trace in the bug report. |
18129 | 5064 |
5065 Mail anyway (y or n)? ") | |
5066 (if (y-or-n-p "Mail anyway? ") | |
5067 () | |
5068 (set-window-configuration window-config) | |
5069 (error "Bug report aborted"))) | |
5070 | |
5071 (require 'reporter) | |
5072 (set-window-configuration window-config) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5073 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5074 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
19078 | 5075 (viper-version) |
18129 | 5076 varlist |
5077 nil 'delete-other-windows | |
5078 salutation) | |
5079 )) | |
26429
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5080 |
e20b16957cdd
* emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents:
26263
diff
changeset
|
5081 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
45738
diff
changeset
|
5082 |
18129 | 5083 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65680
diff
changeset
|
5084 ;; 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
|
5085 ;;; viper-cmd.el ends here |