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