annotate lisp/emulation/viper-cmd.el @ 101009:ad9d2270860e

Replace last-command-char with last-command-event.
author Glenn Morris <rgm@gnu.org>
date Fri, 09 Jan 2009 04:36:00 +0000
parents a9dc0e7c3f2b
children dbe70c3aa01d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1 ;;; viper-cmd.el --- Vi command support for Viper
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2
64701
34bd8e434dd7 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64485
diff changeset
3 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 99789
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
5
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
7
19905
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
8 ;; This file is part of GNU Emacs.
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
9
94658
eb7b2376cae5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
19905
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
94658
eb7b2376cae5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
eb7b2376cae5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
13 ;; (at your option) any later version.
19905
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
14
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
18 ;; GNU General Public License for more details.
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
19
9a4cdbf423ea (viper-smart-suffix-list): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19891
diff changeset
20 ;; You should have received a copy of the GNU General Public License
94658
eb7b2376cae5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93773
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
22
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
23 ;;; Commentary:
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
24
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 33842
diff changeset
25 ;;; Code:
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
26
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
27 (provide 'viper-cmd)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
28
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
29 ;; Compiler pacifier
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
30 (defvar viper-minibuffer-current-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
31 (defvar viper-minibuffer-insert-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
32 (defvar viper-minibuffer-vi-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
33 (defvar viper-minibuffer-emacs-face)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
34 (defvar viper-always)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
35 (defvar viper-mode-string)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
36 (defvar viper-custom-file-name)
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
37 (defvar viper--key-maps)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
38 (defvar viper--intercept-key-maps)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
39 (defvar iso-accents-mode)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
40 (defvar quail-mode)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
41 (defvar quail-current-str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
42 (defvar mark-even-if-inactive)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
43 (defvar init-message)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
44 (defvar initial)
72516
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
45 (defvar undo-beg-posn)
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
46 (defvar undo-end-posn)
87691
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
47
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
48 (eval-and-compile
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
49 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
50 ;; end pacifier
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
51
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
52
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
53 (require 'viper-util)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
54 (require 'viper-keym)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
55 (require 'viper-mous)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
56 (require 'viper-macs)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
57 (require 'viper-ex)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
58
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
59
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
60
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
61 ;; Generic predicates
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
62
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
63 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
64
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
65 ;; generate test functions
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
66 ;; given symbol foo, foo-p is the test function, foos is the set of
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
67 ;; Viper command keys
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
68 ;; (macroexpand '(viper-test-com-defun foo))
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
69 ;; (defun foo-p (com) (consp (memq com foos)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
70
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
71 (defmacro viper-test-com-defun (name)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
72 (let* ((snm (symbol-name name))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
73 (nm-p (intern (concat snm "-p")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
74 (nms (intern (concat snm "s"))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
75 `(defun ,nm-p (com)
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
76 (consp (viper-memq-char com ,nms)
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
77 ))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
78
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
79 ;; Variables for defining VI commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
80
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
81 ;; Modifying commands that can be prefixes to movement commands
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
82 (defvar viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
83 ;; define viper-prefix-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
84 (viper-test-com-defun viper-prefix-command)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
85
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
86 ;; Commands that are pairs eg. dd. r and R here are a hack
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
87 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
88 ;; define viper-charpair-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
89 (viper-test-com-defun viper-charpair-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
90
81331
c3779fe5830e 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 75346
diff changeset
91 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?j ?k ?l
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
92 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?%
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
93 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
94 ?\; ?, ?0 ?? ?/ ?\ ?\C-m
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
95 space return
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
96 delete backspace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
97 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
98 "Movement commands")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
99 ;; define viper-movement-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
100 (viper-test-com-defun viper-movement-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
101
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
102 ;; Vi digit commands
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
103 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
104
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
105 ;; define viper-digit-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
106 (viper-test-com-defun viper-digit-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
107
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
108 ;; Commands that can be repeated by . (dotted)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
109 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
110 ;; define viper-dotable-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
111 (viper-test-com-defun viper-dotable-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
112
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
113 ;; Commands that can follow a #
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
114 (defconst viper-hash-commands '(?c ?C ?g ?q ?s))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
115 ;; define viper-hash-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
116 (viper-test-com-defun viper-hash-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
117
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
118 ;; Commands that may have registers as prefix
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
119 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
120 ;; define viper-regsuffix-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
121 (viper-test-com-defun viper-regsuffix-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
122
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
123 (defconst viper-vi-commands (append viper-movement-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
124 viper-digit-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
125 viper-dotable-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
126 viper-charpair-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
127 viper-hash-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
128 viper-prefix-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
129 viper-regsuffix-commands)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
130 "The list of all commands in Vi-state.")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
131 ;; define viper-vi-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
132 (viper-test-com-defun viper-vi-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
133
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
134 ;; Where viper saves mark. This mark is resurrected by m^
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
135 (defvar viper-saved-mark nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
136
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
137 ;; Contains user settings for vars affected by viper-set-expert-level function.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
138 ;; Not a user option.
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
139 (defvar viper-saved-user-settings nil)
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
140
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
141
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
142
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
143 ;;; CODE
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
144
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
145 ;; sentinels
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
146
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
147 ;; Runs viper-after-change-functions inside after-change-functions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
148 (defun viper-after-change-sentinel (beg end len)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
149 (run-hook-with-args 'viper-after-change-functions beg end len))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
150
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
151 ;; Runs viper-before-change-functions inside before-change-functions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
152 (defun viper-before-change-sentinel (beg end)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
153 (run-hook-with-args 'viper-before-change-functions beg end))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
154
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
155 (defsubst viper-post-command-sentinel ()
74857
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
156 (condition-case conds
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
157 (run-hooks 'viper-post-command-hooks)
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
158 (error (viper-message-conditions conds)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
159 (if (eq viper-current-state 'vi-state)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
160 (viper-restore-cursor-color 'after-insert-mode)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
161
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
162 (defsubst viper-pre-command-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
163 (run-hooks 'viper-pre-command-hooks))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
164
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
165 ;; Needed so that Viper will be able to figure the last inserted
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
166 ;; chunk of text with reasonable accuracy.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
167 (defsubst viper-insert-state-post-command-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
168 (if (and (memq viper-current-state '(insert-state replace-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
169 viper-insert-point
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
170 (>= (point) viper-insert-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
171 (setq viper-last-posn-while-in-insert-state (point-marker)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
172 (or (viper-overlay-p viper-replace-overlay)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
173 (progn
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
174 (viper-set-replace-overlay (point-min) (point-min))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
175 (viper-hide-replace-overlay)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
176 (if (eq viper-current-state 'insert-state)
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
177 (let ((icolor (viper-frame-value viper-insert-state-cursor-color)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
178 (or (stringp (viper-get-saved-cursor-color-in-insert-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
179 (string= (viper-get-cursor-color) icolor)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
180 ;; save current color, if not already saved
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
181 (viper-save-cursor-color 'before-insert-mode))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
182 ;; set insert mode cursor color
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
183 (viper-change-cursor-color icolor)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
184 (let ((ecolor (viper-frame-value viper-emacs-state-cursor-color)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
185 (when (and ecolor (eq viper-current-state 'emacs-state))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
186 (or (stringp (viper-get-saved-cursor-color-in-emacs-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
187 (string= (viper-get-cursor-color) ecolor)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
188 ;; save current color, if not already saved
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
189 (viper-save-cursor-color 'before-emacs-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
190 ;; set emacs mode cursor color
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
191 (viper-change-cursor-color ecolor)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
192
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
193 (if (and (memq this-command '(dabbrev-expand hippie-expand))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
194 (integerp viper-pre-command-point)
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
195 (markerp viper-insert-point)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
196 (marker-position viper-insert-point)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
197 (> viper-insert-point viper-pre-command-point))
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
198 (viper-move-marker-locally viper-insert-point viper-pre-command-point)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
199
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
200 (defsubst viper-preserve-cursor-color ()
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
201 (or (memq this-command '(self-insert-command
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
202 viper-del-backward-char-in-insert
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
203 viper-del-backward-char-in-replace
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
204 viper-delete-backward-char
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
205 viper-join-lines
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
206 viper-delete-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
207 (memq (viper-event-key last-command-event)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
208 '(up down left right (meta f) (meta b)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
209 (control n) (control p) (control f) (control b)))))
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
210
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
211 (defsubst viper-insert-state-pre-command-sentinel ()
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
212 (or (viper-preserve-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
213 (viper-restore-cursor-color 'after-insert-mode))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
214 (if (and (memq this-command '(dabbrev-expand hippie-expand))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
215 (markerp viper-insert-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
216 (marker-position viper-insert-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
217 (setq viper-pre-command-point (marker-position viper-insert-point))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
218
99595
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
219 (defun viper-R-state-post-command-sentinel ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
220 ;; Restoring cursor color is needed despite
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
221 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
222 ;; in another frame, the pre-command hook won't change cursor color to
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
223 ;; default in that other frame. So, if the second frame cursor was red and
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
224 ;; we set the point outside the replacement region, then the cursor color
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
225 ;; will remain red. Restoring the default, below, prevents this.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
226 (if (and (<= (viper-replace-start) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
227 (<= (point) (viper-replace-end)))
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
228 (viper-change-cursor-color
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
229 (viper-frame-value viper-replace-overlay-cursor-color))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
230 (viper-restore-cursor-color 'after-replace-mode)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
231
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 ;; to speed up, don't change cursor color before self-insert
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
233 ;; and common move commands
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
234 (defsubst viper-replace-state-pre-command-sentinel ()
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
235 (or (viper-preserve-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
236 (viper-restore-cursor-color 'after-replace-mode)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
237
26702
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
238
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
239 ;; Make sure we don't delete more than needed.
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
240 ;; This is executed at viper-last-posn-in-replace-region
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
241 (defsubst viper-trim-replace-chars-to-delete-if-necessary ()
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
242 (setq viper-replace-chars-to-delete
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
243 (max 0
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
244 (min viper-replace-chars-to-delete
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
245 ;; Don't delete more than to the end of repl overlay
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
246 (viper-chars-in-region
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
247 (viper-replace-end) viper-last-posn-in-replace-region)
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
248 ;; point is viper-last-posn-in-replace-region now
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
249 ;; So, this limits deletion to the end of line
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
250 (viper-chars-in-region (point) (viper-line-pos 'end))
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
251 ))))
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
252
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
253
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
254 (defun viper-replace-state-post-command-sentinel ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
255 ;; Restoring cursor color is needed despite
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
256 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
257 ;; in another frame, the pre-command hook won't change cursor color to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
258 ;; default in that other frame. So, if the second frame cursor was red and
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
259 ;; we set the point outside the replacement region, then the cursor color
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
260 ;; will remain red. Restoring the default, below, fixes this problem.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
261 ;;
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
262 ;; We optimize for some commands, like self-insert-command,
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
263 ;; viper-delete-backward-char, etc., since they either don't change
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
264 ;; cursor color or, if they terminate replace mode, the color will be changed
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
265 ;; in viper-finish-change
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
266 (or (viper-preserve-cursor-color)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
267 (viper-restore-cursor-color 'after-replace-mode))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
268 (cond
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
269 ((eq viper-current-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
270 ;; delete characters to compensate for inserted chars.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
271 (let ((replace-boundary (viper-replace-end)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
272 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
273 (goto-char viper-last-posn-in-replace-region)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
274 (viper-trim-replace-chars-to-delete-if-necessary)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
275 (delete-char viper-replace-chars-to-delete)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
276 (setq viper-replace-chars-to-delete 0)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
277 ;; terminate replace mode if reached replace limit
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
278 (if (= viper-last-posn-in-replace-region (viper-replace-end))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
279 (viper-finish-change)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
280
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
281 (when (viper-pos-within-region
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
282 (point) (viper-replace-start) replace-boundary)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
283 ;; the state may have changed in viper-finish-change above
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
284 (if (eq viper-current-state 'replace-state)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
285 (viper-change-cursor-color
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
286 (viper-frame-value viper-replace-overlay-cursor-color)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
287 (setq viper-last-posn-in-replace-region (point-marker)))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
288 ;; terminate replace mode if changed Viper states.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
289 (t (viper-finish-change))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
290
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
291
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
292 ;; changing mode
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
293
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
294 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
295 (defun viper-change-state (new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
296 ;; Keep viper-post/pre-command-hooks fresh.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
297 ;; We remove then add viper-post/pre-command-sentinel since it is very
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
298 ;; desirable that viper-pre-command-sentinel is the last hook and
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
299 ;; viper-post-command-sentinel is the first hook.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
300
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
301 (when (featurep 'xemacs)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
302 (make-local-hook 'viper-after-change-functions)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
303 (make-local-hook 'viper-before-change-functions)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
304 (make-local-hook 'viper-post-command-hooks)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
305 (make-local-hook 'viper-pre-command-hooks))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
306
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
307 (remove-hook 'post-command-hook 'viper-post-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
308 (add-hook 'post-command-hook 'viper-post-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
309 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
310 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
311 ;; These hooks will be added back if switching to insert/replace mode
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
312 (remove-hook 'viper-post-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
313 'viper-insert-state-post-command-sentinel 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
314 (remove-hook 'viper-pre-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
315 'viper-insert-state-pre-command-sentinel 'local)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
316 (setq viper-intermediate-command nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
317 (cond ((eq new-state 'vi-state)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
318 (cond ((member viper-current-state '(insert-state replace-state))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
319
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
320 ;; move viper-last-posn-while-in-insert-state
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
321 ;; This is a normal hook that is executed in insert/replace
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
322 ;; states after each command. In Vi/Emacs state, it does
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
323 ;; nothing. We need to execute it here to make sure that
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
324 ;; the last posn was recorded when we hit ESC.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
325 ;; It may be left unrecorded if the last thing done in
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
326 ;; insert/repl state was dabbrev-expansion or abbrev
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
327 ;; expansion caused by hitting ESC
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
328 (viper-insert-state-post-command-sentinel)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
329
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
330 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
331 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
332 (viper-save-last-insertion
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
333 viper-insert-point
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
334 viper-last-posn-while-in-insert-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
335 (if viper-began-as-replace
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
336 (setq viper-began-as-replace nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
337 ;; repeat insert commands if numerical arg > 1
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
338 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
339 (viper-repeat-insert-command))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
340 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
341 (viper-message-conditions conds)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
342
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
343 (if (> (length viper-last-insertion) 0)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
344 (viper-push-onto-ring viper-last-insertion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
345 'viper-insertion-ring))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
346
26702
8be2b52389a5 * viper-cmd.el (viper-change-state): Use
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26588
diff changeset
347 (if viper-ESC-moves-cursor-back
65627
511f8e9d22ca 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64750
diff changeset
348 (or (bolp) (viper-beginning-of-field) (backward-char 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
349 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
350
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
351 ;; insert or replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
352 ((memq new-state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
353 (if (memq viper-current-state '(emacs-state vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
354 (viper-move-marker-locally 'viper-insert-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
355 (viper-move-marker-locally
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
356 'viper-last-posn-while-in-insert-state (point))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
357 (add-hook 'viper-post-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
358 'viper-insert-state-post-command-sentinel t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
359 (add-hook 'viper-pre-command-hooks
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
360 'viper-insert-state-pre-command-sentinel t 'local))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
361 ) ; outermost cond
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
362
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
363 ;; Nothing needs to be done to switch to emacs mode! Just set some
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
364 ;; variables, which is already done in viper-change-state-to-emacs!
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
365
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
366 ;; ISO accents
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
367 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
368 ;; use the keys `,',^ , as they will do accents instead of Vi actions.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
369 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
370 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
371 (t (viper-set-iso-accents-mode nil)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
372 ;; Always turn off quail mode in vi state
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
373 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
374 (viper-special-input-method (viper-set-input-method t)) ;intl input on
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
375 (t (viper-set-input-method nil)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
376
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
377 (setq viper-current-state new-state)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
378
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
379 (viper-update-syntax-classes)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
380 (viper-normalize-minor-mode-map-alist)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
381 (viper-adjust-keys-for new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
382 (viper-set-mode-vars-for new-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
383 (viper-refresh-mode-line)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
384 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
385
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
386
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
387 (defun viper-adjust-keys-for (state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
388 "Make necessary adjustments to keymaps before entering STATE."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
389 (cond ((memq state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
390 (if viper-auto-indent
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
391 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
392 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
393 (if viper-want-emacs-keys-in-insert
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
394 ;; expert
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
395 (define-key viper-insert-basic-map "\C-j" nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
396 ;; novice
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
397 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
398 (define-key viper-insert-basic-map "\C-m" nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
399 (define-key viper-insert-basic-map "\C-j" nil))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
400
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
401 (setq viper-insert-diehard-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
402 (not viper-want-emacs-keys-in-insert))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
403
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
404 (if viper-want-ctl-h-help
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
405 (progn
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
406 (define-key viper-insert-basic-map "\C-h" 'help-command)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
407 (define-key viper-replace-map "\C-h" 'help-command))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
408 (define-key viper-insert-basic-map
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
409 "\C-h" 'viper-del-backward-char-in-insert)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
410 (define-key viper-replace-map
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
411 "\C-h" 'viper-del-backward-char-in-replace))
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
412 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
413 (define-key viper-insert-basic-map
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
414 [backspace] 'viper-del-backward-char-in-insert)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
415 (define-key viper-replace-map
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
416 [backspace] 'viper-del-backward-char-in-replace)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
417 ) ; end insert/replace case
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
418 (t ; Vi state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
419 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
420 (if viper-want-ctl-h-help
19891
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
421 (define-key viper-vi-basic-map "\C-h" 'help-command)
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
422 (define-key viper-vi-basic-map "\C-h" 'viper-backward-char))
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
423 ;; In XEmacs, C-h overrides backspace, so we make sure it doesn't.
f20c96ca3bc8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19756
diff changeset
424 (define-key viper-vi-basic-map [backspace] 'viper-backward-char))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
425 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
426
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
427
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
428 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
429 ;; This ensures that Viper bindings are in effect, regardless of which minor
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
430 ;; modes were turned on by the user or by other packages.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
431 (defun viper-normalize-minor-mode-map-alist ()
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
432 (setq viper--intercept-key-maps
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
433 (list
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
434 (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
435 (cons 'viper-insert-intercept-minor-mode viper-insert-intercept-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
436 (cons 'viper-emacs-intercept-minor-mode viper-emacs-intercept-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
437 ))
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
438 (setq viper--key-maps
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
439 (list (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
440 (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
441 (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
442 (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
443 (cons 'viper-vi-state-modifier-minor-mode
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
444 (if (keymapp
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
445 (cdr (assoc major-mode viper-vi-state-modifier-alist)))
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
446 (cdr (assoc major-mode viper-vi-state-modifier-alist))
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
447 viper-empty-keymap))
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
448 (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map)
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
449 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
450 (cons 'viper-replace-minor-mode viper-replace-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
451 ;; viper-insert-minibuffer-minor-mode must come after
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
452 ;; viper-replace-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
453 (cons 'viper-insert-minibuffer-minor-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
454 viper-minibuffer-map)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
455 (cons 'viper-insert-local-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
456 viper-insert-local-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
457 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
458 (cons 'viper-insert-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
459 viper-insert-global-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
460 (cons 'viper-insert-state-modifier-minor-mode
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
461 (if (keymapp
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
462 (cdr (assoc major-mode
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
463 viper-insert-state-modifier-alist)))
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
464 (cdr (assoc major-mode
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
465 viper-insert-state-modifier-alist))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
466 viper-empty-keymap))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
467 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
468 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
469 (cons 'viper-emacs-local-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
470 viper-emacs-local-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
471 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
472 (cons 'viper-emacs-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
473 viper-emacs-global-user-map)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
474 (cons 'viper-emacs-state-modifier-minor-mode
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
475 (if (keymapp
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
476 (cdr
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
477 (assoc major-mode viper-emacs-state-modifier-alist)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
478 (cdr
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
479 (assoc major-mode viper-emacs-state-modifier-alist))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
480 viper-empty-keymap))
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
481 ))
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
482
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
483 ;; This var is not local in Emacs, so we make it local. It must be local
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
484 ;; because although the stack of minor modes can be the same for all buffers,
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
485 ;; the associated *keymaps* can be different. In Viper,
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
486 ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
487 ;; different keymaps for different buffers. Also, the keymaps associated
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
488 ;; with viper-vi/insert-state-modifier-minor-mode can be different.
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
489 ;; ***This is needed only in case emulation-mode-map-alists is not defined.
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
490 ;; In emacs with emulation-mode-map-alists, nothing needs to be done
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
491 (unless
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
492 (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
493 (set (make-local-variable 'minor-mode-map-alist)
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
494 (viper-append-filter-alist
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
495 (append viper--intercept-key-maps viper--key-maps)
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
496 minor-mode-map-alist)))
64215
a4c59075cac8 * viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64085
diff changeset
497 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
498
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
499
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
500
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
501 ;; Viper mode-changing commands and utilities
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
502
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
503 ;; Modifies mode-line-buffer-identification.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
504 (defun viper-refresh-mode-line ()
65856
d64aeb0dc54e 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 65680
diff changeset
505 (set (make-local-variable 'viper-mode-string)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
506 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
507 ((eq viper-current-state 'vi-state) viper-vi-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
508 ((eq viper-current-state 'replace-state) viper-replace-state-id)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
509 ((eq viper-current-state 'insert-state) viper-insert-state-id)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
510
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
511 ;; Sets Viper mode string in global-mode-string
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
512 (force-mode-line-update))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
513
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
514
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
515 ;; Switch from Insert state to Vi state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
516 (defun viper-exit-insert-state ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
517 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
518 (viper-change-state-to-vi))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
519
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
520 (defun viper-set-mode-vars-for (state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
521 "Sets Viper minor mode variables to put Viper's state STATE in effect."
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
522
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
523 ;; Emacs state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
524 (setq viper-vi-minibuffer-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
525 viper-insert-minibuffer-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
526 viper-vi-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
527 viper-insert-intercept-minor-mode nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
528
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
529 viper-vi-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
530 viper-vi-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
531 viper-vi-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
532 viper-vi-state-modifier-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
533 viper-vi-diehard-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
534 viper-vi-basic-minor-mode nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
535
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
536 viper-replace-minor-mode nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
537
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
538 viper-insert-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
539 viper-insert-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
540 viper-insert-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
541 viper-insert-state-modifier-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
542 viper-insert-diehard-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
543 viper-insert-basic-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
544 viper-emacs-intercept-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
545 viper-emacs-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
546 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
547 viper-emacs-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
548 viper-emacs-state-modifier-minor-mode t
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
549 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
550
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
551 ;; Vi state
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
552 (if (eq state 'vi-state) ; adjust for vi-state
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
553 (setq
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
554 viper-vi-intercept-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
555 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
556 viper-vi-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
557 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
558 viper-vi-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
559 viper-vi-state-modifier-minor-mode t
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
560 ;; don't let the diehard keymap block command completion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
561 ;; and other things in the minibuffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
562 viper-vi-diehard-minor-mode (not
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
563 (or viper-want-emacs-keys-in-vi
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
564 (viper-is-in-minibuffer)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
565 viper-vi-basic-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
566 viper-emacs-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
567 viper-emacs-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
568 viper-emacs-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
569 viper-emacs-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
570 viper-emacs-state-modifier-minor-mode nil
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
571 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
572
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
573 ;; Insert and Replace states
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
574 (if (member state '(insert-state replace-state))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
575 (setq
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
576 viper-insert-intercept-minor-mode t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
577 viper-replace-minor-mode (eq state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
578 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
579 viper-insert-local-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
580 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
581 viper-insert-global-user-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
582 viper-insert-state-modifier-minor-mode t
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
583 ;; don't let the diehard keymap block command completion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
584 ;; and other things in the minibuffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
585 viper-insert-diehard-minor-mode (not
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
586 (or
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
587 viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
588 (viper-is-in-minibuffer)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
589 viper-insert-basic-minor-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
590 viper-emacs-intercept-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
591 viper-emacs-local-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
592 viper-emacs-kbd-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
593 viper-emacs-global-user-minor-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
594 viper-emacs-state-modifier-minor-mode nil
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
595 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
596
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
597 ;; minibuffer faces
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
598 (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
599 (setq viper-minibuffer-current-face
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
600 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
601 ((eq state 'vi-state) viper-minibuffer-vi-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
602 ((memq state '(insert-state replace-state))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
603 viper-minibuffer-insert-face))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
604
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
605 (if (viper-is-in-minibuffer)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
606 (viper-set-minibuffer-overlay))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
607 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
608
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
609 ;; This also takes care of the annoying incomplete lines in files.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
610 ;; Also, this fixes `undo' to work vi-style for complex commands.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
611 (defun viper-change-state-to-vi ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
612 "Change Viper state to Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
613 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
614 (if (and viper-first-time (not (viper-is-in-minibuffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
615 (viper-mode)
33842
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
616 (if overwrite-mode (overwrite-mode -1))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
617 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
618 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
619 (viper-hide-replace-overlay)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
620 (if abbrev-mode (expand-abbrev))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
621 (if (and auto-fill-function (> (current-column) fill-column))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
622 (funcall auto-fill-function))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
623 ;; don't leave whitespace lines around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
624 (if (and (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
625 '(viper-autoindent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
626 viper-open-line viper-Open-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
627 viper-replace-state-exit-cmd))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
628 (viper-over-whitespace-line))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
629 (indent-to-left-margin))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
630 (viper-add-newline-at-eob-if-necessary)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
631 (viper-adjust-undo)
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
632
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
633 (if (eq viper-current-state 'emacs-state)
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
634 (viper-restore-cursor-color 'after-emacs-mode)
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
635 (viper-restore-cursor-color 'after-insert-mode))
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
636
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
637 (viper-change-state 'vi-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
638
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
639 ;; Protect against user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
640 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
641 (run-hooks 'viper-vi-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
642 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
643 (viper-message-conditions conds)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
644
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
645 (defun viper-change-state-to-insert ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
646 "Change Viper state to Insert."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
647 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
648 (viper-change-state 'insert-state)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
649
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
650 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
651 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
652 (viper-hide-replace-overlay)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
653
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
654 (let ((icolor (viper-frame-value viper-insert-state-cursor-color)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
655 (or (stringp (viper-get-saved-cursor-color-in-insert-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
656 (string= (viper-get-cursor-color) icolor)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
657 (viper-save-cursor-color 'before-insert-mode))
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
658 (viper-change-cursor-color icolor))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
659
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
660 ;; Protect against user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
661 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
662 (run-hooks 'viper-insert-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
663 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
664 (viper-message-conditions conds))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
665
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
666 (defsubst viper-downgrade-to-insert ()
33842
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
667 ;; Protect against user errors in hooks
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
668 (condition-case conds
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
669 (run-hooks 'viper-insert-state-hook)
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
670 (error
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
671 (viper-message-conditions conds)))
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
672 (setq viper-current-state 'insert-state
f6a67d77484a * ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 33019
diff changeset
673 viper-replace-minor-mode nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
674
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
675
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
676
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
677 ;; Change to replace state. When the end of replacement region is reached,
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
678 ;; replace state changes to insert state.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
679 (defun viper-change-state-to-replace (&optional non-R-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
680 (viper-change-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
681 ;; Run insert-state-hook
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
682 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
683 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
684 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
685 (viper-message-conditions conds)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
686
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
687 (if non-R-cmd
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
688 (viper-start-replace)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
689 ;; 'R' is implemented using Emacs's overwrite-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
690 (viper-start-R-mode))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
691 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
692
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
693
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
694 (defun viper-change-state-to-emacs ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
695 "Change Viper state to Emacs."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
696 (interactive)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
697 (or (viper-overlay-p viper-replace-overlay)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
698 (viper-set-replace-overlay (point-min) (point-min)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
699 (viper-hide-replace-overlay)
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
700
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
701 (let ((ecolor (viper-frame-value viper-emacs-state-cursor-color)))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
702 (when ecolor
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
703 (or (stringp (viper-get-saved-cursor-color-in-emacs-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
704 (string= (viper-get-cursor-color) ecolor)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
705 (viper-save-cursor-color 'before-emacs-mode))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
706 (viper-change-cursor-color ecolor)))
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
707
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
708 (viper-change-state 'emacs-state)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
709
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
710 ;; Protect against user errors in hooks
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
711 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
712 (run-hooks 'viper-emacs-state-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
713 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
714 (viper-message-conditions conds))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
715
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
716 ;; escape to emacs mode termporarily
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
717 (defun viper-escape-to-emacs (arg &optional events)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
718 "Escape to Emacs state from Vi state for one Emacs command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
719 ARG is used as the prefix value for the executed command. If
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
720 EVENTS is a list of events, which become the beginning of the command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
721 (interactive "P")
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
722 (if (viper= last-command-event ?\\)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
723 (message "Switched to EMACS state for the next command..."))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
724 (viper-escape-to-state arg events 'emacs-state))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
725
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
726 ;; escape to Vi mode termporarily
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
727 (defun viper-escape-to-vi (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
728 "Escape from Emacs state to Vi state for one Vi 1-character command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
729 If the Vi command that the user types has a prefix argument, e.g., `d2w', then
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
730 Vi's prefix argument will be used. Otherwise, the prefix argument passed to
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
731 `viper-escape-to-vi' is used."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
732 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
733 (message "Switched to VI state for the next command...")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
734 (viper-escape-to-state arg nil 'vi-state))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
735
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
736 ;; Escape to STATE mode for one Emacs command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
737 (defun viper-escape-to-state (arg events state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
738 ;;(let (com key prefix-arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
739 (let (com key)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
740 ;; this temporarily turns off Viper's minor mode keymaps
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
741 (viper-set-mode-vars-for state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
742 (viper-normalize-minor-mode-map-alist)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
743 (if events (viper-set-unread-command-events events))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
744
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
745 ;; protect against keyboard quit and other errors
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
746 (condition-case nil
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
747 (let (viper-vi-kbd-minor-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
748 viper-insert-kbd-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
749 viper-emacs-kbd-minor-mode)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
750 (unwind-protect
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
751 (progn
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
752 (setq com
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
753 (key-binding (setq key (viper-read-key-sequence nil))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
754 ;; In case of binding indirection--chase definitions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
755 ;; Have to do it here because we execute this command under
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
756 ;; different keymaps, so command-execute may not do the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
757 ;; right thing there
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
758 (while (vectorp com) (setq com (key-binding com))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
759 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
760 ;; Execute command com in the original Viper state, not in state
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
761 ;; `state'. Otherwise, if we switch buffers while executing the
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
762 ;; escaped to command, Viper's mode vars will remain those of
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
763 ;; `state'. When we return to the orig buffer, the bindings will be
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
764 ;; screwed up.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
765 (viper-set-mode-vars-for viper-current-state)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
766
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
767 ;; this-command, last-command-char, last-command-event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
768 (setq this-command com)
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
769 (if (featurep 'xemacs)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
770 ;; XEmacs represents key sequences as vectors
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
771 (setq last-command-event
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
772 (viper-copy-event (viper-seq-last-elt key))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
773 last-command-char (event-to-character last-command-event))
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
774 ;; Emacs represents them as sequences (str or vec)
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
775 (setq last-command-event
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
776 (viper-copy-event (viper-seq-last-elt key))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
777
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
778 (if (commandp com)
64485
2273b7101b27 * viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64215
diff changeset
779 ;; pretend that current state is the state we excaped to
2273b7101b27 * viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64215
diff changeset
780 (let ((viper-current-state state))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
781 (setq prefix-arg (or prefix-arg arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
782 (command-execute com)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
783 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
784 (quit (ding))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
785 (error (beep 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
786 ;; set state in the new buffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
787 (viper-set-mode-vars-for viper-current-state))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
788
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
789 ;; This is used in order to allow reading characters according to the input
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
790 ;; method. The character is read in emacs and inserted into the buffer.
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
791 ;; If an input method is in effect, this might
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
792 ;; cause several characters to be combined into one.
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
793 ;; Also takes care of the iso-accents mode
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
794 (defun viper-special-read-and-insert-char ()
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
795 (viper-set-mode-vars-for 'emacs-state)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
796 (viper-normalize-minor-mode-map-alist)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
797 (if viper-special-input-method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
798 (viper-set-input-method t))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
799 (if viper-automatic-iso-accents
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
800 (viper-set-iso-accents-mode t))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
801 (condition-case nil
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
802 (let (viper-vi-kbd-minor-mode
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
803 viper-insert-kbd-minor-mode
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
804 viper-emacs-kbd-minor-mode
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
805 ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
806 (cond ((and viper-special-input-method
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
807 (featurep 'emacs)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
808 (fboundp 'quail-input-method))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
809 ;; (let ...) is used to restore unread-command-events to the
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
810 ;; original state. We don't want anything left in there after
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
811 ;; key translation. (Such left-overs are possible if the user
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
812 ;; types a regular key.)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
813 (let (unread-command-events)
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
814 ;; The next cmd and viper-set-unread-command-events
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
815 ;; are intended to prevent the input method
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
816 ;; from swallowing ^M, ^Q and other special characters
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
817 (setq ch (read-char-exclusive))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
818 ;; replace ^M with the newline
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
819 (if (eq ch ?\C-m) (setq ch ?\n))
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
820 ;; Make sure ^V and ^Q work as quotation chars
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
821 (if (memq ch '(?\C-v ?\C-q))
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
822 (setq ch (read-char-exclusive)))
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
823 (viper-set-unread-command-events ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
824 (quail-input-method nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
825
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
826 (if (and ch (string= quail-current-str ""))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
827 (insert ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
828 (insert quail-current-str))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
829 (setq ch (or ch
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
830 (aref quail-current-str
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
831 (1- (length quail-current-str)))))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
832 ))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
833 ((and viper-special-input-method
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
834 (featurep 'xemacs)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
835 (fboundp 'quail-start-translation))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
836 ;; same as above but for XEmacs, which doesn't have
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
837 ;; quail-input-method
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
838 (let (unread-command-events)
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
839 (setq ch (read-char-exclusive))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
840 ;; replace ^M with the newline
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
841 (if (eq ch ?\C-m) (setq ch ?\n))
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
842 ;; Make sure ^V and ^Q work as quotation chars
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
843 (if (memq ch '(?\C-v ?\C-q))
68997
6169b51037af 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68648
diff changeset
844 (setq ch (read-char-exclusive)))
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
845 (viper-set-unread-command-events ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
846 (quail-start-translation nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
847
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
848 (if (and ch (string= quail-current-str ""))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
849 (insert ch)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
850 (insert quail-current-str))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
851 (setq ch (or ch
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
852 (aref quail-current-str
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
853 (1- (length quail-current-str)))))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
854 ))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
855 ((and (boundp 'iso-accents-mode) iso-accents-mode)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
856 (setq ch (aref (read-key-sequence nil) 0))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
857 ;; replace ^M with the newline
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
858 (if (eq ch ?\C-m) (setq ch ?\n))
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
859 ;; Make sure ^V and ^Q work as quotation chars
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
860 (if (memq ch '(?\C-v ?\C-q))
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
861 (setq ch (aref (read-key-sequence nil) 0)))
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
862 (insert ch))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
863 (t
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
864 ;;(setq ch (read-char-exclusive))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
865 (setq ch (aref (read-key-sequence nil) 0))
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
866 (if (featurep 'xemacs)
72579
5ab6646918c5 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72516
diff changeset
867 (setq ch (event-to-character ch)))
42288
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
868 ;; replace ^M with the newline
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
869 (if (eq ch ?\C-m) (setq ch ?\n))
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
870 ;; Make sure ^V and ^Q work as quotation chars
3ce98f3e0608 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39901
diff changeset
871 (if (memq ch '(?\C-v ?\C-q))
72579
5ab6646918c5 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72516
diff changeset
872 (progn
5ab6646918c5 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72516
diff changeset
873 ;;(setq ch (read-char-exclusive))
5ab6646918c5 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72516
diff changeset
874 (setq ch (aref (read-key-sequence nil) 0))
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
875 (if (featurep 'xemacs)
72579
5ab6646918c5 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72516
diff changeset
876 (setq ch (event-to-character ch))))
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
877 )
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
878 (insert ch))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
879 )
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
880 (setq last-command-event
85972
51aa47312c4b * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85890
diff changeset
881 (viper-copy-event (if (featurep 'xemacs)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
882 (character-to-event ch) ch)))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
883 ) ; let
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
884 (error nil)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
885 ) ; condition-case
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45738
diff changeset
886
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
887 (viper-set-input-method nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
888 (viper-set-iso-accents-mode nil)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
889 (viper-set-mode-vars-for viper-current-state)
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
890 )
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
891
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
892
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
893 (defun viper-exec-form-in-vi (form)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
894 "Execute FORM in Vi state, regardless of the Ccurrent Vi state."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
895 (let ((buff (current-buffer))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
896 result)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
897 (viper-set-mode-vars-for 'vi-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
898
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
899 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
900 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros
74857
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
901 (setq result (eval form)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
902 (error
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
903 (signal 'quit nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
904
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
905 (if (not (equal buff (current-buffer))) ; cmd switched buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
906 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
907 (set-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
908 (viper-set-mode-vars-for viper-current-state)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
909 (viper-set-mode-vars-for viper-current-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
910 result))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
911
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
912 (defun viper-exec-form-in-emacs (form)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
913 "Execute FORM in Emacs, temporarily disabling Viper's minor modes.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
914 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
915 (let ((buff (current-buffer))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
916 result)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
917 (viper-set-mode-vars-for 'emacs-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
918 (setq result (eval form))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
919 (if (not (equal buff (current-buffer))) ; cmd switched buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
920 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
921 (set-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
922 (viper-set-mode-vars-for viper-current-state)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
923 (viper-set-mode-vars-for viper-current-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
924 result))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
925
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
926 ;; 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
927 ;; 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
928 (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
929 (interactive "P")
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
930 (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
931
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
932
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
933 ;; 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
934 ;; bindings. By letting Viper know which files these modes are in, it will
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
935 ;; arrange to reorganize minor-mode-map-alist so that things will work right.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
936 (defun viper-harness-minor-mode (load-file)
99655
700e59a3b82f * emulation/viper-cmd.el (viper-harness-minor-mode): Fix docstring typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 99595
diff changeset
937 "Familiarize Viper with a minor mode defined in LOAD-FILE.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
938 Minor modes that have their own keymaps may overshadow Viper keymaps.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
939 This function is designed to make Viper aware of the packages that define
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
940 such minor modes.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
941 Usage:
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
942 (viper-harness-minor-mode load-file)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
943
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
944 LOAD-FILE is a name of the file where the specific minor mode is defined.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
945 Suffixes such as .el or .elc should be stripped."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
946
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
947 (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
948
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
949 (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
950
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
951 ;; Change the default for minor-mode-map-alist each time a harnessed minor
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
952 ;; 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
953 (unless
fbdb9482b6fc 2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64701
diff changeset
954 (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
955 (eval-after-load
fbdb9482b6fc 2005-08-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64701
diff changeset
956 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
957 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
958
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
959
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
960 (defun viper-ESC (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
961 "Emulate ESC key in Emacs.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
962 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
963 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
964 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
965 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
966 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
967 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
968 as a Meta key and any number of multiple escapes is allowed."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
969 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
970 (let (char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
971 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
972 (setq char (viper-read-char-exclusive))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
973 (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
974 ((and (eq viper-no-multiple-ESC 'twice)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
975 (eq viper-current-state 'vi-state))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
976 (setq char (viper-read-char-exclusive))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
977 (if (= char (string-to-char viper-ESC-key))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
978 (ding)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
979 (viper-escape-to-emacs arg (list ?\e char) )))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
980 (t (ding)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
981 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
982
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
983 (defun viper-alternate-Meta-key (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
984 "Simulate Emacs Meta key."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
985 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
986 (sit-for 1) (message "ESC-")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
987 (viper-escape-to-emacs arg '(?\e)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
988
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
989 (defun viper-toggle-key-action ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
990 "Action bound to `viper-toggle-key'."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
991 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
992 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
993 (if (viper-window-display-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
994 (viper-iconify)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
995 (suspend-emacs))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
996 (viper-change-state-to-emacs)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
997
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
998
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
999 ;; Intercept ESC sequences on dumb terminals.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1000 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es>
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1001
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1002 ;; Check if last key was ESC and if so try to reread it as a function key.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1003 ;; But only if there are characters to read during a very short time.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1004 ;; Returns the last event, if any.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1005 (defun viper-envelop-ESC-key ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1006 (let ((event last-input-event)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1007 (keyseq [nil])
39288
25dc021070bc 2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39215
diff changeset
1008 (inhibit-quit t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1009 (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
1010 (progn
72516
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1011 ;; 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
1012 ;; 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
1013 ;; 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
1014 ;; 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
1015 ;; report it.
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1016 ;;(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
1017 (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1018 (progn
64485
2273b7101b27 * viper-cmd.el (viper-escape-to-state): bug fix
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64215
diff changeset
1019 (let (minor-mode-map-alist emulation-mode-map-alists)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1020 (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
1021 (setq keyseq (read-key-sequence nil 'continue-echo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1022 ) ; let
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1023 ;; If keyseq translates into something that still has ESC
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1024 ;; at the beginning, separate ESC from the rest of the seq.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1025 ;; In XEmacs we check for events that are keypress meta-key
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1026 ;; and convert them into [escape key]
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1027 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1028 ;; This is needed for the following reason:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1029 ;; If ESC is the first symbol, we interpret it as if the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1030 ;; user typed ESC and then quickly some other symbols.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1031 ;; If ESC is not the first one, then the key sequence
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1032 ;; entered was apparently translated into a function key or
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1033 ;; something (e.g., one may have
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1034 ;; (define-key function-key-map "\e[192z" [f11])
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1035 ;; which would translate the escape-sequence generated by
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1036 ;; f11 in an xterm window into the symbolic key f11.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1037 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1038 ;; If `first-key' is not an ESC event, we make it into the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1039 ;; 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
1040 ;; 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
1041 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1042 ;; that the last event was ESC and so it'll execute whatever is
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1043 ;; bound to ESC. (Viper macros can't be bound to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1044 ;; ESC-sequences).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1045 (let* ((first-key (elt keyseq 0))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1046 (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
1047 (cond ((and (viper-ESC-event-p first-key)
99789
125a6fd7c956 2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 99655
diff changeset
1048 (not (viper-translate-all-ESC-keysequences)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1049 ;; put keys following ESC on the unread list
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1050 ;; 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
1051 (viper-set-unread-command-events (viper-subseq keyseq 1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1052 (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
1053 keyseq (if (featurep 'emacs)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1054 "\e"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1055 (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
1056 ((and (featurep 'xemacs)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1057 (key-press-event-p first-key)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1058 (equal '(meta) key-mod))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1059 (viper-set-unread-command-events
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1060 (vconcat (vector
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1061 (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
1062 (viper-subseq keyseq 1)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1063 (setq last-input-event event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1064 keyseq (vector (character-to-event ?\e))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1065 ((eventp first-key)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1066 (setq last-command-event
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1067 (viper-copy-event first-key)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1068 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1069 ) ; end progn
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1070
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1071 ;; this is escape event with nothing after it
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1072 ;; put in unread-command-event and then re-read
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1073 (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
1074 (setq keyseq (read-key-sequence nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1075 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1076 ;; not an escape event
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1077 (setq keyseq (vector event)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1078 keyseq))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1079
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1080
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1081
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1082 ;; Listen to ESC key.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1083 ;; If a sequence of keys starting with ESC is issued with very short delays,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1084 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1085 (defun viper-intercept-ESC-key ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1086 "Function that implements ESC key in Viper emulation of Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1087 (interactive)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1088 (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
1089 '(lambda () (interactive) (error "Viper bell")))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1090
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1091 ;; call the actual function to execute ESC (if no other symbols followed)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1092 ;; 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
1093 ;; with very short delay between characters).
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1094 (if (eq cmd 'viper-intercept-ESC-key)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1095 (setq cmd
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1096 (cond ((eq viper-current-state 'vi-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1097 'viper-ESC)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1098 ((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
1099 'viper-exit-insert-state)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1100 ((eq viper-current-state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1101 'viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1102 (t 'viper-change-state-to-vi)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1103 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1104 (call-interactively cmd)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1105
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1106
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1107
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1108
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1109 ;; prefix argument for Vi mode
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1110
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1111 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1112 ;; represents the numeric value of the prefix argument and COM represents
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1113 ;; command prefix such as "c", "d", "m" and "y".
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1114
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1115 ;; Get value part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1116 (defsubst viper-p-val (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1117 (cond ((null arg) 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1118 ((consp arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1119 (if (or (null (car arg)) (equal (car arg) '(nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1120 1 (car arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1121 (t arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1122
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1123 ;; Get raw value part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1124 (defsubst viper-P-val (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1125 (cond ((consp arg) (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1126 (t arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1127
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1128 ;; Get com part of prefix-argument ARG.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1129 (defsubst viper-getcom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1130 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1131 ((consp arg) (cdr arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1132 (t nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1133
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1134 ;; Get com part of prefix-argument ARG and modify it.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1135 (defun viper-getCom (arg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1136 (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
1137 (cond ((viper= com ?c) ?c)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1138 ;; Previously, ?c was being converted to ?C, but this prevented
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1139 ;; multiline replace regions.
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1140 ;;((viper= com ?c) ?C)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1141 ((viper= com ?d) ?D)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1142 ((viper= com ?y) ?Y)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1143 (t com))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1144
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1145
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1146 ;; 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
1147 ;; Invoked by EVENT-CHAR. COM is the command part obtained so far.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1148 (defun viper-prefix-arg-value (event-char com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1149 (let ((viper-intermediate-command 'viper-digit-argument)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1150 value func)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1151 ;; read while number
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1152 (while (and (viper-characterp event-char)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1153 (>= event-char ?0) (<= event-char ?9))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1154 (setq value (+ (* (if (integerp value) value 0) 10) (- event-char ?0)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1155 (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
1156
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1157 (setq prefix-arg value)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1158 (if com (setq prefix-arg (cons prefix-arg com)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1159 (while (eq event-char ?U)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1160 (viper-describe-arg prefix-arg)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1161 (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
1162
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1163 (if (or com (and (not (eq viper-current-state 'vi-state))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1164 ;; make sure it is a Vi command
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1165 (viper-characterp event-char)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1166 (viper-vi-command-p event-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1167 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1168 ;; If appears to be one of the vi commands,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1169 ;; then execute it with funcall and clear prefix-arg in order to not
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1170 ;; confuse subsequent commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1171 (progn
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1172 ;; last-command-event is the char we want emacs to think was typed
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1173 ;; last. If com is not nil, the viper-digit-argument command was
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1174 ;; 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
1175 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1176 ;; `d', `w', etc. If viper-digit-argument was invoked by
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1177 ;; viper-escape-to-vi (which is indicated by the fact that the
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1178 ;; 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
1179 ;; vi command to be executed (e.g., `d', `w', etc). Again,
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1180 ;; last-command-event must make emacs believe that this is the command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1181 ;; we typed.
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1182 (cond ((eq event-char 'return) (setq event-char ?\C-m))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1183 ((eq event-char 'delete) (setq event-char ?\C-?))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1184 ((eq event-char 'backspace) (setq event-char ?\C-h))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1185 ((eq event-char 'space) (setq event-char ?\ )))
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1186 (setq last-command-event (or com event-char))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1187 (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
1188 `(key-binding (char-to-string ,event-char))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1189 (funcall func prefix-arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1190 (setq prefix-arg nil))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1191 ;; 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
1192 (viper-set-unread-command-events event-char))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1193 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1194
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1195
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1196 ;; Vi operator as prefix argument."
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1197 (defun viper-prefix-arg-com (char value com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1198 (let ((cont t)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1199 cmd-info
18958
506ec0258d63 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18855
diff changeset
1200 cmd-to-exec-at-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1201 (while (and cont
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1202 (viper-memq-char char
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1203 (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
1204 viper-buffer-search-char)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1205 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1206 ;; this means that we already have a command character, so we
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1207 ;; construct a com list and exit while. however, if char is "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1208 ;; it is an error.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1209 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1210 ;; 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
1211 (if (viper-memq-char char '(?# ?\")) (error "Viper bell"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1212 (setq com (cons char com))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1213 (setq cont nil))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1214 ;; 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
1215 ;; ", 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
1216 ;; 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
1217 ;; loop.
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1218 (cond ((viper-memq-char char '(?! ?=))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1219 (setq com char)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1220 (setq char (read-char))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1221 (setq cont nil))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1222 ((viper= char ?#)
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1223 ;; 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
1224 (setq com (+ 128 (read-char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1225 (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
1226 ((viper= char ?\")
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1227 (let ((reg (read-char)))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1228 (if (viper-valid-register reg)
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1229 (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
1230 (error "Viper bell"))
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1231 (setq char (read-char))))
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1232 (t
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1233 (setq com char)
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
73486
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1236 (if (atom com)
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1237 ;; `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
1238 ;; 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
1239 ;; 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
1240 (progn
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1241 (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
1242 (while (viper= char ?U)
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1243 (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
1244 (setq char (read-char)))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1245 ;; `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
1246 ;; 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
1247 (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
1248 (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
1249 (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
1250 (viper= char ?!) ; bang command
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1251 (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
1252 (error "Viper bell"))
73486
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1253 (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
1254 (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
1255 `(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
1256
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1257 ;; 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
1258 (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
1259 ;; execute apropriate region command.
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1260 (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
1261 (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
1262 (if (viper= char ?r)
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1263 (viper-region prefix-arg)
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1264 (viper-Region prefix-arg))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1265 ;; reset prefix-arg
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1266 (setq prefix-arg nil))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1267 ;; 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
1268 (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
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 (cond
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1271 ;; 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
1272 ;; 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
1273 ;; 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
1274 ;; 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
1275 ;; with nC.
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1276 ((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
1277 ((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
1278 ((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
1279 ((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
1280 ((equal com '(?< . ?<)) (viper-line (cons value ?<)))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1281 ((equal com '(?> . ?>)) (viper-line (cons value ?>)))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1282 ((equal com '(?! . ?!)) (viper-line (cons value ?!)))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1283 ((equal com '(?= . ?=)) (viper-line (cons value ?=)))
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1284 ;; gg acts as G0
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1285 ((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
1286 (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
1287
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1288 (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
1289 (progn
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1290 (setq last-command-event
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1291 (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
1292 (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
1293 (condition-case err
73486
db25befb2938 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72974
diff changeset
1294 (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
1295 (error
81331
c3779fe5830e 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 75346
diff changeset
1296 (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
1297 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1298
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1299 (defun viper-describe-arg (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1300 (let (val com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1301 (setq val (viper-P-val arg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1302 com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1303 (if (null val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1304 (if (null com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1305 (message "Value is nil, and command is nil")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1306 (message "Value is nil, and command is `%c'" com))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1307 (if (null com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1308 (message "Value is `%d', and command is nil" val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1309 (message "Value is `%d', and command is `%c'" val com)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1310
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1311 (defun viper-digit-argument (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1312 "Begin numeric argument for the next command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1313 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1314 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1315 (viper-prefix-arg-value
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1316 last-command-event (if (consp arg) (cdr arg) nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1317
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1318 (defun viper-command-argument (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1319 "Accept a motion command as an argument."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1320 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1321 (let ((viper-intermediate-command 'viper-command-argument))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1322 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1323 (viper-prefix-arg-com
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1324 last-command-event
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1325 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1326 ((consp arg) (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1327 ((integerp arg) arg)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1328 (t (error viper-InvalidCommandArgument)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1329 (cond ((null arg) nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1330 ((consp arg) (cdr arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1331 ((integerp arg) nil)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1332 (t (error viper-InvalidCommandArgument))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1333 (quit (setq viper-use-register nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1334 (signal 'quit nil)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1335 (viper-deactivate-mark)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1336
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1337
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1338 ;; repeat last destructive command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1339
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1340 ;; Append region to text in register REG.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1341 ;; START and END are buffer positions indicating what to append.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1342 (defsubst viper-append-to-register (reg start end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1343 (set-register reg (concat (if (stringp (get-register reg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1344 (get-register reg) "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1345 (buffer-substring start end))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1346
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1347 ;; Saves last inserted text for possible use by viper-repeat command.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1348 (defun viper-save-last-insertion (beg end)
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1349 (condition-case nil
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1350 (setq viper-last-insertion (buffer-substring beg end))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1351 (error
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1352 ;; beg or end marker are somehow screwed up
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
1353 (setq viper-last-insertion nil)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1354 (setq viper-last-insertion (buffer-substring beg end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1355 (or (< (length viper-d-com) 5)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1356 (setcar (nthcdr 4 viper-d-com) viper-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1357 (or (null viper-command-ring)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1358 (ring-empty-p viper-command-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1359 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1360 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1361 viper-last-insertion)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1362 ;; del most recent elt, if identical to the second most-recent
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1363 (viper-cleanup-ring viper-command-ring)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1364 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1365
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1366 (defsubst viper-yank-last-insertion ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1367 "Inserts the text saved by the previous viper-save-last-insertion command."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1368 (condition-case nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1369 (insert viper-last-insertion)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1370 (error nil)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1371
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1372
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1373 ;; define functions to be executed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1374
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1375 ;; invoked by the `C' command
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1376 (defun viper-exec-change (m-com com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1377 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1378 (set-marker viper-com-point (point) (current-buffer)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1379 ;; handle C cmd at the eol and at eob.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1380 (if (or (and (eolp) (= viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1381 (= viper-com-point (point-max)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1382 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1383 (insert " ")(backward-char 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1384 (if (= viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1385 (viper-forward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1386 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1387 (if (eq m-com 'viper-next-line-at-bol)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1388 (viper-enlarge-region (mark t) (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1389 (if (< (point) (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1390 (exchange-point-and-mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1391 (if (eq (preceding-char) ?\n)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1392 (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
1393 (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
1394 (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
1395 (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
1396 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1397
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1398 ;; this is invoked by viper-substitute-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1399 (defun viper-exec-Change (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1400 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1401 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1402 (viper-enlarge-region (mark t) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1403 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1404 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1405 (cond ((viper-valid-register viper-use-register '(letter digit))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1406 (copy-to-register
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1407 viper-use-register (mark t) (point) nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1408 ((viper-valid-register viper-use-register '(Letter))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1409 (viper-append-to-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1410 (downcase viper-use-register) (mark t) (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1411 (t (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1412 (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1413 (setq viper-use-register nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1414 (delete-region (mark t) (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1415 (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
1416 (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
1417 (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
1418 (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
1419 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1420
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1421 (defun viper-exec-delete (m-com com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1422 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1423 (set-marker viper-com-point (point) (current-buffer)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1424 (let (chars-deleted)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1425 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1426 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1427 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1428 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1429 viper-use-register viper-com-point (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1430 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1431 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1432 (downcase viper-use-register) viper-com-point (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1433 (t (setq viper-use-register nil)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1434 (error viper-InvalidRegister viper-use-register)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1435 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1436 (setq last-command
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1437 (if (eq last-command 'd-command) 'kill-region nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1438 (setq chars-deleted (abs (- (point) viper-com-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1439 (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
1440 (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
1441 (message "Deleted %d characters" chars-deleted)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1442 (kill-region viper-com-point (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1443 (setq this-command 'd-command)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1444 (if viper-ex-style-motion
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1445 (if (and (eolp) (not (bolp))) (backward-char 1)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1446
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1447 (defun viper-exec-Delete (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1448 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1449 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1450 (viper-enlarge-region (mark t) (point))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1451 (let (lines-deleted)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1452 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1453 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1454 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1455 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1456 viper-use-register (mark t) (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1457 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1458 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1459 (downcase viper-use-register) (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1460 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1461 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1462 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1463 (setq last-command
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1464 (if (eq last-command 'D-command) 'kill-region nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1465 (setq lines-deleted (count-lines (point) viper-com-point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1466 (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
1467 (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
1468 (message "Deleted %d lines" lines-deleted)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1469 (kill-region (mark t) (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1470 (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
1471 (back-to-indentation)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1472
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1473 ;; save region
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1474 (defun viper-exec-yank (m-com com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1475 (or (and (markerp viper-com-point) (marker-position viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1476 (set-marker viper-com-point (point) (current-buffer)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1477 (let (chars-saved)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1478 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1479 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1480 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1481 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1482 viper-use-register viper-com-point (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1483 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1484 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1485 (downcase viper-use-register) viper-com-point (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1486 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1487 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1488 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1489 (setq last-command nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1490 (copy-region-as-kill viper-com-point (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1491 (setq chars-saved (abs (- (point) viper-com-point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1492 (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
1493 (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
1494 (message "Saved %d characters" chars-saved)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1495 (goto-char viper-com-point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1496
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
1497 ;; save lines
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1498 (defun viper-exec-Yank (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1499 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1500 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1501 (viper-enlarge-region (mark t) (point))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1502 (let (lines-saved)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1503 (if viper-use-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1504 (progn
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1505 (cond ((viper-valid-register viper-use-register '(letter digit))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1506 (copy-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1507 viper-use-register (mark t) (point) nil))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1508 ((viper-valid-register viper-use-register '(Letter))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1509 (viper-append-to-register
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1510 (downcase viper-use-register) (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1511 (t (setq viper-use-register nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1512 (error viper-InvalidRegister viper-use-register)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1513 (setq viper-use-register nil)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1514 (setq last-command nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1515 (copy-region-as-kill (mark t) (point))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1516 (setq lines-saved (count-lines (mark t) (point)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1517 (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
1518 (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
1519 (message "Saved %d lines" lines-saved)))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1520 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1521 (goto-char viper-com-point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1522
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1523 (defun viper-exec-bang (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1524 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1525 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1526 (viper-enlarge-region (mark t) (point))
18958
506ec0258d63 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18855
diff changeset
1527 (exchange-point-and-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1528 (shell-command-on-region
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1529 (mark t) (point)
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1530 (if (viper= com ?!)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1531 (setq viper-last-shell-com
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1532 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1533 "!"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1534 nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1535 'viper-shell-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1536 (car viper-shell-history)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1537 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1538 viper-last-shell-com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1539 t)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1540
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1541 (defun viper-exec-equals (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1542 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1543 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1544 (viper-enlarge-region (mark t) (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1545 (if (> (mark t) (point)) (exchange-point-and-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1546 (indent-region (mark t) (point) nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1547
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1548 (defun viper-exec-shift (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1549 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1550 (set-mark viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1551 (viper-enlarge-region (mark t) (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1552 (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
1553 (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
1554 (if (viper= com ?>)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1555 viper-shift-width
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1556 (- viper-shift-width))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1557 ;; return point to where it was before shift
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1558 (goto-char viper-com-point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1559
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1560 ;; this is needed because some commands fake com by setting it to ?r, which
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1561 ;; denotes repeated insert command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1562 (defsubst viper-exec-dummy (m-com com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1563 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1564
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1565 (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
1566 (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
1567 (regexp-quote (buffer-substring (point) viper-com-point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1568 (setq viper-s-forward t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1569 (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
1570 (setq viper-intermediate-command 'viper-exec-buffer-search)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1571 (viper-search viper-s-string viper-s-forward 1))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1572
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1573 (defvar viper-exec-array (make-vector 128 nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1574
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1575 ;; 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
1576 ;; without affecting other functions. Buffer search can now be bound
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1577 ;; to any character.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1578
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1579 (aset viper-exec-array ?c 'viper-exec-change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1580 (aset viper-exec-array ?C 'viper-exec-Change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1581 (aset viper-exec-array ?d 'viper-exec-delete)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1582 (aset viper-exec-array ?D 'viper-exec-Delete)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1583 (aset viper-exec-array ?y 'viper-exec-yank)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1584 (aset viper-exec-array ?Y 'viper-exec-Yank)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1585 (aset viper-exec-array ?r 'viper-exec-dummy)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1586 (aset viper-exec-array ?! 'viper-exec-bang)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1587 (aset viper-exec-array ?< 'viper-exec-shift)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1588 (aset viper-exec-array ?> 'viper-exec-shift)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1589 (aset viper-exec-array ?= 'viper-exec-equals)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1590
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1591
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1592
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1593 ;; 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
1594 ;; destructive command on the region specified by the movement command. For
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1595 ;; instance, if the user types cw, then the command viper-forward-word will
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1596 ;; call viper-execute-com to execute viper-exec-change, which eventually will
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1597 ;; call viper-change to invoke the replace mode on the region.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1598 ;;
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1599 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1600 ;; via a call to viper-set-destructive-command, for later use by viper-repeat.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1601 (defun viper-execute-com (m-com val com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1602 (let ((reg viper-use-register))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1603 ;; this is the special command `#'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1604 (if (> com 128)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1605 (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
1606 (let ((fn (aref viper-exec-array com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1607 (if (null fn)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1608 (error "%c: %s" com viper-InvalidViCommand)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1609 (funcall fn m-com com))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1610 (if (viper-dotable-command-p com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1611 (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
1612 (list m-com val com reg nil nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1613 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1614
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1615
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1616 (defun viper-repeat (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1617 "Re-execute last destructive command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1618 Use the info in viper-d-com, which has the form
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1619 \(com val ch reg inserted-text command-keys\),
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1620 where `com' is the command to be re-executed, `val' is the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1621 argument to `com', `ch' is a flag for repeat, and `reg' is optional;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1622 if it exists, it is the name of the register for `com'.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1623 If the prefix argument, ARG, is non-nil, it is used instead of `val'."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1624 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1625 (let ((save-point (point)) ; save point before repeating prev cmd
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1626 ;; Pass along that we are repeating a destructive command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1627 ;; This tells viper-set-destructive-command not to update
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1628 ;; viper-command-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1629 (viper-intermediate-command 'viper-repeat))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1630 (if (eq last-command 'viper-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1631 ;; if the last command was viper-undo, then undo-more
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1632 (viper-undo-more)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1633 ;; otherwise execute the command stored in viper-d-com. if arg is
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1634 ;; non-nil its prefix value is used as new prefix value for the command.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1635 (let ((m-com (car viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1636 (val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1637 (com (nth 2 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1638 (reg (nth 3 viper-d-com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1639 (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
1640 (if (null m-com) (error "No previous command to repeat"))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1641 (setq viper-use-register reg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1642 (if (nth 4 viper-d-com) ; text inserted by command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1643 (setq viper-last-insertion (nth 4 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1644 viper-d-char (nth 4 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1645 (funcall m-com (cons val com))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1646 (cond ((and (< save-point (point)) viper-keep-point-on-repeat)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
1647 (goto-char save-point)) ; go back to before repeat.
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1648 ((and (< save-point (point)) viper-ex-style-editing)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
1649 (or (bolp) (backward-char 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1650 (if (and (eolp) (not (bolp)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1651 (backward-char 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1652 ))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1653 (viper-adjust-undo) ; take care of undo
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1654 ;; 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
1655 ;; just executed a command from that ring. So, push it on the ring again.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1656 ;; If we are just executing previous command , then don't push viper-d-com
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1657 ;; 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
1658 ;; the inserted text may be nil). Besides, in this case, the command
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1659 ;; executed by `.' is already on the ring.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1660 (if (eq last-command 'viper-display-current-destructive-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1661 (viper-push-onto-ring viper-d-com 'viper-command-ring))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1662 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1663 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1664
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1665 (defun viper-repeat-from-history ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1666 "Repeat a destructive command from history.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1667 Doesn't change viper-command-ring in any way, so `.' will work as before
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1668 executing this command.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1669 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
1670 the second character is a digit 0 to 9. The digit indicates which
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1671 history command to execute. `<char>0' is equivalent to `.', `<char>1'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1672 invokes the command before that, etc."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1673 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1674 (let* ((viper-intermediate-command 'repeating-display-destructive-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1675 (idx (cond (viper-this-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1676 (string-to-number
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1677 (symbol-name (elt viper-this-kbd-macro 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1678 (t 0)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1679 (num idx)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1680 (viper-d-com viper-d-com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1681
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1682 (or (and (numberp num) (<= 0 num) (<= num 9))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1683 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1684 (setq idx 0
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1685 num 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1686 (message
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1687 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1688 (while (< 0 num)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1689 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1690 (setq num (1- num)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1691 (viper-repeat nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1692 (while (> idx num)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1693 (viper-special-ring-rotate1 viper-command-ring 1)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1694 (setq num (1+ num)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1695 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1696
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1697
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
1698 ;; The hash-command. It is invoked interactively by the key sequence #<char>.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1699 ;; The chars that can follow `#' are determined by viper-hash-command-p
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1700 (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
1701 (cond ((viper= char ?c)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1702 (downcase-region (min viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1703 (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
1704 ((viper= char ?C)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1705 (upcase-region (min viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1706 (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
1707 ((viper= char ?g)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1708 (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
1709 ;; execute the last emacs kbd macro on each line of the region
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1710 (viper-global-execute))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1711 ((viper= char ?q)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1712 (push-mark viper-com-point t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1713 (viper-quote-region))
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1714 ((viper= char ?s)
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1715 (funcall viper-spell-function viper-com-point (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1716 (t (error "#%c: %s" char viper-InvalidViCommand))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1717
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1718
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1719 ;; undoing
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1720
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1721 ;; hook used inside undo
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1722 (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
1723
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1724 ;; 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
1725 (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
1726 (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
1727
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1728 (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
1729
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1730 ;; 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
1731 (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
1732 (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
1733 (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
1734 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
1735 ;; 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
1736 ;; 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
1737 ;; its repeated invocation
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1738 (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
1739 ))
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1740
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1741 (defun viper-undo ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1742 "Undo previous change."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1743 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1744 (message "undo!")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1745 (let ((modified (buffer-modified-p))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1746 (before-undo-pt (point-marker))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1747 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
1748
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1749 ;; 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
1750 (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
1751
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1752 (undo-start)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1753 (undo-more 2)
72516
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1754 ;;(setq undo-beg-posn (or undo-beg-posn (point))
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1755 ;; undo-end-posn (or undo-end-posn (point)))
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1756 ;;(setq undo-beg-posn (or undo-beg-posn before-undo-pt)
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1757 ;; undo-end-posn (or undo-end-posn undo-beg-posn))
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1758
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1759 (if (and undo-beg-posn undo-end-posn)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1760 (progn
72516
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1761 (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
1762 (sit-for 0)
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1763 (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
1764 (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
1765 (progn
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1766 (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
1767 (viper-sit-for-short 300)
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1768 (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
1769 (viper-sit-for-short 300)
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1770 (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
1771 (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
1772 (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
1773 (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
1774 ))
aba79a1f03ed 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 71382
diff changeset
1775
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1776 (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
1777 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1778 (setq this-command 'viper-undo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1779
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1780 ;; Continue undoing previous changes.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1781 (defun viper-undo-more ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1782 (message "undo more!")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1783 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1784 (undo-more 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1785 (error (beep)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1786 (message "No further undo information in this buffer")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1787 (if (and (eolp) (not (bolp))) (backward-char 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1788 (setq this-command 'viper-undo))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1789
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1790 ;; The following two functions are used to set up undo properly.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1791 ;; 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
1792 ;; they are undone all at once.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1793 (defun viper-adjust-undo ()
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1794 (if viper-undo-needs-adjustment
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1795 (let ((inhibit-quit t)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1796 tmp tmp2)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1797 (setq viper-undo-needs-adjustment nil)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1798 (if (listp buffer-undo-list)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1799 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1800 (progn
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1801 (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
1802
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1803 ;; cut tail from buffer-undo-list temporarily by direct
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1804 ;; manipulation with pointers in buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1805 (setcdr tmp nil)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1806
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1807 (setq buffer-undo-list (delq nil buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1808 (setq buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1809 (delq viper-buffer-undo-list-mark buffer-undo-list))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1810 ;; restore tail of buffer-undo-list
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1811 (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1812 (setq buffer-undo-list (delq nil buffer-undo-list)))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
1813 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1814
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1815
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1816 (defun viper-set-complex-command-for-undo ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1817 (if (listp buffer-undo-list)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1818 (if (not viper-undo-needs-adjustment)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1819 (let ((inhibit-quit t))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1820 (setq buffer-undo-list
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1821 (cons viper-buffer-undo-list-mark buffer-undo-list))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1822 (setq viper-undo-needs-adjustment t)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1823
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1824
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1825 ;;; 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
1826
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1827 (defun viper-display-current-destructive-command ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1828 (let ((text (nth 4 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1829 (keys (nth 5 viper-d-com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1830 (max-text-len 30))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1831
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1832 (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
1833
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1834 (message " `.' runs %s%s"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1835 (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
1836 (viper-abbreviate-string
92379
3b2c0edcb428 (zmacs-region-stays): No need to define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 87691
diff changeset
1837 (if (featurep 'xemacs)
93615
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1838 (replace-in-string ; xemacs
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1839 (cond ((characterp text) (char-to-string text))
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1840 ((stringp text) text)
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1841 (t ""))
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1842 "\n" "^J")
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1843 text ; emacs
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
1844 )
19079
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1845 max-text-len
dfbef8117c6a new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19078
diff changeset
1846 " inserting `" "'" " ......."))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1847 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1848
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1849
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1850 ;; don't change viper-d-com if it was viper-repeat command invoked with `.'
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1851 ;; or in some other way (non-interactively).
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1852 (defun viper-set-destructive-command (list)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1853 (or (eq viper-intermediate-command 'viper-repeat)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1854 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1855 (setq viper-d-com list)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1856 (setcar (nthcdr 5 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1857 (viper-array-to-string (if (arrayp viper-this-command-keys)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1858 viper-this-command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1859 (this-command-keys))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1860 (viper-push-onto-ring viper-d-com 'viper-command-ring)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1861 (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
1862
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1863
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1864 (defun viper-prev-destructive-command (next)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1865 "Find previous destructive command in the history of destructive commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1866 With prefix argument, find next destructive command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1867 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1868 (let (cmd viper-intermediate-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1869 (if (eq last-command 'viper-display-current-destructive-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1870 ;; repeated search through command history
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1871 (setq viper-intermediate-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1872 'repeating-display-destructive-command)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1873 ;; 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
1874 (setq viper-temp-command-ring (ring-copy viper-command-ring)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1875 (setq cmd (if next
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1876 (viper-special-ring-rotate1 viper-temp-command-ring 1)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1877 (viper-special-ring-rotate1 viper-temp-command-ring -1)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1878 (if (null cmd)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1879 ()
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1880 (setq viper-d-com cmd))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1881 (viper-display-current-destructive-command)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1882
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1883
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1884 (defun viper-next-destructive-command ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1885 "Find next destructive command in the history of destructive commands."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1886 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1887 (viper-prev-destructive-command 'next))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
1888
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1889
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1890 (defun viper-insert-prev-from-insertion-ring (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1891 "Cycle through insertion ring in the direction of older insertions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1892 Undoes previous insertion and inserts new.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1893 With prefix argument, cycles in the direction of newer elements.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1894 In minibuffer, this command executes whatever the invocation key is bound
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1895 to in the global map, instead of cycling through the insertion ring."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1896 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1897 (let (viper-intermediate-command)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1898 (if (eq last-command 'viper-insert-from-insertion-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1899 (progn ; repeated search through insertion history
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1900 (setq viper-intermediate-command 'repeating-insertion-from-ring)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1901 (if (eq viper-current-state 'replace-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1902 (undo 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1903 (if viper-last-inserted-string-from-insertion-ring
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1904 (backward-delete-char
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1905 (length viper-last-inserted-string-from-insertion-ring))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1906 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1907 ;;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
1908 (setq viper-temp-insertion-ring (ring-copy viper-insertion-ring)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1909 (setq this-command 'viper-insert-from-insertion-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1910 ;; so that things will be undone properly
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1911 (setq buffer-undo-list (cons nil buffer-undo-list))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1912 (setq viper-last-inserted-string-from-insertion-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1913 (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
1914
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1915 ;; this change of viper-intermediate-command must come after
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1916 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1917 ;; insertion.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1918 (setq viper-intermediate-command nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1919 (if viper-last-inserted-string-from-insertion-ring
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1920 (insert viper-last-inserted-string-from-insertion-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1921 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1922
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1923 (defun viper-insert-next-from-insertion-ring ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1924 "Cycle through insertion ring in the direction of older insertions.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1925 Undo previous insertion and inserts new."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1926 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1927 (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
1928
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
1929
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1930
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1931 ;; some region utilities
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1932
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1933 ;; If at the last line of buffer, add \\n before eob, if newline is missing.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1934 (defun viper-add-newline-at-eob-if-necessary ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1935 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1936 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1937 ;; make sure all lines end with newline, unless in the minibuffer or
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1938 ;; 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
1939 (save-restriction
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1940 (widen)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1941 (if (and (eobp)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1942 (not (bolp))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1943 require-final-newline
74857
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
1944 ;; 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
1945 ;; 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
1946 (buffer-modified-p)
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1947 (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
1948 (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
1949 ;; 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
1950 (condition-case nil
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
1951 (insert "\n")
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
1952 (error nil))
2e5f946f7726 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 73486
diff changeset
1953 ))
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
1954 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1955
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1956 (defun viper-yank-defun ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1957 (mark-defun)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1958 (copy-region-as-kill (point) (mark t)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1959
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1960 ;; Enlarge region between BEG and END.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1961 (defun viper-enlarge-region (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1962 (or beg (setq beg end)) ; if beg is nil, set to end
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1963 (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
1964
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1965 (if (< beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1966 (progn (goto-char beg) (set-mark end))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1967 (goto-char end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1968 (set-mark beg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1969 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1970 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1971 (if (or (not (eobp)) (not (bolp))) (forward-line 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1972 (if (not (eobp)) (beginning-of-line))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1973 (if (> beg end) (exchange-point-and-mark)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1974
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1975
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1976 ;; Quote region by each line with a user supplied string.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
1977 (defun viper-quote-region ()
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1978 (let ((quote-str viper-quote-string)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1979 (donot-change-dafault t))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1980 (setq quote-str
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1981 (viper-read-string-with-history
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1982 "Quote string: "
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1983 nil
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1984 'viper-quote-region-history
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1985 (cond ((string-match "tex.*-mode" (symbol-name major-mode)) "%%")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1986 ((string-match "java.*-mode" (symbol-name major-mode)) "//")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1987 ((string-match "perl.*-mode" (symbol-name major-mode)) "#")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1988 ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1989 ((memq major-mode '(c-mode cc-mode c++-mode)) "//")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1990 ((memq major-mode '(sh-mode shell-mode)) "#")
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1991 (t (setq donot-change-dafault nil)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1992 quote-str))))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1993 (or donot-change-dafault
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1994 (setq viper-quote-string quote-str))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1995 (viper-enlarge-region (point) (mark t))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1996 (if (> (point) (mark t)) (exchange-point-and-mark))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1997 (insert quote-str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1998 (beginning-of-line)
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
1999 (forward-line 1)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2000 (while (and (< (point) (mark t)) (bolp))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2001 (insert quote-str)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2002 (beginning-of-line)
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2003 (forward-line 1))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2004
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2005 ;; Tells whether BEG is on the same line as END.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2006 ;; If one of the args is nil, it'll return nil.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2007 (defun viper-same-line (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2008 (let ((selective-display nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2009 (incr 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2010 temp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2011 (if (and beg end (> beg end))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2012 (setq temp beg
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2013 beg end
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2014 end temp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2015 (if (and beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2016 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2017 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2018 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2019 ;; This 'if' is needed because Emacs treats the next empty line
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2020 ;; as part of the previous line.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2021 (if (= (viper-line-pos 'start) end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2022 (setq incr 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2023 (<= (+ incr (count-lines beg end)) 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2024 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2025
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2026
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2027 ;; Check if the string ends with a newline.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2028 (defun viper-end-with-a-newline-p (string)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2029 (or (string= string "")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2030 (= (viper-seq-last-elt string) ?\n)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2031
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2032 (defun viper-tmp-insert-at-eob (msg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2033 (let ((savemax (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2034 (goto-char savemax)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2035 (insert msg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2036 (sit-for 2)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2037 (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
2038 ))
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2039
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2040
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2041
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2042 ;;; Minibuffer business
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2043
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2044 (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
2045 (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
2046 (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
2047
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2048
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2049 (defun viper-minibuffer-setup-sentinel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2050 (let ((hook (if viper-vi-style-in-minibuffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2051 'viper-change-state-to-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2052 '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
2053 ;; 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
2054 ;; 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
2055 ;; 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
2056 ;; the normal buffers
d96e54250eea * viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2057 (make-local-variable 'viper-d-com)
d96e54250eea * viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2058 (make-local-variable 'viper-last-insertion)
d96e54250eea * viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2059 (make-local-variable 'viper-command-ring)
d96e54250eea * viper-cmd.el (viper-prefix-commands): make into a defconst.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 52401
diff changeset
2060 (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
2061 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
2062 viper-command-ring nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2063 (funcall hook)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2064 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2065
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2066 ;; 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
2067 ;; 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
2068 ;; 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
2069 ;; viper-read-string-with-history
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2070 (defun viper-minibuffer-standard-hook ()
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2071 (if (stringp init-message)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2072 (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
2073 (if (stringp initial)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2074 (progn
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2075 ;; 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
2076 (or unread-command-events
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2077 executing-kbd-macro
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2078 (sit-for 840))
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2079 (if (fboundp 'minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2080 (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
2081 (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
2082 (insert initial))))
26743
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2083
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2084 (defsubst viper-minibuffer-real-start ()
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2085 (if (fboundp 'minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2086 (minibuffer-prompt-end)
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2087 (point-min)))
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2088
65627
511f8e9d22ca 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64750
diff changeset
2089 (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
2090 (when (active-minibuffer-window)
511f8e9d22ca 2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 64750
diff changeset
2091 (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
2092 (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
2093
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2094
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2095 ;; Interpret last event in the local map first; if fails, use exit-minibuffer.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2096 ;; Run viper-minibuffer-exit-hook before exiting.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2097 (defun viper-exit-minibuffer ()
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2098 "Exit minibuffer Viper way."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2099 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2100 (let (command)
101009
ad9d2270860e Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
2101 (setq command (local-key-binding (char-to-string last-command-event)))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2102 (run-hooks 'viper-minibuffer-exit-hook)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2103 (if command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2104 (command-execute command)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2105 (exit-minibuffer))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2106
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2107
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2108 (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
2109 '("" "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
2110 "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
2111 "*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
2112 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
2113 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
2114 represents an editable file. However, file completion will stop at the `.'
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2115 The smart suffix feature lets you hit RET in such a case, and Viper will
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2116 select the appropriate suffix.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2117
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2118 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
2119 corresponding file exists is selected. If no file exists for any of the
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2120 suffixes, the user is asked to confirm.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2121
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2122 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
2123 :type '(repeat string)
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
2124 :group 'viper-misc)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2125
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2126
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2127 ;; Try to add a suitable suffix to files whose name ends with a `.'
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2128 ;; Useful when the user hits RET on a non-completed file name.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2129 ;; Used as a minibuffer exit hook in read-file-name
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2130 (defun viper-file-add-suffix ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2131 (let ((count 0)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2132 (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
2133 (file (buffer-substring-no-properties
2ddbff6366e9 * viper-cmd.el (viper-minibuffer-standard-hook,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26702
diff changeset
2134 (viper-minibuffer-real-start) (point-max)))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2135 found key cmd suff)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2136 (goto-char (point-max))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2137 (if (and viper-smart-suffix-list (string-match "\\.$" file))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2138 (progn
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2139 (while (and (not found) (< count len))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2140 (setq suff (nth count viper-smart-suffix-list)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2141 count (1+ count))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2142 (if (file-exists-p
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2143 (format "%s%s" (substitute-in-file-name file) suff))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2144 (progn
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2145 (setq found t)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2146 (insert suff))))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2147
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2148 (if found
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2149 ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2150 (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
2151 (unwind-protect
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2152 (while (not (memq cmd
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2153 '(exit-minibuffer viper-exit-minibuffer)))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2154 (setq cmd
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2155 (key-binding (setq key (read-key-sequence nil))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2156 (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
2157 (if (featurep 'xemacs)
93615
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
2158 (insert (events-to-keys key)) ; xemacs
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
2159 (insert key) ; emacs
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
2160 ))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2161 ((memq cmd '(exit-minibuffer viper-exit-minibuffer))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2162 nil)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2163 (t (command-execute cmd)))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2164 )))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2165 ))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2166
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2167
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2168 (defun viper-minibuffer-trim-tail ()
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2169 "Delete junk at the end of the first line of the minibuffer input.
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2170 Remove this function from `viper-minibuffer-exit-hook', if this causes
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2171 problems."
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2172 (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
2173 (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
2174 (goto-char (viper-minibuffer-real-start))
19756
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2175 (end-of-line)
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2176 (delete-region (point) (point-max)))))
22c1e47f66e1 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19462
diff changeset
2177
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2178
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2179 ;;; Reading string with history
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2180
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2181 (defun viper-read-string-with-history (prompt &optional initial
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2182 history-var default keymap
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2183 init-message)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2184 ;; Read string, prompting with PROMPT and inserting the INITIAL
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2185 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2186 ;; input is an empty string.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2187 ;; 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
2188 ;; minibuffer.
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2189 ;; KEYMAP is used, if given, instead of minibuffer-local-map.
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2190 ;; INIT-MESSAGE is the message temporarily displayed after entering the
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20003
diff changeset
2191 ;; minibuffer.
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2192 (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
2193 ;; 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
2194 (let ((old
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2195 (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
2196 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 nil)))
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2198 (cons
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2199 '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
2200 (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
2201 (list old) old))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2202 (val "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2203 (padding "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2204 temp-msg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2205
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2206 (setq keymap (or keymap minibuffer-local-map)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2207 initial (or initial "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2208 temp-msg (if default
65680
ed770a0a7846 2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents: 65627
diff changeset
2209 (format "(default %s) " default)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2210 ""))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2211
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2212 (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
2213 (setq val (read-from-minibuffer prompt
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2214 (concat temp-msg initial val padding)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2215 keymap nil history-var))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2216 (setq minibuffer-setup-hook nil
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2217 padding (viper-array-to-string (this-command-keys))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2218 temp-msg "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2219 ;; the following tries to be smart about what to put in history
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2220 (if (not (string= val (car (eval history-var))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2221 (set history-var (cons val (eval history-var))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2222 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2223 (string= (nth 0 (eval history-var)) ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2224 (set history-var (cdr (eval history-var))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2225 ;; 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
2226 ;; viper-command-argument, or `! shell-command', this probably means
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2227 ;; that the user typed something then erased. Return "" in this case, not
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2228 ;; the default---the default is too confusing in this case.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2229 (cond ((and (string= val "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2230 (not (string= prompt "!")) ; was a `! shell-command'
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2231 (not (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2232 '(viper-ex
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2233 viper-command-argument
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2234 t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2235 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2236 "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2237 ((string= val "") (or default ""))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2238 (t val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2239 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2240
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2241
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2242
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2243 ;; insertion commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2244
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2245 ;; Called when state changes from Insert Vi command mode.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2246 ;; Repeats the insertion command if Insert state was entered with prefix
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2247 ;; argument > 1.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2248 (defun viper-repeat-insert-command ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2249 (let ((i-com (car viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2250 (val (nth 1 viper-d-com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2251 (char (nth 2 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2252 (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
2253 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2254 (setq viper-d-com (list i-com (1- val) ?r nil nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2255 (viper-repeat nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2256 (setq viper-d-com (list i-com val char nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2257 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2258
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2259 (defun viper-insert (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2260 "Insert before point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2261 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2262 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2263 (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
2264 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2265 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2266 (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
2267 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2268 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2269 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2270
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2271 (defun viper-append (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2272 "Append after point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2273 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2274 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2275 (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
2276 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2277 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2278 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2279 (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
2280 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2281 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2282 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2283
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2284 (defun viper-Append (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2285 "Append at end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2286 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2287 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2288 (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
2289 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2290 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2291 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2292 (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
2293 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2294 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2295 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2296
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2297 (defun viper-Insert (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2298 "Insert before first non-white."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2299 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2300 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2301 (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
2302 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2303 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2304 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2305 (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
2306 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2307 (viper-loop val (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2308 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2309
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2310 (defun viper-open-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2311 "Open line below."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2312 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2313 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2314 (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
2315 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2316 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2317 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2318 (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
2319 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2320 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2321 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2322 (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
2323 (viper-indent-line col)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2324 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2325 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2328 (viper-change-state-to-insert)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2329
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2330 (defun viper-Open-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2331 "Open line above."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2332 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2333 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2334 (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
2335 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2336 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2337 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2338 (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
2339 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2340 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2341 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2342 (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
2343 (viper-indent-line col)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2344 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2345 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2348 (viper-change-state-to-insert)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2349
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2350 (defun viper-open-line-at-point (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2351 "Open line at point."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2352 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2353 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2354 (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
2355 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2356 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2357 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2358 (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
2359 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2360 (viper-loop val
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2361 (open-line 1)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2362 (viper-yank-last-insertion))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2363 (open-line 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2364 (viper-change-state-to-insert))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2365
38514
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2366 ;; bound to s
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2367 (defun viper-substitute (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2368 "Substitute characters."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2369 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2370 (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
2371 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2372 )
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2373 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2374 (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
2375 (if (eq viper-intermediate-command 'viper-repeat)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2376 (viper-change-subr (mark t) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2377 (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
2378 ;; com is set to ?r when we repeat this comand with dot
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2379 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2380 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2381
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2382 ;; Command bound to S
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2383 (defun viper-substitute-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2384 "Substitute lines."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2385 (interactive "p")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2386 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2387 (viper-line (cons arg ?C)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2388
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2389 ;; Prepare for replace
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2390 (defun viper-start-replace ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2391 (setq viper-began-as-replace t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2392 viper-sitting-in-replace t
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2393 viper-replace-chars-to-delete 0)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2394 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2395 'viper-after-change-functions 'viper-replace-mode-spy-after t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2396 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2397 'viper-before-change-functions 'viper-replace-mode-spy-before t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2398 ;; this will get added repeatedly, but no harm
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2399 (add-hook 'after-change-functions 'viper-after-change-sentinel t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2400 (add-hook 'before-change-functions 'viper-before-change-sentinel t)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2401 (viper-move-marker-locally
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2402 'viper-last-posn-in-replace-region (viper-replace-start))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2403 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2404 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2405 t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2406 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2407 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2408 ;; guard against a smartie who switched from R-replace to normal replace
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2409 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2410 '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
2411 (if overwrite-mode (overwrite-mode -1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2412 )
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2413
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2414
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2415 (defun viper-replace-mode-spy-before (beg end)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2416 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2417 )
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2418
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2419 ;; 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
2420 ;; 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
2421 ;; if this command performs several separate buffer changes. Therefore, if
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2422 ;; 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
2423 ;; deleted.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2424 (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
2425 (if (memq viper-intermediate-command
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2426 '(dabbrev-expand hippie-expand repeating-insertion-from-ring))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2427 ;; Take special care of text insertion from insertion ring inside
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2428 ;; replacement overlays.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2429 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2430 (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
2431 (viper-move-marker-locally
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2432 '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
2433
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2434 (let* ((real-end (min end (viper-replace-end)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2435 (column-shift (- (save-excursion (goto-char real-end)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2436 (current-column))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2437 (save-excursion (goto-char beg)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2438 (current-column))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2439 (chars-deleted 0))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2440
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2441 (if (> length 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2442 (setq chars-deleted viper-replace-region-chars-deleted))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2443 (setq viper-replace-region-chars-deleted 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2444 (setq viper-replace-chars-to-delete
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2445 (+ viper-replace-chars-to-delete
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2446 (-
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2447 ;; if column shift is bigger, due to a TAB insertion, take
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2448 ;; column-shift instead of the number of inserted chars
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2449 (max (viper-chars-in-region beg real-end)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2450 ;; This test accounts for Chinese/Japanese/... chars,
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2451 ;; which occupy 2 columns instead of one. If we use
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2452 ;; 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
2453 ;; one when the user types one Chinese character.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2454 ;; Deleting two would be OK, if they were European chars,
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2455 ;; but it is not OK if they are Chinese chars.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2456 ;; Since it is hard to
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2457 ;; figure out which characters are being deleted in any
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2458 ;; given region, we decided to treat Eastern and European
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2459 ;; characters equally, even though Eastern chars may
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2460 ;; occupy more columns.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2461 (if (memq this-command '(self-insert-command
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2462 quoted-insert viper-insert-tab))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2463 column-shift
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2464 0))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2465 ;; the number of deleted chars
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2466 chars-deleted)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2467
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2468 (viper-move-marker-locally
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2469 'viper-last-posn-in-replace-region
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2470 (max (if (> end (viper-replace-end)) (viper-replace-end) end)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2471 (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
2472 (viper-replace-start))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2473 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2474
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2475 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2476
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2477
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2478 ;; Delete stuff between viper-last-posn-in-replace-region and the end of
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2479 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2480 ;; the overlay and current point is before the end of the overlay.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2481 ;; Don't delete anything if current point is past the end of the overlay.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2482 (defun viper-finish-change ()
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2483 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2484 'viper-after-change-functions 'viper-replace-mode-spy-after 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2485 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2486 'viper-before-change-functions 'viper-replace-mode-spy-before 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2487 (remove-hook
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2488 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2489 (remove-hook
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2490 '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
2491 (viper-restore-cursor-color 'after-replace-mode)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2492 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2493 (save-excursion
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2494 (if (and viper-replace-overlay
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2495 (viper-pos-within-region viper-last-posn-in-replace-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2496 (viper-replace-start)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2497 (viper-replace-end))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2498 (< (point) (viper-replace-end)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2499 (delete-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2500 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
2501
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2502 (if (eq viper-current-state 'replace-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2503 (viper-downgrade-to-insert))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2504 ;; replace mode ended => nullify viper-last-posn-in-replace-region
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2505 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2506 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2507 (viper-refresh-mode-line)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2508 (viper-put-string-on-kill-ring viper-last-replace-region)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2509 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2510
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2511 ;; Make STRING be the first element of the kill ring.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2512 (defun viper-put-string-on-kill-ring (string)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2513 (setq kill-ring (cons string kill-ring))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2514 (if (> (length kill-ring) kill-ring-max)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2515 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2516 (setq kill-ring-yank-pointer kill-ring))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2517
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2518 (defun viper-finish-R-mode ()
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2519 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2520 'viper-post-command-hooks 'viper-R-state-post-command-sentinel 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2521 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2522 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel 'local)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2523 (viper-downgrade-to-insert))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2524
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2525 (defun viper-start-R-mode ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2526 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2527 (overwrite-mode 1)
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2528 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2529 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t 'local)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2530 (add-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2531 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2532 ;; guard against a smartie who switched from R-replace to normal replace
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2533 (remove-hook
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
2534 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel 'local)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2535 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2536
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2537
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2538
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2539 (defun viper-replace-state-exit-cmd ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2540 "Binding for keys that cause Replace state to switch to Vi or to Insert.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2541 These keys are ESC, RET, and LineFeed"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2542 (interactive)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2543 (if overwrite-mode ; if in replace mode invoked via 'R'
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2544 (viper-finish-R-mode)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2545 (viper-finish-change))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2546 (let (com)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2547 (if (eq this-command 'viper-intercept-ESC-key)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2548 (setq com 'viper-exit-insert-state)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2549 (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
2550 (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
2551
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2552 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2553 (command-execute com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2554 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2555 (viper-message-conditions conds)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2556 )
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2557 (viper-hide-replace-overlay))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2558
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2559
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2560 (defun viper-replace-state-carriage-return ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2561 "Carriage return in Viper replace state."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2562 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2563 ;; If Emacs start supporting overlay maps, as it currently supports
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2564 ;; 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
2565 ;; just have keymap attached to replace overlay. Then the "if part" of this
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2566 ;; statement can be deleted.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2567 (if (or (< (point) (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2568 (> (point) (viper-replace-end)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2569 (let (viper-replace-minor-mode com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2570 (viper-set-unread-command-events last-input-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2571 (setq com (key-binding (read-key-sequence nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2572 (condition-case conds
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2573 (command-execute com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2574 (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2575 (viper-message-conditions conds))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2576 (if (not viper-allow-multiline-replace-regions)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2577 (viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2578 (if (viper-same-line (point) (viper-replace-end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2579 (viper-replace-state-exit-cmd)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2580 ;; delete the rest of line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2581 (delete-region (point) (viper-line-pos 'end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2582 (save-excursion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2583 (end-of-line)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2584 (if (eobp) (error "Last line in buffer")))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2585 ;; skip to the next line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2586 (forward-line 1)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2587 (back-to-indentation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2588 ))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2589
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2590
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2591 ;; This is the function bound to 'R'---unlimited replace.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2592 ;; 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
2593 (defun viper-overwrite (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2594 "Begin overwrite mode."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2595 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2596 (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
2597 ;;(com (viper-getcom arg))
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2598 (len))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2599 (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
2600 (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
2601 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2602 ;; Viper saves inserted text in viper-last-insertion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2603 (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
2604 (delete-char (min len (- (point-max) (point) 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2605 (viper-loop val (viper-yank-last-insertion)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2606 (setq last-command 'viper-overwrite)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2607 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2608 (viper-set-replace-overlay (point) (viper-line-pos 'end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2609 (viper-change-state-to-replace)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2610 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2611
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2612
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2613 ;; line commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2614
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2615 (defun viper-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2616 (let ((val (car arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2617 (com (cdr arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2618 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2619 (if (not (eobp))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2620 (viper-next-line-carefully (1- val)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2621 ;; 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
2622 ;; last line of buffer when this line has no \n.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2623 (viper-add-newline-at-eob-if-necessary)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2624 (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
2625 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2626 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2627
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2628 (defun viper-yank-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2629 "Yank ARG lines (in Vi's sense)."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2630 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2631 (let ((val (viper-p-val arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2632 (viper-line (cons val ?Y))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2633
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2634
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2635 ;; region commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2636
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2637 (defun viper-region (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2638 "Execute command on a region."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2639 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2640 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2641 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2642 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2643 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2644 (viper-execute-com 'viper-region val com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2645
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2646 (defun viper-Region (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2647 "Execute command on a Region."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2648 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2649 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2650 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2651 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2652 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2653 (viper-execute-com 'viper-Region val com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2654
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2655 (defun viper-replace-char (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2656 "Replace the following ARG chars by the character read."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2657 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2658 (if (and (eolp) (bolp)) (error "No character to replace here"))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2659 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2660 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2661 (viper-replace-char-subr com val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2662 (if (and (eolp) (not (bolp))) (forward-char 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2663 (setq viper-this-command-keys
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2664 (format "%sr" (if (integerp arg) arg "")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2665 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2666 (list 'viper-replace-char val ?r nil viper-d-char nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2667 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2668
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2669 (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
2670 (let ((inhibit-quit t)
25dc021070bc 2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39215
diff changeset
2671 char)
39215
8dccf2552307 2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38514
diff changeset
2672 (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
2673 (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
2674 (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
2675
39901
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2676 (delete-char 1 t)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2677 (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
2678
39901
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2679 (if com (insert char))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45738
diff changeset
2680
39901
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2681 (setq viper-d-char char)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45738
diff changeset
2682
39901
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2683 (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
2684 (delete-char 1 t)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2685 (insert 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-adjust-undo)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2688 (backward-char arg)
50f67a72ea1b 2001-10-13 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 39288
diff changeset
2689 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2690
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2691
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2692 ;; basic cursor movement. j, k, l, h commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2693
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2694 (defun viper-forward-char (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2695 "Move point right ARG characters (left if ARG negative).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2696 On reaching end of line, stop and signal error."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2697 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2698 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2699 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2700 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2701 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2702 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2703 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2704 ;; the boundary condition check gets weird here because
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2705 ;; forward-char may be the parameter of a delete, and 'dl' works
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2706 ;; just like 'x' for the last char on a line, so we have to allow
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2707 ;; the forward motion before the 'viper-execute-com', but, of
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2708 ;; course, 'dl' doesn't work on an empty line, so we have to
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2709 ;; 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
2710 (if (and (eolp) (bolp)) (error "Viper bell") (forward-char val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2711 (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
2712 (if (eolp) (progn (backward-char 1) (error "Viper bell"))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2713 (forward-char val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2714 (if com (viper-execute-com 'viper-forward-char val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2715
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2716
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2717 (defun viper-backward-char (arg)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2718 "Move point left ARG characters (right if ARG negative).
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2719 On reaching beginning of line, stop and signal error."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2720 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2721 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2722 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2723 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2724 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2725 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2726 (progn
82467
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
2727 (if (bolp) (error "Viper bell") (backward-char val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2728 (if com (viper-execute-com 'viper-backward-char val com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2729 (backward-char val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2730 (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
2731
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2732
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2733 ;; 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
2734 ;; Returns distance traveled
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2735 ;; (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
2736 (defun viper-forward-char-carefully (&optional arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2737 (setq arg (or arg 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2738 (let ((pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2739 (condition-case nil
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2740 (forward-char arg)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2741 (error nil))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2742 (if (< (point) pt) ; arg was negative
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2743 (- (viper-chars-in-region pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2744 (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
2745
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2746
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2747 ;; Like backward-char, but doesn't move at beg of buffer.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2748 ;; Returns distance traveled
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2749 ;; (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
2750 (defun viper-backward-char-carefully (&optional arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2751 (setq arg (or arg 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2752 (let ((pt (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2753 (condition-case nil
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2754 (backward-char arg)
42602
633233bf2bbf 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 42288
diff changeset
2755 (error nil))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2756 (if (> (point) pt) ; arg was negative
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2757 (viper-chars-in-region pt (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2758 (- (viper-chars-in-region pt (point))))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2759
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2760 (defun viper-next-line-carefully (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2761 (condition-case nil
85890
d505125b0b46 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82467
diff changeset
2762 ;; do not use forward-line! need to keep column
99595
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
2763 (let ((line-move-visual nil))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
2764 (if (featurep 'emacs)
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
2765 (with-no-warnings (next-line arg))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
2766 (next-line arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2767 (error nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2768
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2769
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2770
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2771 ;;; Word command
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2772
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2773 ;; 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
2774 ;; word movement. When executed with a destructive command, \n is usually left
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2775 ;; 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
2776 ;; word and what is a separator. However, \n is always a separator. Also, if
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2777 ;; viper-syntax-preference is 'vi, then `_' is part of the word.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2778
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2779 ;; skip only one \n
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2780 (defun viper-skip-separators (forward)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2781 (if forward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2782 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2783 (viper-skip-all-separators-forward 'within-line)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2784 (if (looking-at "\n")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2785 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2786 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2787 (viper-skip-all-separators-forward 'within-line))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2788 ;; 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
2789 (if (and (eobp) (save-excursion
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2790 (viper-backward-char-carefully)
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2791 (viper-looking-at-separator)))
3649674ebf29 (viper-backward-Word, viper-skip-separators): Bug fixes.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
2792 (viper-backward-char-carefully))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2793 (viper-skip-all-separators-backward 'within-line)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2794 (viper-backward-char-carefully)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2795 (if (looking-at "\n")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2796 (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
2797 (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
2798
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
2799
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2800 (defun viper-forward-word-kernel (val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2801 (while (> val 0)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2802 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2803 (viper-skip-alpha-forward "_")
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2804 (viper-skip-separators t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2805 ((viper-looking-at-separator)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2806 (viper-skip-separators t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2807 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2808 (viper-skip-nonalphasep-forward)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2809 (viper-skip-separators t)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2810 (setq val (1- val))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2811
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
2812 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2813 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2814 (defun viper-separator-skipback-special (twice lim)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2815 (let ((prev-char (viper-char-at-pos 'backward))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2816 (saved-point (point)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2817 ;; 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
2818 (while (and (not (viper-memq-char prev-char '(nil \n)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2819 (< lim (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2820 ;; must be non-newline separator
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2821 (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
2822 (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
2823 (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2824 (viper-backward-char-carefully)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2825 (setq prev-char (viper-char-at-pos 'backward)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2826
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2827 (if (and (< lim (point)) (eq prev-char ?\n))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2828 (backward-char)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2829 ;; If we skipped to the next word and the prefix of this line doesn't
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2830 ;; consist of separators preceded by a newline, then don't skip backwards
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2831 ;; at all.
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2832 (goto-char saved-point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2833 (setq prev-char (viper-char-at-pos 'backward))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2834
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2835 ;; skip again, but make sure we don't overshoot the limit
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2836 (if twice
33019
6306740f6938 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
2837 (while (and (not (viper-memq-char prev-char '(nil \n)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2838 (< lim (point))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2839 ;; must be non-newline separator
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2840 (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
2841 (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
2842 (viper-memq-char (char-syntax prev-char) '(?\ ?-))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2843 (viper-backward-char-carefully)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2844 (setq prev-char (viper-char-at-pos 'backward))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2845
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2846 (if (= (point) lim)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2847 (viper-forward-char-carefully))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2848 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2849
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2850
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2851 (defun viper-forward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2852 "Forward word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2853 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2854 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2855 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2856 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2857 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2858 (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
2859 (if com
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2860 (progn
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2861 (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
2862 (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
2863 ;; 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
2864 ((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
2865 (viper-separator-skipback-special nil viper-com-point))
10482dd382e7 * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 38414
diff changeset
2866 ((viper-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
2867 (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
2868 (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
2869 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2870
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2871
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2872 (defun viper-forward-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2873 "Forward word delimited by white characters."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2874 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2875 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2876 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2877 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2878 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2879 (viper-loop val
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2880 (viper-skip-nonseparators 'forward)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2881 (viper-skip-separators t))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2882 (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
2883 (cond ((viper-char-equal com ?c)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2884 (viper-separator-skipback-special 'twice viper-com-point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2885 ;; 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
2886 ((viper-char-equal com ?y)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2887 (viper-separator-skipback-special nil viper-com-point))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2888 ((viper-dotable-command-p com)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2889 (viper-separator-skipback-special nil viper-com-point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2890 (viper-execute-com 'viper-forward-Word val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2891
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2892
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2893 ;; this is a bit different from Vi, but Vi's end of word
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2894 ;; makes no sense whatsoever
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2895 (defun viper-end-of-word-kernel ()
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2896 (if (viper-end-of-word-p) (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2897 (if (viper-looking-at-separator)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2898 (viper-skip-all-separators-forward))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2899
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2900 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2901 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2902 (viper-backward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2903
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2904 (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
2905 (or (eobp)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2906 (save-excursion
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2907 (cond ((viper-looking-at-alpha)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2908 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2909 (not (viper-looking-at-alpha)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2910 ((not (viper-looking-at-alphasep))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2911 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2912 (viper-looking-at-alphasep))))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2913
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2914
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2915 (defun viper-end-of-word (arg &optional careful)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2916 "Move point to end of current word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2917 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2918 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2919 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2920 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2921 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2922 (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
2923 (if com
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2924 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2925 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2926 (viper-execute-com 'viper-end-of-word val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2927
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2928 (defun viper-end-of-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2929 "Forward to end of word delimited by white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2930 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2931 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2932 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2933 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2934 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2935 (viper-loop val
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2936 (viper-end-of-word-kernel)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2937 (viper-skip-nonseparators 'forward)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2938 (backward-char))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
2939 (if com
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2940 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2941 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2942 (viper-execute-com 'viper-end-of-Word val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2943
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2944 (defun viper-backward-word-kernel (val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2945 (while (> val 0)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2946 (viper-backward-char-carefully)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2947 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2948 (viper-skip-alpha-backward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2949 ((viper-looking-at-separator)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2950 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2951 (viper-skip-separators nil)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2952 (viper-backward-char-carefully)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2953 (cond ((viper-looking-at-alpha)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2954 (viper-skip-alpha-backward "_"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2955 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2956 (viper-skip-nonalphasep-backward))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2957 ((bobp)) ; could still be at separator, but at beg of buffer
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2958 (t (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2959 ((not (viper-looking-at-alphasep))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2960 (viper-skip-nonalphasep-backward)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2961 (setq val (1- val))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2962
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2963 (defun viper-backward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2964 "Backward word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2965 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2966 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2967 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2968 (com (viper-getcom arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2969 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2970 (let (i)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2971 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2972 (backward-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2973 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2974 (if i (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2975 (viper-backward-word-kernel val)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2976 (if com (viper-execute-com 'viper-backward-word val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2977
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2978 (defun viper-backward-Word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2979 "Backward word delimited by white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2980 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2981 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2982 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2983 (com (viper-getcom arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2984 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2985 (let (i)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2986 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2987 (backward-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2988 (viper-move-marker-locally 'viper-com-point (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2989 (if i (forward-char))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2990 (viper-loop val
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2991 (viper-skip-separators nil) ; nil means backward here
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
2992 (viper-skip-nonseparators 'backward))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2993 (if com (viper-execute-com 'viper-backward-Word val com))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2994
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2995
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2996
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2997 ;; line commands
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
2998
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
2999 (defun viper-beginning-of-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3000 "Go to beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3001 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3002 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3003 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3004 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3005 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3006 (beginning-of-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3007 (if com (viper-execute-com 'viper-beginning-of-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3008
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3009 (defun viper-bol-and-skip-white (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3010 "Beginning of line at first non-white character."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3011 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3012 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3013 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3014 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3015 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3016 (forward-to-indentation (1- val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3017 (if com (viper-execute-com 'viper-bol-and-skip-white val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3018
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3019 (defun viper-goto-eol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3020 "Go to end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3021 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3022 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3023 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3024 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3025 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3026 (end-of-line val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3027 (if com (viper-execute-com 'viper-goto-eol val com))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3028 (if viper-ex-style-motion
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3029 (if (and (eolp) (not (bolp))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3030 ;; a fix for viper-change-to-eol
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3031 (not (equal viper-current-state 'insert-state)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3032 (backward-char 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3033 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3034
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3035
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3036 (defun viper-goto-col (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3037 "Go to ARG's column."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3038 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3039 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3040 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3041 (com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3042 line-len)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3043 (setq line-len
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3044 (viper-chars-in-region
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3045 (viper-line-pos 'start) (viper-line-pos 'end)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3046 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3047 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3048 (forward-char (1- (min line-len val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3049 (while (> (current-column) (1- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3050 (backward-char 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3051 (if com (viper-execute-com 'viper-goto-col val com))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3052 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3053 (end-of-line)
82467
ff85cbd27ee2 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82140
diff changeset
3054 (if (> val (current-column)) (error "Viper bell")))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3055 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3056
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3057
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3058 (defun viper-next-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3059 "Go to next line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3060 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3061 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3062 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3063 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3064 (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
3065 ;; do not use forward-line! need to keep column
99595
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3066 (let ((line-move-visual nil))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3067 (if (featurep 'emacs)
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3068 (with-no-warnings (next-line val))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3069 (next-line val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3070 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3071 (if (and (eolp) (not (bolp))) (backward-char 1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3072 (setq this-command 'next-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3073 (if com (viper-execute-com 'viper-next-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3074
87691
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
3075 (declare-function widget-type "wid-edit" (widget))
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
3076 (declare-function widget-button-press "wid-edit" (pos &optional event))
f2c8fd594360 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 87678
diff changeset
3077 (declare-function viper-set-hooks "viper" ())
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3078
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3079 (defun viper-next-line-at-bol (arg)
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3080 "Next line at beginning of line.
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3081 If point is on a widget or a button, simulate clicking on that widget/button."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3082 (interactive "P")
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3083 (let* ((field (get-char-property (point) 'field))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3084 (button (get-char-property (point) 'button))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3085 (doc (get-char-property (point) 'widget-doc))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3086 (widget (or field button doc)))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3087 (if (and widget
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3088 (if (symbolp widget)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3089 (get widget 'widget-type)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3090 (and (consp widget)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3091 (get (widget-type widget) 'widget-type))))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3092 (widget-button-press (point))
72974
54ea774c3eed * viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 72579
diff changeset
3093 (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
71382
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3094 (push-button)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3095 ;; not a widget or a button
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3096 (viper-leave-region-active)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3097 (save-excursion
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3098 (end-of-line)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3099 (if (eobp) (error "Last line in buffer")))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3100 (let ((val (viper-p-val arg))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3101 (com (viper-getCom arg)))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3102 (if com (viper-move-marker-locally 'viper-com-point (point)))
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3103 (forward-line val)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3104 (back-to-indentation)
4033086b16b6 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 68997
diff changeset
3105 (if com (viper-execute-com 'viper-next-line-at-bol val com)))))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3106
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
3107
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3108 (defun viper-previous-line (arg)
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3109 "Go to previous line."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3110 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3111 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3112 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3113 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3114 (if com (viper-move-marker-locally 'viper-com-point (point)))
85890
d505125b0b46 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 82467
diff changeset
3115 ;; do not use forward-line! need to keep column
99595
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3116 (let ((line-move-visual nil))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3117 (if (featurep 'emacs)
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3118 (with-no-warnings (previous-line val))
eb7532b56b78 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 94658
diff changeset
3119 (previous-line val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3120 (if viper-ex-style-motion
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3121 (if (and (eolp) (not (bolp))) (backward-char 1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3122 (setq this-command 'previous-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3123 (if com (viper-execute-com 'viper-previous-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3124
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3125
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3126 (defun viper-previous-line-at-bol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3127 "Previous line at beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3128 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3129 (viper-leave-region-active)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3130 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3131 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3132 (if (bobp) (error "First line in buffer")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3133 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3134 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3135 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3136 (forward-line (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3137 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3138 (if com (viper-execute-com 'viper-previous-line val com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3139
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3140 (defun viper-change-to-eol (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3141 "Change to end of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3142 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3143 (viper-goto-eol (cons arg ?c)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3144
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3145 (defun viper-kill-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3146 "Delete line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3147 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3148 (viper-goto-eol (cons arg ?d)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3149
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3150 (defun viper-erase-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3151 "Erase line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3152 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3153 (viper-beginning-of-line (cons arg ?d)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3154
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3155
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3156 ;;; Moving around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3157
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3158 (defun viper-goto-line (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3159 "Go to ARG's line. Without ARG go to end of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3160 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3161 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3162 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3163 (viper-move-marker-locally 'viper-com-point (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3164 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3165 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3166 (if (null val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3167 (goto-char (point-max))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3168 (goto-char (point-min))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3169 (forward-line (1- val)))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3170
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3171 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3172 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3173 (back-to-indentation)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3174
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3175 (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
3176
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3177 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3178 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3179 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3180
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3181 ;; Find ARG's occurrence of CHAR on the current line.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3182 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3183 ;; adjust point after search.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3184 (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
3185 (or (char-or-string-p char) (error "Viper bell"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3186 (let ((arg (if forward arg (- arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3187 (cmd (if (eq viper-intermediate-command 'viper-repeat)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3188 (nth 5 viper-d-com)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3189 (viper-array-to-string (this-command-keys))))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3190 point region-beg region-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3191 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3192 (save-restriction
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3193 (if (> arg 0) ; forward
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3194 (progn
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3195 (setq region-beg (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3196 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3197 (viper-forward-paragraph 1)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3198 (end-of-line))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3199 (setq region-end (point)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3200 (setq region-end (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3201 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3202 (viper-backward-paragraph 1)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3203 (beginning-of-line))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3204 (setq region-beg (point)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3205 (if (or (and (< arg 0)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3206 (< (- region-end region-beg)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3207 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3208 2 1))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3209 (bolp))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3210 (and (> arg 0)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3211 (< (- region-end region-beg)
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3212 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3213 3 2))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3214 (eolp)))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3215 (error "Command `%s': At %s of %s"
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3216 cmd
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3217 (if (> arg 0) "end" "beginning")
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3218 (if viper-allow-multiline-replace-regions
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3219 "paragraph" "line")))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3220 (narrow-to-region region-beg region-end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3221 ;; if arg > 0, point is forwarded before search.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3222 (if (> arg 0) (goto-char (1+ (point-min)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3223 (goto-char (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3224 (if (let ((case-fold-search nil))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3225 (search-forward (char-to-string char) nil 0 arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3226 (setq point (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3227 (error "Command `%s': `%c' not found" cmd char))))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3228 (goto-char point)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3229 (if (> arg 0)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3230 (backward-char (if offset 2 1))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
3231 (forward-char (if offset 1 0)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3232
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3233 (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
3234 "Find char on the line.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3235 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
3236 called from viper-repeat, the char last used is used. This behavior is
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3237 controlled by the sign of prefix numeric value."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3238 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3239 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3240 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3241 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3242 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3243 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3244 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3245 viper-f-forward t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3246 viper-f-offset nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3247 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3248 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3249 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3250 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3251 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3252 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3253 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3254 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3255 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3256 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3257 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3258 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3259 (setq viper-F-char viper-f-char) ; set new viper-F-char
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3260 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3261 (viper-execute-com 'viper-find-char-forward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3262
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3263 (defun viper-goto-char-forward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3264 "Go up to char ARG forward on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3265 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3266 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3267 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3268 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3269 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3270 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3271 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3272 viper-f-forward t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3273 viper-f-offset t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3274 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3275 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3276 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3277 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3278 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3279 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3280 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3281 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3282 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3283 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3284 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3285 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3286 (setq viper-F-char viper-f-char) ; set new viper-F-char
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3287 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3288 (viper-execute-com 'viper-goto-char-forward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3289
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3290 (defun viper-find-char-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3291 "Find char ARG on line backward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3292 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3293 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3294 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3295 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3296 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3297 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3298 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3299 viper-f-forward nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3300 viper-f-offset nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3301 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3302 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3303 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3304 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3305 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3306 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3307 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3308 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3309 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3310 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3311 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3312 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3313 (setq viper-F-char viper-f-char) ; set new viper-F-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3314 (viper-execute-com 'viper-find-char-backward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3315
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3316 (defun viper-goto-char-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3317 "Go up to char ARG backward on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3318 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3319 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3320 (com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3321 (cmd-representation (nth 5 viper-d-com)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3322 (if (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3323 ;; this means that the function was called interactively
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3324 (setq viper-f-char (read-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3325 viper-f-forward nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3326 viper-f-offset t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3327 ;; viper-repeat --- set viper-F-char from command-keys
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3328 (setq viper-F-char (if (stringp cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3329 (viper-seq-last-elt cmd-representation)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3330 viper-F-char)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3331 viper-f-char viper-F-char)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3332 (setq val (- val)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3333 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3334 (viper-find-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3335 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3336 (setq val (- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3337 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3338 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3339 (setq viper-F-char viper-f-char) ; set new viper-F-char
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3340 (viper-execute-com 'viper-goto-char-backward val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3341
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3342 (defun viper-repeat-find (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3343 "Repeat previous find command."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3344 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3345 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3346 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3347 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3348 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3349 (viper-find-char val viper-f-char viper-f-forward viper-f-offset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3350 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3351 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3352 (if viper-f-forward (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3353 (viper-execute-com 'viper-repeat-find val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3354
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3355 (defun viper-repeat-find-opposite (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3356 "Repeat previous find command in the opposite direction."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3357 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3358 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3359 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3360 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3361 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3362 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3363 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3364 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3365 (if viper-f-forward (forward-char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3366 (viper-execute-com 'viper-repeat-find-opposite val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3367
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3368
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3369 ;; window scrolling etc.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3370
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3371 (defun viper-window-top (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3372 "Go to home window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3373 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3374 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3375 (com (viper-getCom arg)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3376 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3377 (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
3378 (push-mark nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3379 (move-to-window-line (1- val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3380
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3381 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3382 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3383 (back-to-indentation)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3384
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3385 (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
3386
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3387 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3388 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3389 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3390
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3391 (defun viper-window-middle (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3392 "Go to middle window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3393 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3394 (let ((val (viper-p-val arg))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3395 (com (viper-getCom arg)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3396 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3397 (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
3398 (push-mark nil t)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3399 (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
3400
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3401 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3402 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3403 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3404
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3405 (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
3406
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3407 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3408 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3409 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3410
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3411 (defun viper-window-bottom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3412 "Go to last window line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3413 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3414 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3415 (com (viper-getCom arg)))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 23313
diff changeset
3416 (viper-leave-region-active)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3417 (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
3418 (push-mark nil t)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3419 (move-to-window-line (- val))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
3420
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3421 ;; positioning is done twice: before and after command execution
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3422 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3423 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3424
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3425 (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
3426
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3427 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3428 (back-to-indentation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3429 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3430
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3431 (defun viper-line-to-top (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3432 "Put current line on the home line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3433 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3434 (recenter (1- arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3435
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3436 (defun viper-line-to-middle (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3437 "Put current line on the middle line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3438 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3439 (recenter (+ (1- arg) (/ (1- (window-height)) 2))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3440
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3441 (defun viper-line-to-bottom (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3442 "Put current line on the last line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3443 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3444 (recenter (- (window-height) (1+ arg))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3445
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3446 ;; If point is within viper-search-scroll-threshold of window top or bottom,
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3447 ;; 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
3448 ;; 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
3449 ;; (which is called from viper-search-forward/backward/next). If the value of
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3450 ;; viper-search-scroll-threshold is negative - don't scroll.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3451 (defun viper-adjust-window ()
93615
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
3452 (let ((win-height (if (featurep 'xemacs)
34417c118a39 2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 92379
diff changeset
3453 (window-displayed-height)
92379
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3455 (pt (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3456 at-top-p at-bottom-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3457 min-scroll direction)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3458 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3459 (move-to-window-line 0) ; top
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3460 (setq at-top-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3461 (<= (count-lines pt (point))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3462 viper-search-scroll-threshold))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3463 (move-to-window-line -1) ; bottom
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3466 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3467 direction 1))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3468 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3469 direction -1)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3470 (if min-scroll
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3471 (recenter
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3472 (* (max min-scroll (/ win-height 7)) direction)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3473 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3474
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3475
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3480
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3481 (defun viper-paren-match (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3482 "Go to the matching parenthesis."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3483 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3484 (viper-leave-region-active)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3485 (let ((com (viper-getcom arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3486 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3487 anchor-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3488 (if (integerp arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3489 (if (or (> arg 99) (< arg 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3490 (error "Prefix must be between 1 and 99")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3491 (goto-char
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3492 (if (> (point-max) 80000)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3493 (* (/ (point-max) 100) arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3494 (/ (* (point-max) arg) 100)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3495 (back-to-indentation))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3496 (let (beg-lim end-lim)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3497 (if (and (eolp) (not (bolp))) (forward-char -1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3498 (if (not (looking-at "[][(){}]"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3499 (setq anchor-point (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3500 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3501 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3502 (setq beg-lim (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3503 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3506 (backward-char) )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3507 ((re-search-backward "[][(){}]" beg-lim t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3508 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3509 (error "No matching character on line"))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3510 (cond ((looking-at "[\(\[{]")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3511 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3512 (forward-sexp 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3513 (if com
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3514 (viper-execute-com 'viper-paren-match nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3515 (backward-char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3516 (anchor-point
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3517 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3518 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3519 (viper-move-marker-locally 'viper-com-point anchor-point)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3520 (forward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3521 (viper-execute-com 'viper-paren-match nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3522 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3523 ((looking-at "[])}]")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3524 (forward-char)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3525 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3526 (backward-sexp 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3529
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3530 (defun viper-toggle-parse-sexp-ignore-comments ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3531 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3532 (setq viper-parse-sexp-ignore-comments
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3533 (not viper-parse-sexp-ignore-comments))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3534 (princ (format
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3535 "From now on, `%%' will %signore parentheses inside comment fields"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3536 (if viper-parse-sexp-ignore-comments "" "NOT "))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3537
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3538
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3539 ;; sentence, paragraph and heading
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3540
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3541 (defun viper-forward-sentence (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3542 "Forward sentence."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3543 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3544 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3545 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3546 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3547 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3548 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3549 (forward-sentence val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3550 (if com (viper-execute-com 'viper-forward-sentence nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3551
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3552 (defun viper-backward-sentence (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3553 "Backward sentence."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3554 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3555 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3556 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3557 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3558 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3559 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3560 (backward-sentence val)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3561 (if com (viper-execute-com 'viper-backward-sentence nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3562
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3563 (defun viper-forward-paragraph (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3564 "Forward paragraph."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3565 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3566 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3567 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3568 (let ((val (viper-p-val arg))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3569 ;; if you want d} operate on whole lines, change viper-getcom to
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3570 ;; viper-getCom below
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3571 (com (viper-getcom arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3572 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3573 (forward-paragraph val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3574 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3575 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3576 (backward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3577 (viper-execute-com 'viper-forward-paragraph nil com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3578
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3579 (defun viper-backward-paragraph (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3580 "Backward paragraph."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3581 (interactive "P")
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3582 (or (eq last-command this-command)
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3583 (push-mark nil t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3584 (let ((val (viper-p-val arg))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3585 ;; if you want d{ operate on whole lines, change viper-getcom to
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3586 ;; viper-getCom below
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
3587 (com (viper-getcom arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3588 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3589 (backward-paragraph val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3590 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3591 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3592 (forward-char 1)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3593 (viper-execute-com 'viper-backward-paragraph nil com)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3594 (backward-char 1)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3595
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
3596 ;; should be mode-specific
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3597 (defun viper-prev-heading (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3598 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3599 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3600 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3601 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3602 (re-search-backward viper-heading-start nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3603 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3604 (if com (viper-execute-com 'viper-prev-heading nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3605
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3606 (defun viper-heading-end (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3607 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3608 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3609 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3610 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3611 (re-search-forward viper-heading-end nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3612 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3613 (if com (viper-execute-com 'viper-heading-end nil com))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3614
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3615 (defun viper-next-heading (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3616 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3617 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3618 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3619 (if com (viper-move-marker-locally 'viper-com-point (point)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3620 (end-of-line)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3621 (re-search-forward viper-heading-start nil t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3622 (goto-char (match-beginning 0))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3623 (if com (viper-execute-com 'viper-next-heading nil com))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3624
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3625
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3626 ;; scrolling
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3627
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3628 (defun viper-scroll-screen (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3629 "Scroll to next screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3630 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3631 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3632 (if (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3633 (while (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3634 (scroll-up)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3635 (setq arg (1- arg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3636 (while (> 0 arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3637 (scroll-down)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3638 (setq arg (1+ arg))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3639 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3640 (if (> arg 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3641 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3642 (message "End of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3643 (goto-char (point-max)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3644 (message "Beginning of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3645 (goto-char (point-min))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3646 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3647
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3648 (defun viper-scroll-screen-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3649 "Scroll to previous screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3650 (interactive "p")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3651 (viper-scroll-screen (- arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3652
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3653 (defun viper-scroll-down (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3654 "Pull down half screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3655 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3656 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3657 (if (null arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3658 (scroll-down (/ (window-height) 2))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3659 (scroll-down arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3660 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3661 (message "Beginning of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3662 (goto-char (point-min)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3663
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3664 (defun viper-scroll-down-one (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3665 "Scroll up one line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3666 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3667 (scroll-down arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3668
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3669 (defun viper-scroll-up (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3670 "Pull up half screen."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3671 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3672 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3673 (if (null arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3674 (scroll-up (/ (window-height) 2))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3675 (scroll-up arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3676 (error (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3677 (message "End of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3678 (goto-char (point-max)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3679
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3680 (defun viper-scroll-up-one (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3681 "Scroll down one line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3682 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3683 (scroll-up arg))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3684
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3685
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3686 ;; searching
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3687
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3688 (defun viper-if-string (prompt)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3689 (if (memq viper-intermediate-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3690 '(viper-command-argument viper-digit-argument viper-repeat))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3691 (setq viper-this-command-keys (this-command-keys)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3692 (let ((s (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3693 prompt
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3694 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3695 'viper-search-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3696 (car viper-search-history))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3704 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3705
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3706 Although this function is bound to \\[viper-toggle-search-style], the most
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3707 convenient way to use it is to bind `//' to the macro
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3712 the Emacs binding of `/'."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3713 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3714 (let (msg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3715 (cond ((or (eq arg 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3718 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3719 "case-insensitive" "case-sensitive")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3720 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3721 "case-sensitive"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3722 "case-insensitive")))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3723 (setq viper-case-fold-search (null viper-case-fold-search))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3724 (if viper-case-fold-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3725 (setq msg "Search becomes case-insensitive")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3726 (setq msg "Search becomes case-sensitive")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3727 ((or (eq arg 2)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3730 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3731 "regexp-search" "vanilla-search")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3732 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3733 "vanilla-search"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3734 "regexp-search")))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3735 (setq viper-re-search (null viper-re-search))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3736 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3737 (setq msg "Search becomes regexp-style")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3738 (setq msg "Search becomes vanilla-style")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3739 (t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3740 (setq msg "Search style remains unchanged")))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3741 (princ msg t)))
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3744 "Set the macros for toggling the search style in Viper's vi-state.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3745 The macro that toggles case sensitivity is bound to `//', and the one that
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3776 (defun viper-set-parsing-style-toggling-macro (unset)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3777 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3778 This is used in conjunction with the `%' command.
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3779
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3780 With a prefix argument, unsets the macro."
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3781 (interactive "P")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3782 (or noninteractive
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3783 (if (not unset)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3784 (progn
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3785 ;; Make %%% toggle parsing comments for matching parentheses
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3786 (viper-record-kbd-macro
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3787 "%%%" 'vi-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3789 't)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3790 (if (interactive-p)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3791 (message
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
3792 "%%%%%% now toggles whether comments should be parsed for matching parentheses")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3793 (viper-unrecord-kbd-macro "%%%" 'vi-state))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3794
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3795
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3796 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3797 "Set the macros for toggling the search style in Viper's emacs-state.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3798 The macro that toggles case sensitivity is bound to `//', and the one that
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3803 the macros are set in the current major mode.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3804 \(When unsetting the macros, the second argument has no effect.\)"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3805 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3806 (or noninteractive
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3807 (if (not unset)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3808 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3809 ;; toggle case sensitivity in search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3810 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3813 (or arg-majormode major-mode))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3814 ;; toggle regexp/vanila search
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3815 (viper-record-kbd-macro
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3816 "///" 'emacs-state
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3818 (or arg-majormode major-mode))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3819 (if (interactive-p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3820 (message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3821 "// and /// now toggle case-sensitivity and regexp search.")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3822 (viper-unrecord-kbd-macro "//" 'emacs-state)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3823 (sit-for 2)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3824 (viper-unrecord-kbd-macro "///" 'emacs-state))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3825
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3826
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3829 ARG is used to find the ARG's occurrence of the string.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3830 Null string will repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3831 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3832 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3836 (setq viper-s-forward t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3837 (viper-if-string "/")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3838 ;; this is not used at present, but may be used later
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3839 (if (or (not (equal old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3840 (not (markerp viper-local-search-start-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3841 (not (marker-buffer viper-local-search-start-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3842 (setq viper-local-search-start-marker (point-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3843 (viper-search viper-s-string t val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3844 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3845 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3849
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3852 ARG is used to find the ARG's occurrence of the string.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3853 Null string will repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3854 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3855 (let ((val (viper-P-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3859 (setq viper-s-forward nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3860 (viper-if-string "?")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3861 ;; this is not used at present, but may be used later
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3862 (if (or (not (equal old-str viper-s-string))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3863 (not (markerp viper-local-search-start-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3864 (not (marker-buffer viper-local-search-start-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3865 (setq viper-local-search-start-marker (point-marker)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3866 (viper-search viper-s-string nil val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3867 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3868 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3869 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3872
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3873 ;; Search for COUNT's occurrence of STRING.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3874 ;; Search is forward if FORWARD is non-nil, otherwise backward.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3875 ;; INIT-POINT is the position where search is to start.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3876 ;; Arguments:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3877 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3878 (defun viper-search (string forward arg
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3879 &optional no-offset init-point fail-if-not-found)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3880 (if (not (equal string ""))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3881 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3882 (com (viper-getcom arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3883 (offset (not no-offset))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3884 (case-fold-search viper-case-fold-search)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3885 (start-point (or init-point (point))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3886 (viper-deactivate-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3887 (if forward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3888 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3889 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3890 (if offset (viper-forward-char-carefully))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3891 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3892 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3893 (re-search-forward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3894 (re-search-backward string))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3895 (search-forward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3896 (search-backward string))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3899 (search-failed
93773
d7554c14325c 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 93615
diff changeset
3900 (if (and (not fail-if-not-found) viper-search-wrap-around)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3901 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3902 (message "Search wrapped around BOTTOM of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3903 (goto-char (point-min))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3904 (viper-search string forward (cons 1 com) t start-point 'fail)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3905 ;; don't wait in macros
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3908 '(viper-repeat
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3909 viper-digit-argument
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3910 viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3911 (sit-for 2))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3912 ;; delete the wrap-around message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3913 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3914 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3915 (goto-char start-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3916 (error "`%s': %s not found"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3917 string
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3918 (if viper-re-search "Pattern" "String"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3919 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3920 ;; backward
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3921 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3922 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3923 (if viper-re-search
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3924 (re-search-backward string nil nil val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3925 (search-backward string nil nil val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3928 (search-failed
93773
d7554c14325c 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 93615
diff changeset
3929 (if (and (not fail-if-not-found) viper-search-wrap-around)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3930 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3931 (message "Search wrapped around TOP of buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3932 (goto-char (point-max))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3933 (viper-search string forward (cons 1 com) t start-point 'fail)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3934 ;; don't wait in macros
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3937 '(viper-repeat
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3938 viper-digit-argument
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3939 viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3940 (sit-for 2))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3941 ;; delete the wrap-around message
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3942 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3943 )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3944 (goto-char start-point)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3945 (error "`%s': %s not found"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3946 string
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3947 (if viper-re-search "Pattern" "String"))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3948 ))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3949 ;; pull up or down if at top/bottom of window
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3950 (viper-adjust-window)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3951 ;; highlight the result of search
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3952 ;; don't wait and don't highlight in macros
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3955 '(viper-repeat viper-digit-argument viper-command-argument))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3956 (viper-flash-search-pattern))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3957 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3958
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3959 (defun viper-search-next (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3960 "Repeat previous search."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3961 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3967 (viper-search viper-s-string viper-s-forward arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3968 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3969 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3970 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3971 (viper-execute-com 'viper-search-next val com)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3972
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3973 (defun viper-search-Next (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3974 "Repeat previous search in the reverse direction."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3975 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3979 (if (null viper-s-string) (error viper-NoPrevSearch))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3980 (viper-search viper-s-string (not viper-s-forward) arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3981 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3982 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3983 (viper-move-marker-locally 'viper-com-point (mark t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3984 (viper-execute-com 'viper-search-Next val com)))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3985
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3986
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3987 ;; Search contents of buffer defined by one of Viper's motion commands.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
3988 ;; Repeatable via `n' and `N'.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3989 (defun viper-buffer-search-enable (&optional c)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3990 (cond (c (setq viper-buffer-search-char c))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
3993 (setq viper-buffer-search-char ?g)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4000 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4001 (setq viper-prefix-commands
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4002 (cons viper-buffer-search-char viper-prefix-commands)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4003
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4004 ;; This is a Viper wraper for isearch-forward.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4005 (defun viper-isearch-forward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4006 "Do incremental search forward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4007 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4008 ;; emacs bug workaround
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4009 (if (listp arg) (setq arg (car arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4010 (viper-exec-form-in-emacs (list 'isearch-forward arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4011
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4012 ;; This is a Viper wraper for isearch-backward."
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4013 (defun viper-isearch-backward (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4014 "Do incremental search backward."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4015 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4016 ;; emacs bug workaround
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4017 (if (listp arg) (setq arg (car arg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4018 (viper-exec-form-in-emacs (list 'isearch-backward arg)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4019
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4020
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4021 ;; visiting and killing files, buffers
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4022
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4023 (defun viper-switch-to-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4024 "Switch to buffer in the current window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4032
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4033 (defun viper-switch-to-buffer-other-window ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4034 "Switch to buffer in another window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4042
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4043 (defun viper-kill-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4044 "Kill a buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4045 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4046 (let (buffer buffer-name)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4051 (setq buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4052 (if (null buffer-name)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4053 (current-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4054 (get-buffer buffer-name)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4055 (if (null buffer) (error "`%s': No such buffer" buffer-name))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4058 (format
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4059 "Buffer `%s' is modified, are you sure you want to kill it? "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4060 buffer-name)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4061 (kill-buffer buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4062 (error "Buffer not killed"))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4063
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4064
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4065
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4066 ;; yank and pop
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4067
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4070 (insert text)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4071 (setq this-command 'yank))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4072
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4073 (defun viper-put-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4074 "Put back after point/below line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4075 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4076 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4077 (text (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4078 (cond ((viper-valid-register viper-use-register '(digit))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4079 (current-kill
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4080 (- viper-use-register ?1) 'do-not-rotate))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4081 ((viper-valid-register viper-use-register)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4082 (get-register (downcase viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4083 (t (error viper-InvalidRegister viper-use-register)))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4086 (if (null text)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4087 (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4088 (let ((reg viper-use-register))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4089 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4092 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4093 (if (viper-end-with-a-newline-p text)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4094 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4095 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4096 (if (eobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4097 (insert "\n")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4098 (forward-line 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4099 (beginning-of-line))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4100 (if (not (eolp)) (viper-forward-char-carefully)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4101 (set-marker (viper-mark-marker) (point) (current-buffer))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4102 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4103 (list 'viper-put-back val nil viper-use-register nil nil))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
4104 (setq sv-point (point))
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20343
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4115 ;; a newline
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4116 (if (viper-same-line (point) (mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4117 (or (= (point) (mark)) (viper-backward-char-carefully))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4118 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4119 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4120 (back-to-indentation)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4121 (viper-deactivate-mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4122
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4123 (defun viper-Put-back (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4124 "Put back at point/above line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4125 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4126 (let ((val (viper-p-val arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4127 (text (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4128 (cond ((viper-valid-register viper-use-register '(digit))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4129 (current-kill
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4130 (- viper-use-register ?1) 'do-not-rotate))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4131 ((viper-valid-register viper-use-register)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4132 (get-register (downcase viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4136 (if (null text)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4137 (if viper-use-register
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4138 (let ((reg viper-use-register))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4139 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4142 (setq viper-use-register nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4143 (if (viper-end-with-a-newline-p text) (beginning-of-line))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4144 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4145 (list 'viper-Put-back val nil viper-use-register nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4158 ;; a newline
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4159 (if (viper-same-line (point) (mark))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4160 (or (= (point) (mark)) (viper-backward-char-carefully))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4161 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4162 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4163 (back-to-indentation)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4166
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4167 ;; Copy region to kill-ring.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4168 ;; If BEG and END do not belong to the same buffer, copy empty region.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4169 (defun viper-copy-region-as-kill (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4170 (condition-case nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4171 (copy-region-as-kill beg end)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4174
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4175 (defun viper-delete-char (arg)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4176 "Delete next character."
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4177 (interactive "P")
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4178 (let ((val (viper-p-val arg))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4179 end-del-pos)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4180 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4181 (list 'viper-delete-char val nil nil nil nil))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4182 (if (and viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4183 (> val (viper-chars-in-region (point) (viper-line-pos 'end))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4184 (setq val (viper-chars-in-region (point) (viper-line-pos 'end))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4187 (save-excursion
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4188 (viper-forward-char-carefully val)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4189 (setq end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4190 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4191 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4192 (cond ((viper-valid-register viper-use-register '((Letter)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4193 (viper-append-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4194 (downcase viper-use-register) (point) end-del-pos))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4195 ((viper-valid-register viper-use-register)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4196 (copy-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4197 viper-use-register (point) end-del-pos nil))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4198 (t (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4199 (setq viper-use-register nil)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4200
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4201 (delete-char val t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4202 (if viper-ex-style-motion
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4203 (if (and (eolp) (not (bolp))) (backward-char 1)))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4204 ))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4205
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4208 (interactive "P")
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4209 (let ((val (viper-p-val arg))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4210 end-del-pos)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4211 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4214 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4215 (> val (viper-chars-in-region (viper-line-pos 'start) (point))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4216 (setq val (viper-chars-in-region (viper-line-pos 'start) (point))))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4217 (save-excursion
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4218 (viper-backward-char-carefully val)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4219 (setq end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4220 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4221 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4222 (cond ((viper-valid-register viper-use-register '(Letter))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4223 (viper-append-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4224 (downcase viper-use-register) end-del-pos (point)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4225 ((viper-valid-register viper-use-register)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4226 (copy-to-register
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4227 viper-use-register end-del-pos (point) nil))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4228 (t (error viper-InvalidRegister viper-use-register)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4229 (setq viper-use-register nil)))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4230 (if (and (bolp) viper-ex-style-editing)
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4231 (ding))
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4235 (defun viper-del-backward-char-in-insert ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4238 (if (and viper-ex-style-editing (bolp))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4244 (defun viper-del-backward-char-in-replace ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4245 "Delete one character in replace mode.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4249 cursor move past the beginning of line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4250 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4251 (cond (viper-delete-backwards-in-replace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4255 (viper-ex-style-editing
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4256 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4257 ((bobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4258 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4262 (viper-ex-style-editing
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4263 (if (bolp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4264 (beep 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4267 (backward-char 1))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4268
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4269
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4270
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4271 ;; join lines.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4272
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4273 (defun viper-join-lines (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4274 "Join this line to next, if ARG is nil. Otherwise, join ARG lines."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4275 (interactive "*P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4276 (let ((val (viper-P-val arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4277 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4278 (list 'viper-join-lines val nil nil nil nil))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4279 (viper-loop (if (null val) 1 (1- val))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4280 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4281 (if (not (eobp))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4282 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4283 (forward-line 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4284 (delete-region (point) (1- (point)))
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4285 (fixup-whitespace)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4286 ;; fixup-whitespace sometimes does not leave space
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4287 ;; between objects, so we insert it as in Vi
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4288 (or (looking-at " ")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4289 (insert " ")
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4290 (backward-char 1))
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4291 )))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4292
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4293
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4294 ;; Replace state
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4295
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4296 (defun viper-change (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4297 (if (markerp beg) (setq beg (marker-position beg)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4298 (if (markerp end) (setq end (marker-position end)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4299 ;; beg is sometimes (mark t), which may be nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4302 (viper-set-complex-command-for-undo)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4303 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4304 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4305 (copy-to-register viper-use-register beg end nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4306 (setq viper-use-register nil)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4307 (viper-set-replace-overlay beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4310 (if (= (viper-replace-start) (point-max))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4313 (setq viper-last-replace-region
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4314 (buffer-substring (viper-replace-start)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4317 ;; protect against error while inserting "@" and other disasters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4318 ;; (e.g., read-only buff)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4319 (condition-case conds
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4320 (if (or viper-allow-multiline-replace-regions
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4321 (viper-same-line (viper-replace-start)
19203
58c50205001d new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19079
diff changeset
4322 (viper-replace-end)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4323 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4324 ;; tabs cause problems in replace, so untabify
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4325 (goto-char (viper-replace-end))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4326 (insert-before-markers "@") ; put placeholder after the TAB
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4331 (viper-set-replace-overlay-glyphs
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4332 viper-replace-region-start-delimiter
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4333 viper-replace-region-end-delimiter)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4336 ;; "$" before-markers because then overlay-start will shift the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4339 (viper-move-replace-overlay (viper-replace-start) (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4340 (goto-char (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4341 (viper-change-state-to-replace t))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4342 (kill-region (viper-replace-start)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4343 (viper-replace-end))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4344 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4345 (viper-change-state-to-insert))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4346 (error ;; make sure that the overlay doesn't stay.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4347 ;; go back to the original point
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4348 (goto-char (viper-replace-start))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4349 (viper-hide-replace-overlay)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4350 (viper-message-conditions conds))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4351
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4352
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4353 (defun viper-change-subr (beg end)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4354 ;; beg is sometimes (mark t), which may be nil
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4355 (or beg (setq beg end))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4356 (if viper-use-register
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4357 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4358 (copy-to-register viper-use-register beg end nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4359 (setq viper-use-register nil)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4360 (kill-region beg end)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4361 (setq this-command 'viper-change)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4362 (viper-yank-last-insertion))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4363
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4364 (defun viper-toggle-case (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4365 "Toggle character case."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4366 (interactive "P")
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4367 (let ((val (viper-p-val arg)) (c))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4368 (viper-set-destructive-command
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4369 (list 'viper-toggle-case val nil nil nil nil))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4370 (while (> val 0)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4371 (setq c (following-char))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4372 (delete-char 1 nil)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4373 (if (eq c (upcase c))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4374 (insert-char (downcase c) 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4375 (insert-char (upcase c) 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4376 (if (eolp) (backward-char 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4377 (setq val (1- val)))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4378
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4379
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4380 ;; query replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4381
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4384 If a null string is suplied as the string to be replaced,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4385 the query replace mode will toggle between string replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4386 and regexp replace."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4387 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4388 (let (str)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4389 (setq str (viper-read-string-with-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4390 (if viper-re-query-replace "Query replace regexp: "
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4391 "Query replace: ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4392 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4393 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4394 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4395 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4396 (if (string= str "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4397 (progn
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4398 (setq viper-re-query-replace (not viper-re-query-replace))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4399 (message "Query replace mode changed to %s"
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4400 (if viper-re-query-replace "regexp replace"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4401 "string replace")))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4402 (if viper-re-query-replace
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4403 (query-replace-regexp
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4404 str
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4405 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4406 (format "Query replace regexp `%s' with: " str)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4407 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4408 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4409 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4410 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4411 (query-replace
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4412 str
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4413 (viper-read-string-with-history
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4414 (format "Query replace `%s' with: " str)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4415 nil ; no initial
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4416 'viper-replace1-history
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4417 (car viper-replace1-history) ; default
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4418 ))))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4419
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4420
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4421 ;; marking
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4422
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4423 (defun viper-mark-beginning-of-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4424 "Mark beginning of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4425 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4426 (push-mark (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4427 (goto-char (point-min))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4428 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4429 (message "Mark set at the beginning of buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4430
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4431 (defun viper-mark-end-of-buffer ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4432 "Mark end of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4433 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4434 (push-mark (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4435 (goto-char (point-max))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4436 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4437 (message "Mark set at the end of buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4438
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4439 (defun viper-mark-point ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4440 "Set mark at point of buffer."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4441 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4442 (let ((char (read-char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4452 )))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4453
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4454 ;; Algorithm: If first invocation of this command save mark on ring, goto
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4455 ;; mark, M0, and pop the most recent elt from the mark ring into mark,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4456 ;; making it into the new mark, M1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4457 ;; Push this mark back and set mark to the original point position, p1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4458 ;; So, if you hit '' or `` then you can return to p1.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4459 ;;
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4462 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4463 ;; the ring into mark. Push M2 back on the ring and set mark to M0.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4464 ;; etc.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4465 (defun viper-cycle-through-mark-ring ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4466 "Visit previous locations on the mark ring.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4467 One can use `` and '' to temporarily jump 1 step back."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4468 (let* ((sv-pt (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4473 ;; In any case, go to the previous or previously saved mark.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4476 ;; m, command.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4477 (if (eq last-command 'viper-cycle-through-mark-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4478 ()
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4479 ;; save current mark if the first iteration
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4480 (setq mark-ring (delete (viper-mark-marker) mark-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4481 (if (mark t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4482 (push-mark (mark t) t)) )
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4483 (pop-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4484 (set-mark-command 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4485 ;; don't duplicate mark on the ring
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4486 (setq mark-ring (delete (viper-mark-marker) mark-ring))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4487 (push-mark sv-pt t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4488 (viper-deactivate-mark)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4489 (setq this-command 'viper-cycle-through-mark-ring)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4490 ))
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4491
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4492
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4493 (defun viper-goto-mark (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4494 "Go to mark."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4495 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4496 (let ((char (read-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4497 (com (viper-getcom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4498 (viper-goto-mark-subr char com nil)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4499
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4500 (defun viper-goto-mark-and-skip-white (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4501 "Go to mark and skip to first non-white character on line."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4502 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4503 (let ((char (read-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4504 (com (viper-getCom arg)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4505 (viper-goto-mark-subr char com t)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4506
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4509 (if (bobp)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4510 (error "Empty buffer")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4511 (backward-char 1)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4512 (cond ((viper-valid-register char '(letter))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4529 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4530 (if (not (viper-valid-marker text-marker))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4531 (error viper-EmptyTextmarker char))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4532 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4535 (push-mark nil t)) ; no msg
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4536 (viper-register-to-point reg)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4539 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4540 (setq viper-last-jump-ignore (point))))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4541 (if com
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4542 (if (equal buff (current-buffer))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4543 (viper-execute-com (if skip-white
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4544 'viper-goto-mark-and-skip-white
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4545 'viper-goto-mark)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4546 nil com)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4547 (switch-to-buffer buff)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4548 (goto-char viper-com-point)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4552 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4553 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4554 (= (point) viper-last-jump-ignore))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4555 (goto-char viper-last-jump))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4556 (if (null (mark t)) (error "Mark is not set in this buffer"))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4557 (if (= (point) (mark t)) (pop-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4558 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4559 (setq viper-last-jump (point-marker)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4560 viper-last-jump-ignore 0)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4563 (if com (viper-move-marker-locally 'viper-com-point (point)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4564 (if (and (viper-same-line (point) viper-last-jump)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4565 (= (point) viper-last-jump-ignore))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4566 (goto-char viper-last-jump))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4567 (if (= (point) (mark t)) (pop-mark))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4568 (exchange-point-and-mark)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4569 (setq viper-last-jump (point))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4570 (back-to-indentation)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4571 (setq viper-last-jump-ignore (point))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4572 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4575 (defun viper-insert-tab ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4576 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4577 (insert-tab))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4578
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4579 (defun viper-exchange-point-and-mark ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4580 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4581 (exchange-point-and-mark)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4582 (back-to-indentation))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4583
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4584 ;; Input Mode Indentation
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4585
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4586 ;; Returns t, if the string before point matches the regexp STR.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4587 (defsubst viper-looking-back (str)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4588 (and (save-excursion (re-search-backward str nil t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4589 (= (point) (match-end 0))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4590
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4591
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4592 (defun viper-forward-indent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4593 "Indent forward -- `C-t' in Vi."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4594 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4595 (setq viper-cted t)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4596 (indent-to (+ (current-column) viper-shift-width)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4597
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4598 (defun viper-backward-indent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4599 "Backtab, C-d in VI"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4600 (interactive)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4601 (if viper-cted
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4602 (let ((p (point)) (c (current-column)) bol (indent t))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4603 (if (viper-looking-back "[0^]")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4604 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4605 (if (eq ?^ (preceding-char))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4606 (setq viper-preserve-indent t))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4607 (delete-backward-char 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4608 (setq p (point))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4609 (setq indent nil)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4610 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4611 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4612 (setq bol (point)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4613 (if (re-search-backward "[^ \t]" bol 1) (forward-char))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4614 (delete-region (point) p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4615 (if indent
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4616 (indent-to (- c viper-shift-width)))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4617 (if (or (bolp) (viper-looking-back "[^ \t]"))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4618 (setq viper-cted nil)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4633 (defun viper-autoindent ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4634 "Auto Indentation, Vi-style."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4635 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4636 (let ((col (current-indentation)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4637 (if abbrev-mode (expand-abbrev))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4638 (if viper-preserve-indent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4639 (setq viper-preserve-indent nil)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4640 (setq viper-current-indent col))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4641 ;; don't leave whitespace lines around
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4642 (if (memq last-command
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4643 '(viper-autoindent
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4644 viper-open-line viper-Open-line
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4645 viper-replace-state-exit-cmd))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4646 (indent-to-left-margin))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4647 ;; use \n instead of newline, or else <Return> will move the insert point
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4648 ;;(newline 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4651 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4652
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4653
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4654 ;; Viewing registers
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4655
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4658 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4659 (let ((reg (read-char)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4660 (cond ((viper-valid-register reg '(letter Letter))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4661 (view-register (downcase reg)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4662 ((viper-valid-register reg '(digit))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4663 (let ((text (current-kill (- reg ?1) 'do-not-rotate)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4664 (with-output-to-temp-buffer " *viper-info*"
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4665 (princ (format "Register %c contains the string:\n" reg))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4666 (princ text))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4669 (viper-next-heading arg))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4670 (t (error
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4671 viper-InvalidRegister reg)))))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4672
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4675 (interactive "P")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4680 (viper-heading-end arg))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4683 (buf (if (not (markerp val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4684 (error viper-EmptyTextmarker reg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4685 (marker-buffer val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4686 (pos (marker-position val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4687 line-no text (s pos) (e pos))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4688 (with-output-to-temp-buffer " *viper-info*"
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4689 (if (and buf pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4692 (set-buffer buf)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4693 (setq line-no (1+ (count-lines (point-min) val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4694 (goto-char pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4695 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4696 (if (re-search-backward "[^ \t]" nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4697 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4698 (beginning-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4699 (setq s (point))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4700 (goto-char pos)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4701 (forward-line 1)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4702 (if (re-search-forward "[^ \t]" nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4703 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4704 (end-of-line)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4705 (setq e (point))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4709 reg (substring text (- pos s)))))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4710 (princ
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4711 (format
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4712 "Textmarker `%c' is in buffer `%s' at line %d.\n"
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4715 reg text)))
20003
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4716 (princ (format viper-EmptyTextmarker reg))))
9bc6a4017c8c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19905
diff changeset
4717 ))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4720
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4721
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4722 (defun viper-delete-backward-word (arg)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4723 "Delete previous word."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4724 (interactive "p")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4725 (save-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4726 (push-mark nil t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4727 (backward-word arg)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4728 (delete-region (point) (mark t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4729 (pop-mark)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4742
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4743 (defun viper-set-expert-level (&optional dont-change-unless)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4744 "Sets the expert level for a Viper user.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4745 Can be called interactively to change (temporarily or permanently) the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4746 current expert level.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4747
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4748 The optional argument DONT-CHANGE-UNLESS, if not nil, says that
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4749 the level should not be changed, unless its current value is
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4750 meaningless (i.e., not one of 1,2,3,4,5).
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4751
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4752 User level determines the setting of Viper variables that are most
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4755 (interactive)
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4756
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4759 (save-window-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4760 (delete-other-windows)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4761 ;; if 0 < viper-expert-level < viper-max-expert-level
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4762 ;; & dont-change-unless = t -- use it; else ask
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4765 (setq viper-always t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4768 viper-want-ctl-h-help nil)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4769
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4772 viper-toggle-key
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4773 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4774 (setq viper-no-multiple-ESC t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4775 viper-re-search t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4776 viper-vi-style-in-minibuffer t
93773
d7554c14325c 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 93615
diff changeset
4777 viper-search-wrap-around t
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4778 viper-electric-mode nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4779 viper-want-emacs-keys-in-vi nil
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4782 ((and (> viper-expert-level 1) (< viper-expert-level 5))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4783 ;; intermediate to guru
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4784 (setq viper-no-multiple-ESC (if (viper-window-display-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4785 t 'twice)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4786 viper-electric-mode t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4787 viper-want-emacs-keys-in-vi t
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4788 viper-want-emacs-keys-in-insert (> viper-expert-level 2))
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4789
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4790 (if (eq viper-expert-level 4) ; respect user's ex-style motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4791 ; and viper-no-multiple-ESC
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4792 (progn
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4793 (setq-default
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4794 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4795 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4796 viper-ex-style-motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4799 (viper-standard-value 'viper-ex-style-motion)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4800 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4801 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4802 viper-re-search
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4807 ;; A wizard!!
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4808 ;; Ideally, if 5 is selected, a buffer should pop up to let the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4809 ;; user toggle the values of variables.
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4810 (t (setq-default viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4811 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4812 viper-ex-style-motion
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4815 (viper-standard-value 'viper-want-ctl-h-help)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4816 viper-always
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4821 (viper-standard-value 'viper-ex-style-motion)
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4822 viper-ex-style-editing
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4823 (viper-standard-value 'viper-ex-style-editing)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4824 viper-re-search
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4829 (viper-standard-value 'viper-want-emacs-keys-in-vi)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4830 viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4833 (viper-set-mode-vars-for viper-current-state)
18289
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4834 (if (or viper-always
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4835 (and (> viper-expert-level 0) (> 5 viper-expert-level)))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4836 (viper-set-hooks)))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4837
26588
76b6a75471e1 * viper*el: replaced old-style backquotes.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26429
diff changeset
4838
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4839 ;; Ask user expert level.
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4840 (defun viper-ask-level (dont-change-unless)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4841 (let ((ask-buffer " *viper-ask-level*")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4842 level-changed repeated)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4843 (save-window-excursion
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4846 (while (or (> viper-expert-level viper-max-expert-level)
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4847 (< viper-expert-level 1)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4848 (null dont-change-unless))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4849 (erase-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4850 (if repeated
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4851 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4852 (message "Invalid user level")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4853 (beep 1))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4854 (setq repeated t))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4855 (setq dont-change-unless t
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4856 level-changed t)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4857 (insert "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4865 To use Emacs productively, you must reach level 3 or higher.
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4866 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state,
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4867 so most Emacs commands can be used when Viper is in Vi state.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4870 in Viper's insert state.
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4871 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC,
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
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
3a43376db2be new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18172
diff changeset
4874 5 -- WIZARD: Like 4, but user settings are also respected for viper-always,
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4880 (setq viper-expert-level (- (viper-read-char-exclusive) ?0))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4881 ) ; end while
26429
e20b16957cdd * emulation/viper-init.el (viper-deflocalvar, viper-loop,
Sam Steingold <sds@gnu.org>
parents: 26263
diff changeset
4882
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4883 ;; tell the user if level was changed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4884 (and level-changed
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4885 (progn
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4886 (insert
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4887 (format "\n\n\n\n\n\t\tYou have selected user level %d"
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4888 viper-expert-level))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4889 (if (y-or-n-p "Do you wish to make this change permanent? ")
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4890 ;; save the setting for viper-expert-level
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4891 (viper-save-setting
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4892 'viper-expert-level
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4893 (format "Saving user level %d ..." viper-expert-level)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4894 viper-custom-file-name))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4895 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4896 (bury-buffer) ; remove ask-buffer from screen
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4897 (message "")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4898 )))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4899
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4900
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4901 (defun viper-nil ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4902 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4906 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4907 (defun viper-register-to-point (char &optional enforce-buffer)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4908 "Like jump-to-register, but switches to another buffer in another window."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4909 (interactive "cViper register to point: ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4910 (let ((val (get-register char)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4911 (cond
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4912 ((and (fboundp 'frame-configuration-p)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4913 (frame-configuration-p val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4914 (set-frame-configuration val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4915 ((window-configuration-p val)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4916 (set-window-configuration val))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4917 ((viper-valid-marker val)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4918 (if (and enforce-buffer
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4919 (not (equal (current-buffer) (marker-buffer val))))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4922 (pop-to-buffer (marker-buffer val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4923 (goto-char val))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4924 ((and (consp val) (eq (car val) 'file))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4925 (find-file (cdr val)))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4928
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4929
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4932 (interactive)
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
4933 (if (< viper-expert-level 2)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4934 (save-buffers-kill-emacs)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4935 (save-buffer)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4936 (kill-buffer (current-buffer))))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4937
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4938
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4939
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4940 ;;; Bug Report
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4941
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4942 (defun viper-submit-report ()
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4943 "Submit bug report on Viper."
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4944 (interactive)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4945 (let ((reporter-prompt-for-summary-p t)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4946 (viper-device-type (viper-device-type))
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4947 color-display-p frame-parameters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4948 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4951 ;; If mode info is needed, add variable to `let' and then set it below,
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4954 (viper-color-display-p)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4955 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4956 minibuffer-vi-face (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4957 (viper-get-face viper-minibuffer-vi-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4958 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4961 viper-minibuffer-insert-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4962 'non-x)
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4963 minibuffer-emacs-face (if (viper-has-face-support-p)
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4964 (viper-get-face
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4965 viper-minibuffer-emacs-face)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4966 'non-x)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4967 frame-parameters (if (fboundp 'frame-parameters)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4970 (setq varlist (list 'viper-vi-minibuffer-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4971 'viper-insert-minibuffer-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4975 'viper-vi-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4983 'viper-insert-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4990 'viper-emacs-global-user-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4991 'viper-emacs-state-modifier-minor-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4992 'viper-automatic-iso-accents
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
4993 'viper-special-input-method
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4994 'viper-want-emacs-keys-in-insert
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4995 'viper-want-emacs-keys-in-vi
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4996 'viper-keep-point-on-undo
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4997 'viper-no-multiple-ESC
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4998 'viper-electric-mode
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
4999 'viper-ESC-key
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5000 'viper-want-ctl-h-help
19462
a3240ad2e954 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19203
diff changeset
5001 'viper-ex-style-editing
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5002 'viper-delete-backwards-in-replace
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5003 'viper-vi-style-in-minibuffer
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5004 'viper-vi-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5005 'viper-insert-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5006 'viper-replace-state-hook
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5007 'viper-emacs-state-hook
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5008 'ex-cycle-other-window
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5009 'ex-cycle-through-non-files
18839
1405083241e8 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18289
diff changeset
5010 'viper-expert-level
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5011 'major-mode
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5012 'viper-device-type
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5013 'color-display-p
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5014 'frame-parameters
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5015 'minibuffer-vi-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5016 'minibuffer-insert-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5017 'minibuffer-emacs-face
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5018 ))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5019 (setq salutation "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5020 Congratulations! You may have unearthed a bug in Viper!
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5021 Please mail a concise, accurate summary of the problem to the address above.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5022
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5023 -------------------------------------------------------------------")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5024 (setq window-config (current-window-configuration))
19078
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5025 (with-output-to-temp-buffer " *viper-info*"
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5026 (switch-to-buffer " *viper-info*")
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5027 (delete-other-windows)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5028 (princ "
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5029 PLEASE FOLLOW THESE PROCEDURES
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5030 ------------------------------
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5031
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5032 Before reporting a bug, please verify that it is related to Viper, and is
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5033 not cause by other packages you are using.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5034
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5037
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5040 Viper, as it would any other improperly customized Emacs package.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5041
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5042 If you are reporting an error message received while executing one of the
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5043 Viper commands, type:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5044
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5049 trace in your bug report.
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5050
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5051 If you believe that one of Viper's commands goes into an infinite loop
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5052 \(e.g., Emacs freezes\), type:
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5053
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5058
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5059 Mail anyway (y or n)? ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5060 (if (y-or-n-p "Mail anyway? ")
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5061 ()
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5062 (set-window-configuration window-config)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5063 (error "Bug report aborted")))
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5064
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5065 (require 'reporter)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
46326a66c27c new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18958
diff changeset
5069 (viper-version)
18129
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5070 varlist
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5071 nil 'delete-other-windows
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5072 salutation)
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
e92598964ee6 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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