annotate lisp/viper/viper-cmd.el @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents bfd6434d15b3
children acd284d43ca1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1 ;;; viper-cmd.el --- Vi command support for Viper
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2 ;; Copyright (C) 1997 Free Software Foundation, Inc.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
5 ;; Code
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
6
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
7 (provide 'viper-cmd)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
8 (require 'advice)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
9
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
10 ;; Compiler pacifier
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
11 (defvar viper-minibuffer-current-face)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
12 (defvar viper-minibuffer-insert-face)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
13 (defvar viper-minibuffer-vi-face)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
14 (defvar viper-minibuffer-emacs-face)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
15 (defvar viper-always)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
16 (defvar viper-mode-string)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
17 (defvar viper-custom-file-name)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
18 (defvar iso-accents-mode)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
19 (defvar quail-mode)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
20 (defvar quail-current-str)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
21 (defvar zmacs-region-stays)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
22 (defvar mark-even-if-inactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
23
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
24 ;; loading happens only in non-interactive compilation
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
25 ;; in order to spare non-viperized emacs from being viperized
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
26 (if noninteractive
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
27 (eval-when-compile
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
28 (let ((load-path (cons (expand-file-name ".") load-path)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
29 (or (featurep 'viper-util)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
30 (load "viper-util.el" nil nil 'nosuffix))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
31 (or (featurep 'viper-keym)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
32 (load "viper-keym.el" nil nil 'nosuffix))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
33 (or (featurep 'viper-mous)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
34 (load "viper-mous.el" nil nil 'nosuffix))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
35 (or (featurep 'viper-macs)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
36 (load "viper-macs.el" nil nil 'nosuffix))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
37 (or (featurep 'viper-ex)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
38 (load "viper-ex.el" nil nil 'nosuffix))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
39 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
40 ;; end pacifier
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
41
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
42
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
43 (require 'viper-util)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
44 (require 'viper-keym)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
45 (require 'viper-mous)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
46 (require 'viper-macs)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
47 (require 'viper-ex)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
48
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
49
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
50
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
51 ;; Generic predicates
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
52
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
53 ;; These test functions are shamelessly lifted from vip 4.4.2 by Aamod Sane
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
54
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
55 ;; generate test functions
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
56 ;; given symbol foo, foo-p is the test function, foos is the set of
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
57 ;; Viper command keys
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
58 ;; (macroexpand '(viper-test-com-defun foo))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
59 ;; (defun foo-p (com) (consp (memq (if (< com 0) (- com) com) foos)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
60
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
61 (defmacro viper-test-com-defun (name)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
62 (let* ((snm (symbol-name name))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
63 (nm-p (intern (concat snm "-p")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
64 (nms (intern (concat snm "s"))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
65 (` (defun (, nm-p) (com)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
66 (consp (memq (if (and (viper-characterp com) (< com 0))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
67 (- com) com) (, nms)))))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
68
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
69 ;; Variables for defining VI commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
70
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
71 ;; Modifying commands that can be prefixes to movement commands
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
72 (defconst viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
73 ;; define viper-prefix-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
74 (viper-test-com-defun viper-prefix-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
75
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
76 ;; Commands that are pairs eg. dd. r and R here are a hack
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
77 (defconst viper-charpair-commands '(?c ?d ?y ?! ?= ?< ?> ?r ?R))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
78 ;; define viper-charpair-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
79 (viper-test-com-defun viper-charpair-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
80
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
81 (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?H ?j ?k ?l
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
82 ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?%
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
83 ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
84 ?; ?, ?0 ?? ?/ ?\C-m ?\
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
85 space return
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
86 delete backspace
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
87 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
88 "Movement commands")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
89 ;; define viper-movement-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
90 (viper-test-com-defun viper-movement-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
91
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
92 ;; Vi digit commands
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
93 (defconst viper-digit-commands '(?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
94
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
95 ;; define viper-digit-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
96 (viper-test-com-defun viper-digit-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
97
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
98 ;; Commands that can be repeated by . (dotted)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
99 (defconst viper-dotable-commands '(?c ?d ?C ?s ?S ?D ?> ?<))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
100 ;; define viper-dotable-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
101 (viper-test-com-defun viper-dotable-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
102
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
103 ;; Commands that can follow a #
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
104 (defconst viper-hash-commands '(?c ?C ?g ?q ?s))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
105 ;; define viper-hash-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
106 (viper-test-com-defun viper-hash-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
107
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
108 ;; Commands that may have registers as prefix
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
109 (defconst viper-regsuffix-commands '(?d ?y ?Y ?D ?p ?P ?x ?X))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
110 ;; define viper-regsuffix-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
111 (viper-test-com-defun viper-regsuffix-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
112
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
113 (defconst viper-vi-commands (append viper-movement-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
114 viper-digit-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
115 viper-dotable-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
116 viper-charpair-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
117 viper-hash-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
118 viper-prefix-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
119 viper-regsuffix-commands)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
120 "The list of all commands in Vi-state.")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
121 ;; define viper-vi-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
122 (viper-test-com-defun viper-vi-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
123
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
124
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
125 ;;; CODE
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
126
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
127 ;; sentinels
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
128
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
129 ;; Runs viper-after-change-functions inside after-change-functions
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
130 (defun viper-after-change-sentinel (beg end len)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
131 (let ((list viper-after-change-functions))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
132 (while list
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
133 (funcall (car list) beg end len)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
134 (setq list (cdr list)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
135
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
136 ;; Runs viper-before-change-functions inside before-change-functions
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
137 (defun viper-before-change-sentinel (beg end)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
138 (let ((list viper-before-change-functions))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
139 (while list
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
140 (funcall (car list) beg end)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
141 (setq list (cdr list)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
142
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
143 (defsubst viper-post-command-sentinel ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
144 (run-hooks 'viper-post-command-hooks))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
145
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
146 (defsubst viper-pre-command-sentinel ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
147 (run-hooks 'viper-pre-command-hooks))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
148
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
149 ;; Needed so that Viper will be able to figure the last inserted
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
150 ;; chunk of text with reasonable accuracy.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
151 (defsubst viper-insert-state-post-command-sentinel ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
152 (if (and (memq viper-current-state '(insert-state replace-state))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
153 viper-insert-point
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
154 (>= (point) viper-insert-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
155 (setq viper-last-posn-while-in-insert-state (point-marker)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
156 (if (eq viper-current-state 'insert-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
157 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
158 (or (stringp viper-saved-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
159 (string= (viper-get-cursor-color) viper-insert-state-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
160 (setq viper-saved-cursor-color (viper-get-cursor-color)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
161 (if (stringp viper-saved-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
162 (viper-change-cursor-color viper-insert-state-cursor-color))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
163 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
164 (if (and (eq this-command 'dabbrev-expand)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
165 (integerp viper-pre-command-point)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
166 (markerp viper-insert-point)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
167 (marker-position viper-insert-point)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
168 (> viper-insert-point viper-pre-command-point))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
169 (viper-move-marker-locally viper-insert-point viper-pre-command-point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
170 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
171
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
172 (defsubst viper-insert-state-pre-command-sentinel ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
173 (or (memq this-command '(self-insert-command))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
174 (memq (viper-event-key last-command-event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
175 '(up down left right (meta f) (meta b)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
176 (control n) (control p) (control f) (control b)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
177 (viper-restore-cursor-color-after-insert))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
178 (if (and (eq this-command 'dabbrev-expand)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
179 (markerp viper-insert-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
180 (marker-position viper-insert-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
181 (setq viper-pre-command-point (marker-position viper-insert-point))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
182
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
183 (defsubst viper-R-state-post-command-sentinel ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
184 ;; Restoring cursor color is needed despite
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
185 ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
186 ;; in another frame, the pre-command hook won't change cursor color to
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
187 ;; default in that other frame. So, if the second frame cursor was red and
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
188 ;; we set the point outside the replacement region, then the cursor color
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
189 ;; will remain red. Restoring the default, below, prevents this.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
190 (if (and (<= (viper-replace-start) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
191 (<= (point) (viper-replace-end)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
192 (viper-change-cursor-color viper-replace-overlay-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
193 (viper-restore-cursor-color-after-replace)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
194 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
195
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
196 ;; to speed up, don't change cursor color before self-insert
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
197 ;; and common move commands
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
198 (defsubst viper-replace-state-pre-command-sentinel ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
199 (or (memq this-command '(self-insert-command))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
200 (memq (viper-event-key last-command-event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
201 '(up down left right (meta f) (meta b)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
202 (control n) (control p) (control f) (control b)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
203 (viper-restore-cursor-color-after-replace)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
204
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
205 (defun viper-replace-state-post-command-sentinel ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
206 ;; Restoring cursor color is needed despite
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
207 ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
208 ;; in another frame, the pre-command hook won't change cursor color to
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
209 ;; default in that other frame. So, if the second frame cursor was red and
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
210 ;; we set the point outside the replacement region, then the cursor color
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
211 ;; will remain red. Restoring the default, below, fixes this problem.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
212 ;;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
213 ;; We optimize for self-insert-command's here, since they either don't change
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
214 ;; cursor color or, if they terminate replace mode, the color will be changed
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
215 ;; in viper-finish-change
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
216 (or (memq this-command '(self-insert-command))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
217 (viper-restore-cursor-color-after-replace))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
218 (cond
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
219 ((eq viper-current-state 'replace-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
220 ;; delete characters to compensate for inserted chars.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
221 (let ((replace-boundary (viper-replace-end)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
222 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
223 (goto-char viper-last-posn-in-replace-region)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
224 (viper-trim-replace-chars-to-delete-if-necessary)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
225 (delete-char viper-replace-chars-to-delete)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
226 (setq viper-replace-chars-to-delete 0)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
227 ;; terminate replace mode if reached replace limit
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
228 (if (= viper-last-posn-in-replace-region (viper-replace-end))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
229 (viper-finish-change)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
230
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
231 (if (viper-pos-within-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
232 (point) (viper-replace-start) replace-boundary)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
233 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
234 ;; the state may have changed in viper-finish-change above
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
235 (if (eq viper-current-state 'replace-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
236 (viper-change-cursor-color viper-replace-overlay-cursor-color))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
237 (setq viper-last-posn-in-replace-region (point-marker))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
238 ))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
239 ;; terminate replace mode if changed Viper states.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
240 (t (viper-finish-change))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
241
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
242
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
243 ;; changing mode
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
244
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
245 ;; Change state to NEW-STATE---either emacs-state, vi-state, or insert-state.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
246 (defun viper-change-state (new-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
247 ;; Keep viper-post/pre-command-hooks fresh.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
248 ;; We remove then add viper-post/pre-command-sentinel since it is very
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
249 ;; desirable that viper-pre-command-sentinel is the last hook and
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
250 ;; viper-post-command-sentinel is the first hook.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
251 (remove-hook 'post-command-hook 'viper-post-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
252 (add-hook 'post-command-hook 'viper-post-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
253 (remove-hook 'pre-command-hook 'viper-pre-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
254 (add-hook 'pre-command-hook 'viper-pre-command-sentinel t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
255 ;; These hooks will be added back if switching to insert/replace mode
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
256 (viper-remove-hook 'viper-post-command-hooks
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
257 'viper-insert-state-post-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
258 (viper-remove-hook 'viper-pre-command-hooks
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
259 'viper-insert-state-pre-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
260 (setq viper-intermediate-command nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
261 (cond ((eq new-state 'vi-state)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
262 (cond ((member viper-current-state '(insert-state replace-state))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
263
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
264 ;; move viper-last-posn-while-in-insert-state
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
265 ;; This is a normal hook that is executed in insert/replace
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
266 ;; states after each command. In Vi/Emacs state, it does
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
267 ;; nothing. We need to execute it here to make sure that
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
268 ;; the last posn was recorded when we hit ESC.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
269 ;; It may be left unrecorded if the last thing done in
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
270 ;; insert/repl state was dabbrev-expansion or abbrev
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
271 ;; expansion caused by hitting ESC
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
272 (viper-insert-state-post-command-sentinel)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
273
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
274 (condition-case conds
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
275 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
276 (viper-save-last-insertion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
277 viper-insert-point
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
278 viper-last-posn-while-in-insert-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
279 (if viper-began-as-replace
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
280 (setq viper-began-as-replace nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
281 ;; repeat insert commands if numerical arg > 1
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
282 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
283 (viper-repeat-insert-command))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
284 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
285 (viper-message-conditions conds)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
286
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
287 (if (> (length viper-last-insertion) 0)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
288 (viper-push-onto-ring viper-last-insertion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
289 'viper-insertion-ring))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
290
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
291 (if viper-ex-style-editing
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
292 (or (bolp) (backward-char 1))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
293 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
294
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
295 ;; insert or replace
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
296 ((memq new-state '(insert-state replace-state))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
297 (if (memq viper-current-state '(emacs-state vi-state))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
298 (viper-move-marker-locally 'viper-insert-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
299 (viper-move-marker-locally
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
300 'viper-last-posn-while-in-insert-state (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
301 (viper-add-hook 'viper-post-command-hooks
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
302 'viper-insert-state-post-command-sentinel t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
303 (viper-add-hook 'viper-pre-command-hooks
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
304 'viper-insert-state-pre-command-sentinel t))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
305 ) ; outermost cond
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
306
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
307 ;; Nothing needs to be done to switch to emacs mode! Just set some
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
308 ;; variables, which is already done in viper-change-state-to-emacs!
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
309
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
310 ;; ISO accents
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
311 ;; always turn off iso-accents-mode in vi-state, or else we won't be able to
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
312 ;; use the keys `,',^ , as they will do accents instead of Vi actions.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
313 (cond ((eq new-state 'vi-state) (viper-set-iso-accents-mode nil));accents off
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
314 (viper-automatic-iso-accents (viper-set-iso-accents-mode t));accents on
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
315 (t (viper-set-iso-accents-mode nil)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
316 ;; Always turn off quail mode in vi state
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
317 (cond ((eq new-state 'vi-state) (viper-set-input-method nil)) ;intl input off
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
318 (viper-special-input-method (viper-set-input-method t)) ;intl input on
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
319 (t (viper-set-input-method nil)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
320
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
321 (setq viper-current-state new-state)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
322
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
323 (viper-update-syntax-classes)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
324 (viper-normalize-minor-mode-map-alist)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
325 (viper-adjust-keys-for new-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
326 (viper-set-mode-vars-for new-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
327 (viper-refresh-mode-line)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
328 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
329
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
330
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
331
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
332 (defun viper-adjust-keys-for (state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
333 "Make necessary adjustments to keymaps before entering STATE."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
334 (cond ((memq state '(insert-state replace-state))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
335 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
336 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
337 (define-key viper-insert-basic-map "\C-m" 'viper-autoindent)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
338 (if viper-want-emacs-keys-in-insert
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
339 ;; expert
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
340 (define-key viper-insert-basic-map "\C-j" nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
341 ;; novice
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
342 (define-key viper-insert-basic-map "\C-j" 'viper-autoindent)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
343 (define-key viper-insert-basic-map "\C-m" nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
344 (define-key viper-insert-basic-map "\C-j" nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
345
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
346 (setq viper-insert-diehard-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
347 (not viper-want-emacs-keys-in-insert))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
348
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
349 (if viper-want-ctl-h-help
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
350 (progn
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
351 (define-key viper-insert-basic-map [backspace] 'help-command)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
352 (define-key viper-replace-map [backspace] 'help-command)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
353 (define-key viper-insert-basic-map [(control h)] 'help-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
354 (define-key viper-replace-map [(control h)] 'help-command))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
355 (define-key viper-insert-basic-map
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
356 [backspace] 'viper-del-backward-char-in-insert)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
357 (define-key viper-replace-map
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
358 [backspace] 'viper-del-backward-char-in-replace)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
359 (define-key viper-insert-basic-map
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
360 [(control h)] 'viper-del-backward-char-in-insert)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
361 (define-key viper-replace-map
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
362 [(control h)] 'viper-del-backward-char-in-replace)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
363
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
364 (t ; Vi state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
365 (setq viper-vi-diehard-minor-mode (not viper-want-emacs-keys-in-vi))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
366 (if viper-want-ctl-h-help
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
367 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
368 (define-key viper-vi-basic-map [backspace] 'help-command)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
369 (define-key viper-vi-basic-map [(control h)] 'help-command))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
370 (define-key viper-vi-basic-map [backspace] 'viper-backward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
371 (define-key viper-vi-basic-map [(control h)] 'viper-backward-char)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
372 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
373
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
374
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
375 ;; Normalizes minor-mode-map-alist by putting Viper keymaps first.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
376 ;; This ensures that Viper bindings are in effect, regardless of which minor
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
377 ;; modes were turned on by the user or by other packages.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
378 (defun viper-normalize-minor-mode-map-alist ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
379 (setq minor-mode-map-alist
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
380 (viper-append-filter-alist
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
381 (list
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
382 (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
383 (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
384 (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
385 (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
386 (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
387 (cons 'viper-vi-state-modifier-minor-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
388 (if (keymapp
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
389 (cdr (assoc major-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
390 viper-vi-state-modifier-alist)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
391 (cdr (assoc major-mode viper-vi-state-modifier-alist))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
392 viper-empty-keymap))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
393 (cons 'viper-vi-diehard-minor-mode viper-vi-diehard-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
394 (cons 'viper-vi-basic-minor-mode viper-vi-basic-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
395 (cons 'viper-insert-intercept-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
396 viper-insert-intercept-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
397 (cons 'viper-replace-minor-mode viper-replace-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
398 ;; viper-insert-minibuffer-minor-mode must come after
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
399 ;; viper-replace-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
400 (cons 'viper-insert-minibuffer-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
401 viper-minibuffer-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
402 (cons 'viper-insert-local-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
403 viper-insert-local-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
404 (cons 'viper-insert-kbd-minor-mode viper-insert-kbd-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
405 (cons 'viper-insert-global-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
406 viper-insert-global-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
407 (cons 'viper-insert-state-modifier-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
408 (if (keymapp
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
409 (cdr (assoc major-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
410 viper-insert-state-modifier-alist)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
411 (cdr (assoc major-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
412 viper-insert-state-modifier-alist))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
413 viper-empty-keymap))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
414 (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
415 (cons 'viper-insert-basic-minor-mode viper-insert-basic-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
416 (cons 'viper-emacs-intercept-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
417 viper-emacs-intercept-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
418 (cons 'viper-emacs-local-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
419 viper-emacs-local-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
420 (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
421 (cons 'viper-emacs-global-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
422 viper-emacs-global-user-map)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
423 (cons 'viper-emacs-state-modifier-minor-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
424 (if (keymapp
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
425 (cdr
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
426 (assoc major-mode viper-emacs-state-modifier-alist)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
427 (cdr
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
428 (assoc major-mode viper-emacs-state-modifier-alist))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
429 viper-empty-keymap))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
430 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
431 minor-mode-map-alist)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
432
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
433
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
434
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
435
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
436
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
437 ;; Viper mode-changing commands and utilities
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
438
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
439 ;; Modifies mode-line-buffer-identification.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
440 (defun viper-refresh-mode-line ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
441 (setq viper-mode-string
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
442 (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
443 ((eq viper-current-state 'vi-state) viper-vi-state-id)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
444 ((eq viper-current-state 'replace-state) viper-replace-state-id)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
445 ((eq viper-current-state 'insert-state) viper-insert-state-id)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
446
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
447 ;; Sets Viper mode string in global-mode-string
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
448 (force-mode-line-update))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
449
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
450
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
451 ;; Switch from Insert state to Vi state.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
452 (defun viper-exit-insert-state ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
453 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
454 (viper-change-state-to-vi))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
455
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
456 (defun viper-set-mode-vars-for (state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
457 "Sets Viper minor mode variables to put Viper's state STATE in effect."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
458
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
459 ;; Emacs state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
460 (setq viper-vi-minibuffer-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
461 viper-insert-minibuffer-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
462 viper-vi-intercept-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
463 viper-insert-intercept-minor-mode nil
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
464
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
465 viper-vi-local-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
466 viper-vi-kbd-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
467 viper-vi-global-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
468 viper-vi-state-modifier-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
469 viper-vi-diehard-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
470 viper-vi-basic-minor-mode nil
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
471
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
472 viper-replace-minor-mode nil
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
473
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
474 viper-insert-local-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
475 viper-insert-kbd-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
476 viper-insert-global-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
477 viper-insert-state-modifier-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
478 viper-insert-diehard-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
479 viper-insert-basic-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
480 viper-emacs-intercept-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
481 viper-emacs-local-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
482 viper-emacs-kbd-minor-mode (not (viper-is-in-minibuffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
483 viper-emacs-global-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
484 viper-emacs-state-modifier-minor-mode t
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
485 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
486
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
487 ;; Vi state
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
488 (if (eq state 'vi-state) ; adjust for vi-state
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
489 (setq
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
490 viper-vi-intercept-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
491 viper-vi-minibuffer-minor-mode (viper-is-in-minibuffer)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
492 viper-vi-local-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
493 viper-vi-kbd-minor-mode (not (viper-is-in-minibuffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
494 viper-vi-global-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
495 viper-vi-state-modifier-minor-mode t
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
496 ;; don't let the diehard keymap block command completion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
497 ;; and other things in the minibuffer
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
498 viper-vi-diehard-minor-mode (not
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
499 (or viper-want-emacs-keys-in-vi
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
500 (viper-is-in-minibuffer)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
501 viper-vi-basic-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
502 viper-emacs-intercept-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
503 viper-emacs-local-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
504 viper-emacs-kbd-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
505 viper-emacs-global-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
506 viper-emacs-state-modifier-minor-mode nil
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
507 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
508
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
509 ;; Insert and Replace states
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
510 (if (member state '(insert-state replace-state))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
511 (setq
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
512 viper-insert-intercept-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
513 viper-replace-minor-mode (eq state 'replace-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
514 viper-insert-minibuffer-minor-mode (viper-is-in-minibuffer)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
515 viper-insert-local-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
516 viper-insert-kbd-minor-mode (not (viper-is-in-minibuffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
517 viper-insert-global-user-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
518 viper-insert-state-modifier-minor-mode t
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
519 ;; don't let the diehard keymap block command completion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
520 ;; and other things in the minibuffer
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
521 viper-insert-diehard-minor-mode (not
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
522 (or
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
523 viper-want-emacs-keys-in-insert
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
524 (viper-is-in-minibuffer)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
525 viper-insert-basic-minor-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
526 viper-emacs-intercept-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
527 viper-emacs-local-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
528 viper-emacs-kbd-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
529 viper-emacs-global-user-minor-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
530 viper-emacs-state-modifier-minor-mode nil
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
531 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
532
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
533 ;; minibuffer faces
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
534 (if (viper-has-face-support-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
535 (setq viper-minibuffer-current-face
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
536 (cond ((eq state 'emacs-state) viper-minibuffer-emacs-face)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
537 ((eq state 'vi-state) viper-minibuffer-vi-face)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
538 ((memq state '(insert-state replace-state))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
539 viper-minibuffer-insert-face))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
540
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
541 (if (viper-is-in-minibuffer)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
542 (viper-set-minibuffer-overlay))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
543 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
544
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
545 ;; This also takes care of the annoying incomplete lines in files.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
546 ;; Also, this fixes `undo' to work vi-style for complex commands.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
547 (defun viper-change-state-to-vi ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
548 "Change Viper state to Vi."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
549 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
550 (if (and viper-first-time (not (viper-is-in-minibuffer)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
551 (viper-mode)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
552 (if overwrite-mode (overwrite-mode nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
553 (if abbrev-mode (expand-abbrev))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
554 (if (and auto-fill-function (> (current-column) fill-column))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
555 (funcall auto-fill-function))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
556 ;; don't leave whitespace lines around
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
557 (if (and (memq last-command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
558 '(viper-autoindent
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
559 viper-open-line viper-Open-line
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
560 viper-replace-state-exit-cmd))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
561 (viper-over-whitespace-line))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
562 (indent-to-left-margin))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
563 (viper-add-newline-at-eob-if-necessary)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
564 (viper-adjust-undo)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
565 (viper-change-state 'vi-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
566
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
567 (viper-restore-cursor-color-after-insert)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
568
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
569 ;; Protect against user errors in hooks
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
570 (condition-case conds
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
571 (run-hooks 'viper-vi-state-hook)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
572 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
573 (viper-message-conditions conds)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
574
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
575 (defun viper-change-state-to-insert ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
576 "Change Viper state to Insert."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
577 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
578 (viper-change-state 'insert-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
579
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
580 (or (stringp viper-saved-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
581 (string= (viper-get-cursor-color) viper-insert-state-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
582 (setq viper-saved-cursor-color (viper-get-cursor-color)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
583 ;; Commented out, because if viper-change-state-to-insert is executed
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
584 ;; non-interactively then the old cursor color may get lost. Same old Emacs
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
585 ;; bug related to local variables?
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
586 ;;;(if (stringp viper-saved-cursor-color)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
587 ;;; (viper-change-cursor-color viper-insert-state-cursor-color))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
588
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
589 ;; Protect against user errors in hooks
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
590 (condition-case conds
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
591 (run-hooks 'viper-insert-state-hook)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
592 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
593 (viper-message-conditions conds))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
594
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
595 (defsubst viper-downgrade-to-insert ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
596 (setq viper-current-state 'insert-state
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
597 viper-replace-minor-mode nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
598
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
599
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
600
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
601 ;; Change to replace state. When the end of replacement region is reached,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
602 ;; replace state changes to insert state.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
603 (defun viper-change-state-to-replace (&optional non-R-cmd)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
604 (viper-change-state 'replace-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
605 ;; Run insert-state-hook
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
606 (condition-case conds
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
607 (run-hooks 'viper-insert-state-hook 'viper-replace-state-hook)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
608 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
609 (viper-message-conditions conds)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
610
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
611 (if non-R-cmd
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
612 (viper-start-replace)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
613 ;; 'R' is implemented using Emacs's overwrite-mode
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
614 (viper-start-R-mode))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
615 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
616
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
617
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
618 (defun viper-change-state-to-emacs ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
619 "Change Viper state to Emacs."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
620 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
621 (viper-change-state 'emacs-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
622
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
623 ;; Protect agains user errors in hooks
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
624 (condition-case conds
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
625 (run-hooks 'viper-emacs-state-hook)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
626 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
627 (viper-message-conditions conds))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
628
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
629 ;; escape to emacs mode termporarily
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
630 (defun viper-escape-to-emacs (arg &optional events)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
631 "Escape to Emacs state from Vi state for one Emacs command.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
632 ARG is used as the prefix value for the executed command. If
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
633 EVENTS is a list of events, which become the beginning of the command."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
634 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
635 (if (= last-command-char ?\\)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
636 (message "Switched to EMACS state for the next command..."))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
637 (viper-escape-to-state arg events 'emacs-state))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
638
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
639 ;; escape to Vi mode termporarily
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
640 (defun viper-escape-to-vi (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
641 "Escape from Emacs state to Vi state for one Vi 1-character command.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
642 If the Vi command that the user types has a prefix argument, e.g., `d2w', then
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
643 Vi's prefix argument will be used. Otherwise, the prefix argument passed to
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
644 `viper-escape-to-vi' is used."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
645 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
646 (message "Switched to VI state for the next command...")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
647 (viper-escape-to-state arg nil 'vi-state))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
648
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
649 ;; Escape to STATE mode for one Emacs command.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
650 (defun viper-escape-to-state (arg events state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
651 ;;(let (com key prefix-arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
652 (let (com key)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
653 ;; this temporarily turns off Viper's minor mode keymaps
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
654 (viper-set-mode-vars-for state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
655 (viper-normalize-minor-mode-map-alist)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
656 (if events (viper-set-unread-command-events events))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
657
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
658 ;; protect against keyboard quit and other errors
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
659 (condition-case nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
660 (let (viper-vi-kbd-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
661 viper-insert-kbd-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
662 viper-emacs-kbd-minor-mode)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
663 (unwind-protect
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
664 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
665 (setq com (key-binding (setq key
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
666 (if viper-xemacs-p
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
667 (read-key-sequence nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
668 (read-key-sequence nil t)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
669 ;; In case of binding indirection--chase definitions.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
670 ;; Have to do it here because we execute this command under
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
671 ;; different keymaps, so command-execute may not do the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
672 ;; right thing there
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
673 (while (vectorp com) (setq com (key-binding com))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
674 nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
675 ;; Execute command com in the original Viper state, not in state
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
676 ;; `state'. Otherwise, if we switch buffers while executing the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
677 ;; escaped to command, Viper's mode vars will remain those of
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
678 ;; `state'. When we return to the orig buffer, the bindings will be
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
679 ;; screwed up.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
680 (viper-set-mode-vars-for viper-current-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
681
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
682 ;; this-command, last-command-char, last-command-event
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
683 (setq this-command com)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
684 (if viper-xemacs-p ; XEmacs represents key sequences as vectors
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
685 (setq last-command-event
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
686 (viper-copy-event (viper-seq-last-elt key))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
687 last-command-char (event-to-character last-command-event))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
688 ;; Emacs represents them as sequences (str or vec)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
689 (setq last-command-event
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
690 (viper-copy-event (viper-seq-last-elt key))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
691 last-command-char last-command-event))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
692
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
693 (if (commandp com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
694 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
695 (setq prefix-arg (or prefix-arg arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
696 (command-execute com)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
697 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
698 (quit (ding))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
699 (error (beep 1))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
700 ;; set state in the new buffer
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
701 (viper-set-mode-vars-for viper-current-state))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
702
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
703 (defun viper-exec-form-in-vi (form)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
704 "Execute FORM in Vi state, regardless of the Ccurrent Vi state."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
705 (let ((buff (current-buffer))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
706 result)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
707 (viper-set-mode-vars-for 'vi-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
708
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
709 (condition-case nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
710 (let (viper-vi-kbd-minor-mode) ; execute without kbd macros
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
711 (setq result (eval form))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
712 )
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
713 (error
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
714 (signal 'quit nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
715
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
716 (if (not (equal buff (current-buffer))) ; cmd switched buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
717 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
718 (set-buffer buff)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
719 (viper-set-mode-vars-for viper-current-state)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
720 (viper-set-mode-vars-for viper-current-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
721 result))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
722
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
723 (defun viper-exec-form-in-emacs (form)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
724 "Execute FORM in Emacs, temporarily disabling Viper's minor modes.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
725 Similar to viper-escape-to-emacs, but accepts forms rather than keystrokes."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
726 (let ((buff (current-buffer))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
727 result)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
728 (viper-set-mode-vars-for 'emacs-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
729 (setq result (eval form))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
730 (if (not (equal buff (current-buffer))) ; cmd switched buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
731 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
732 (set-buffer buff)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
733 (viper-set-mode-vars-for viper-current-state)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
734 (viper-set-mode-vars-for viper-current-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
735 result))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
736
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
737
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
738 ;; This is needed because minor modes sometimes override essential Viper
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
739 ;; bindings. By letting Viper know which files these modes are in, it will
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
740 ;; arrange to reorganize minor-mode-map-alist so that things will work right.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
741 (defun viper-harness-minor-mode (load-file)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
742 "Familiarize Viper with a minor mode defined in LOAD_FILE.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
743 Minor modes that have their own keymaps may overshadow Viper keymaps.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
744 This function is designed to make Viper aware of the packages that define
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
745 such minor modes.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
746 Usage:
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
747 (viper-harness-minor-mode load-file)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
748
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
749 LOAD-FILE is a name of the file where the specific minor mode is defined.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
750 Suffixes such as .el or .elc should be stripped."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
751
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
752 (interactive "sEnter name of the load file: ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
753
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
754 (eval-after-load load-file '(viper-normalize-minor-mode-map-alist))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
755
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
756 ;; Change the default for minor-mode-map-alist each time a harnessed minor
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
757 ;; mode adds its own keymap to the a-list.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
758 (eval-after-load
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
759 load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
760 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
761
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
762
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
763 (defun viper-ESC (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
764 "Emulate ESC key in Emacs.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
765 Prevents multiple escape keystrokes if viper-no-multiple-ESC is true.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
766 If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
767 Other ESC sequences are emulated via the current Emacs's major mode
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
768 keymap. This is more convenient on TTYs, since this won't block
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
769 function keys such as up,down, etc. ESC will also will also work as
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
770 a Meta key in this case. When viper-no-multiple-ESC is nil, ESC functions
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
771 as a Meta key and any number of multiple escapes is allowed."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
772 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
773 (let (char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
774 (cond ((and (not viper-no-multiple-ESC) (eq viper-current-state 'vi-state))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
775 (setq char (viper-read-char-exclusive))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
776 (viper-escape-to-emacs arg (list ?\e char) ))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
777 ((and (eq viper-no-multiple-ESC 'twice)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
778 (eq viper-current-state 'vi-state))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
779 (setq char (viper-read-char-exclusive))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
780 (if (= char (string-to-char viper-ESC-key))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
781 (ding)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
782 (viper-escape-to-emacs arg (list ?\e char) )))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
783 (t (ding)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
784 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
785
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
786 (defun viper-alternate-Meta-key (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
787 "Simulate Emacs Meta key."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
788 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
789 (sit-for 1) (message "ESC-")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
790 (viper-escape-to-emacs arg '(?\e)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
791
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
792 (defun viper-toggle-key-action ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
793 "Action bound to `viper-toggle-key'."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
794 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
795 (if (and (< viper-expert-level 2) (equal viper-toggle-key "\C-z"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
796 (if (viper-window-display-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
797 (viper-iconify)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
798 (suspend-emacs))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
799 (viper-change-state-to-emacs)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
800
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
801
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
802 ;; Intercept ESC sequences on dumb terminals.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
803 ;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es>
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
804
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
805 ;; Check if last key was ESC and if so try to reread it as a function key.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
806 ;; But only if there are characters to read during a very short time.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
807 ;; Returns the last event, if any.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
808 (defun viper-envelop-ESC-key ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
809 (let ((event last-input-event)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
810 (keyseq [nil])
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
811 inhibit-quit)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
812 (if (viper-ESC-event-p event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
813 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
814 (if (viper-fast-keysequence-p)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
815 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
816 (let (minor-mode-map-alist)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
817 (viper-set-unread-command-events event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
818 (setq keyseq
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
819 (funcall
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
820 (ad-get-orig-definition 'read-key-sequence) nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
821 ) ; let
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
822 ;; If keyseq translates into something that still has ESC
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
823 ;; at the beginning, separate ESC from the rest of the seq.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
824 ;; In XEmacs we check for events that are keypress meta-key
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
825 ;; and convert them into [escape key]
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
826 ;;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
827 ;; This is needed for the following reason:
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
828 ;; If ESC is the first symbol, we interpret it as if the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
829 ;; user typed ESC and then quickly some other symbols.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
830 ;; If ESC is not the first one, then the key sequence
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
831 ;; entered was apparently translated into a function key or
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
832 ;; something (e.g., one may have
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
833 ;; (define-key function-key-map "\e[192z" [f11])
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
834 ;; which would translate the escape-sequence generated by
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
835 ;; f11 in an xterm window into the symbolic key f11.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
836 ;;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
837 ;; If `first-key' is not an ESC event, we make it into the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
838 ;; last-command-event in order to pretend that this key was
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
839 ;; pressed. This is needed to allow arrow keys to be bound to
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
840 ;; macros. Otherwise, viper-exec-mapped-kbd-macro will think
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
841 ;; that the last event was ESC and so it'll execute whatever is
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
842 ;; bound to ESC. (Viper macros can't be bound to
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
843 ;; ESC-sequences).
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
844 (let* ((first-key (elt keyseq 0))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
845 (key-mod (event-modifiers first-key)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
846 (cond ((viper-ESC-event-p first-key)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
847 ;; put keys following ESC on the unread list
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
848 ;; and return ESC as the key-sequence
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
849 (viper-set-unread-command-events (subseq keyseq 1))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
850 (setq last-input-event event
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
851 keyseq (if viper-emacs-p
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
852 "\e"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
853 (vector (character-to-event ?\e)))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
854 ((and viper-xemacs-p
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
855 (key-press-event-p first-key)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
856 (equal '(meta) key-mod))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
857 (viper-set-unread-command-events
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
858 (vconcat (vector
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
859 (character-to-event (event-key first-key)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
860 (subseq keyseq 1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
861 (setq last-input-event event
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
862 keyseq (vector (character-to-event ?\e))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
863 ((eventp first-key)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
864 (setq last-command-event
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
865 (viper-copy-event first-key)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
866 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
867 ) ; end progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
868
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
869 ;; this is escape event with nothing after it
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
870 ;; put in unread-command-event and then re-read
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
871 (viper-set-unread-command-events event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
872 (setq keyseq
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
873 (funcall (ad-get-orig-definition 'read-key-sequence) nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
874 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
875 ;; not an escape event
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
876 (setq keyseq (vector event)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
877 keyseq))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
878
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
879
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
880
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
881 ;; Listen to ESC key.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
882 ;; If a sequence of keys starting with ESC is issued with very short delays,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
883 ;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
884 (defun viper-intercept-ESC-key ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
885 "Function that implements ESC key in Viper emulation of Vi."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
886 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
887 (let ((cmd (or (key-binding (viper-envelop-ESC-key))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
888 '(lambda () (interactive) (error "")))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
889
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
890 ;; call the actual function to execute ESC (if no other symbols followed)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
891 ;; or the key bound to the ESC sequence (if the sequence was issued
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
892 ;; with very short delay between characters.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
893 (if (eq cmd 'viper-intercept-ESC-key)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
894 (setq cmd
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
895 (cond ((eq viper-current-state 'vi-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
896 'viper-ESC)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
897 ((eq viper-current-state 'insert-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
898 'viper-exit-insert-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
899 ((eq viper-current-state 'replace-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
900 'viper-replace-state-exit-cmd)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
901 (t 'viper-change-state-to-vi)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
902 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
903 (call-interactively cmd)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
904
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
905
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
906
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
907
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
908 ;; prefix argument for Vi mode
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
909
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
910 ;; In Vi mode, prefix argument is a dotted pair (NUM . COM) where NUM
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
911 ;; represents the numeric value of the prefix argument and COM represents
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
912 ;; command prefix such as "c", "d", "m" and "y".
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
913
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
914 ;; Get value part of prefix-argument ARG.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
915 (defsubst viper-p-val (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
916 (cond ((null arg) 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
917 ((consp arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
918 (if (or (null (car arg)) (equal (car arg) '(nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
919 1 (car arg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
920 (t arg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
921
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
922 ;; Get raw value part of prefix-argument ARG.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
923 (defsubst viper-P-val (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
924 (cond ((consp arg) (car arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
925 (t arg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
926
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
927 ;; Get com part of prefix-argument ARG.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
928 (defsubst viper-getcom (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
929 (cond ((null arg) nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
930 ((consp arg) (cdr arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
931 (t nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
932
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
933 ;; Get com part of prefix-argument ARG and modify it.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
934 (defun viper-getCom (arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
935 (let ((com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
936 (cond ((equal com ?c) ?c)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
937 ;; Previously, ?c was being converted to ?C, but this prevented
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
938 ;; multiline replace regions.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
939 ;;((equal com ?c) ?C)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
940 ((equal com ?d) ?D)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
941 ((equal com ?y) ?Y)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
942 (t com))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
943
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
944
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
945 ;; Compute numeric prefix arg value.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
946 ;; Invoked by EVENT. COM is the command part obtained so far.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
947 (defun viper-prefix-arg-value (event com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
948 (let ((viper-intermediate-command 'viper-digit-argument)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
949 value func)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
950 ;; read while number
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
951 (while (and (viper-characterp event) (>= event ?0) (<= event ?9))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
952 (setq value (+ (* (if (integerp value) value 0) 10) (- event ?0)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
953 (setq event (viper-read-event-convert-to-char)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
954
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
955 (setq prefix-arg value)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
956 (if com (setq prefix-arg (cons prefix-arg com)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
957 (while (eq event ?U)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
958 (viper-describe-arg prefix-arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
959 (setq event (viper-read-event-convert-to-char)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
960
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
961 (if (or com (and (not (eq viper-current-state 'vi-state))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
962 ;; make sure it is a Vi command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
963 (viper-characterp event) (viper-vi-command-p event)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
964 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
965 ;; If appears to be one of the vi commands,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
966 ;; then execute it with funcall and clear prefix-arg in order to not
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
967 ;; confuse subsequent commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
968 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
969 ;; last-command-char is the char we want emacs to think was typed
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
970 ;; last. If com is not nil, the viper-digit-argument command was
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
971 ;; called from within viper-prefix-arg command, such as `d', `w',
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
972 ;; etc., i.e., the user typed, say, d2. In this case, `com' would be
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
973 ;; `d', `w', etc. If viper-digit-argument was invoked by
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
974 ;; viper-escape-to-vi (which is indicated by the fact that the
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
975 ;; current state is not vi-state), then `event' represents the vi
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
976 ;; command to be executed (e.g., `d', `w', etc). Again,
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
977 ;; last-command-char must make emacs believe that this is the command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
978 ;; we typed.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
979 (cond ((eq event 'return) (setq event ?\C-m))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
980 ((eq event 'delete) (setq event ?\C-?))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
981 ((eq event 'backspace) (setq event ?\C-h))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
982 ((eq event 'space) (setq event ?\ )))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
983 (setq last-command-char (or com event))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
984 (setq func (viper-exec-form-in-vi
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
985 (` (key-binding (char-to-string (, event))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
986 (funcall func prefix-arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
987 (setq prefix-arg nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
988 ;; some other command -- let emacs do it in its own way
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
989 (viper-set-unread-command-events event))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
990 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
991
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
992
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
993 ;; Vi operator as prefix argument."
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
994 (defun viper-prefix-arg-com (char value com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
995 (let ((cont t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
996 cmd-info
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
997 cmd-to-exec-at-end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
998 (while (and cont
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
999 (memq char
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1000 (list ?c ?d ?y ?! ?< ?> ?= ?# ?r ?R ?\"
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1001 viper-buffer-search-char)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1002 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1003 ;; this means that we already have a command character, so we
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1004 ;; construct a com list and exit while. however, if char is "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1005 ;; it is an error.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1006 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1007 ;; new com is (CHAR . OLDCOM)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1008 (if (memq char '(?# ?\")) (error ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1009 (setq com (cons char com))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1010 (setq cont nil))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1011 ;; If com is nil we set com as char, and read more. Again, if char is
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1012 ;; ", we read the name of register and store it in viper-use-register.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1013 ;; if char is !, =, or #, a complete com is formed so we exit the while
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1014 ;; loop.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1015 (cond ((memq char '(?! ?=))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1016 (setq com char)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1017 (setq char (read-char))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1018 (setq cont nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1019 ((= char ?#)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1020 ;; read a char and encode it as com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1021 (setq com (+ 128 (read-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1022 (setq char (read-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1023 ((= char ?\")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1024 (let ((reg (read-char)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1025 (if (viper-valid-register reg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1026 (setq viper-use-register reg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1027 (error ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1028 (setq char (read-char))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1029 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1030 (setq com char)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1031 (setq char (read-char))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1032
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1033 (if (atom com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1034 ;; `com' is a single char, so we construct the command argument
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1035 ;; and if `char' is `?', we describe the arg; otherwise
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1036 ;; we prepare the command that will be executed at the end.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1037 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1038 (setq cmd-info (cons value com))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1039 (while (= char ?U)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1040 (viper-describe-arg cmd-info)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1041 (setq char (read-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1042 ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so we
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1043 ;; execute it at the very end
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1044 (or (viper-movement-command-p char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1045 (viper-digit-command-p char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1046 (viper-regsuffix-command-p char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1047 (= char ?!) ; bang command
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1048 (error ""))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1049 (setq cmd-to-exec-at-end
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1050 (viper-exec-form-in-vi
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1051 (` (key-binding (char-to-string (, char)))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1052
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1053 ;; as com is non-nil, this means that we have a command to execute
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1054 (if (memq (car com) '(?r ?R))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1055 ;; execute apropriate region command.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1056 (let ((char (car com)) (com (cdr com)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1057 (setq prefix-arg (cons value com))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1058 (if (= char ?r) (viper-region prefix-arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1059 (viper-Region prefix-arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1060 ;; reset prefix-arg
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1061 (setq prefix-arg nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1062 ;; otherwise, reset prefix arg and call appropriate command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1063 (setq value (if (null value) 1 value))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1064 (setq prefix-arg nil)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1065 (cond
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1066 ;; If we change ?C to ?c here, then cc will enter replacement mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1067 ;; rather than deleting lines. However, it will affect 1 less line than
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1068 ;; normal. We decided to not use replacement mode here and follow Vi,
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1069 ;; since replacement mode on n full lines can be achieved with nC.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1070 ((equal com '(?c . ?c)) (viper-line (cons value ?C)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1071 ((equal com '(?d . ?d)) (viper-line (cons value ?D)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1072 ((equal com '(?d . ?y)) (viper-yank-defun))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1073 ((equal com '(?y . ?y)) (viper-line (cons value ?Y)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1074 ((equal com '(?< . ?<)) (viper-line (cons value ?<)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1075 ((equal com '(?> . ?>)) (viper-line (cons value ?>)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1076 ((equal com '(?! . ?!)) (viper-line (cons value ?!)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1077 ((equal com '(?= . ?=)) (viper-line (cons value ?=)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1078 (t (error "")))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1079
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1080 (if cmd-to-exec-at-end
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1081 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1082 (setq last-command-char char)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1083 (setq last-command-event
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1084 (viper-copy-event
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1085 (if viper-xemacs-p (character-to-event char) char)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1086 (condition-case nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1087 (funcall cmd-to-exec-at-end cmd-info)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1088 (error
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1089 (error "")))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1090 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1091
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1092 (defun viper-describe-arg (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1093 (let (val com)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1094 (setq val (viper-P-val arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1095 com (viper-getcom arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1096 (if (null val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1097 (if (null com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1098 (message "Value is nil, and command is nil")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1099 (message "Value is nil, and command is `%c'" com))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1100 (if (null com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1101 (message "Value is `%d', and command is nil" val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1102 (message "Value is `%d', and command is `%c'" val com)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1103
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1104 (defun viper-digit-argument (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1105 "Begin numeric argument for the next command."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1106 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1107 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1108 (viper-prefix-arg-value
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1109 last-command-char (if (consp arg) (cdr arg) nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1110
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1111 (defun viper-command-argument (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1112 "Accept a motion command as an argument."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1113 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1114 (let ((viper-intermediate-command 'viper-command-argument))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1115 (condition-case nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1116 (viper-prefix-arg-com
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1117 last-command-char
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1118 (cond ((null arg) nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1119 ((consp arg) (car arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1120 ((integerp arg) arg)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1121 (t (error viper-InvalidCommandArgument)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1122 (cond ((null arg) nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1123 ((consp arg) (cdr arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1124 ((integerp arg) nil)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1125 (t (error viper-InvalidCommandArgument))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1126 (quit (setq viper-use-register nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1127 (signal 'quit nil)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1128 (viper-deactivate-mark)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1129
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1130
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1131 ;; repeat last destructive command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1132
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1133 ;; Append region to text in register REG.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1134 ;; START and END are buffer positions indicating what to append.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1135 (defsubst viper-append-to-register (reg start end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1136 (set-register reg (concat (if (stringp (get-register reg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1137 (get-register reg) "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1138 (buffer-substring start end))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1139
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1140 ;; Saves last inserted text for possible use by viper-repeat command.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1141 (defun viper-save-last-insertion (beg end)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1142 (condition-case nil
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1143 (setq viper-last-insertion (buffer-substring beg end))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1144 (error
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1145 ;; beg or end marker are somehow screwed up
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1146 (setq viper-last-insertion nil)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1147 (setq viper-last-insertion (buffer-substring beg end))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1148 (or (< (length viper-d-com) 5)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1149 (setcar (nthcdr 4 viper-d-com) viper-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1150 (or (null viper-command-ring)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1151 (ring-empty-p viper-command-ring)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1152 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1153 (setcar (nthcdr 4 (viper-current-ring-item viper-command-ring))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1154 viper-last-insertion)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1155 ;; del most recent elt, if identical to the second most-recent
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1156 (viper-cleanup-ring viper-command-ring)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1157 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1158
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1159 (defsubst viper-yank-last-insertion ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1160 "Inserts the text saved by the previous viper-save-last-insertion command."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1161 (condition-case nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1162 (insert viper-last-insertion)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1163 (error nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1164
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1165
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1166 ;; define functions to be executed
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1167
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1168 ;; invoked by the `C' command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1169 (defun viper-exec-change (m-com com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1170 (or (and (markerp viper-com-point) (marker-position viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1171 (set-marker viper-com-point (point) (current-buffer)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1172 ;; handle C cmd at the eol and at eob.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1173 (if (or (and (eolp) (= viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1174 (= viper-com-point (point-max)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1175 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1176 (insert " ")(backward-char 1)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1177 (if (= viper-com-point (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1178 (viper-forward-char-carefully))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1179 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1180 (if (eq m-com 'viper-next-line-at-bol)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1181 (viper-enlarge-region (mark t) (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1182 (if (< (point) (mark t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1183 (exchange-point-and-mark))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1184 (if (eq (preceding-char) ?\n)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1185 (viper-backward-char-carefully)) ; give back the newline
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1186 (if (= com ?c)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1187 (viper-change (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1188 (viper-change-subr (mark t) (point))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1189
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1190 ;; this is invoked by viper-substitute-line
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1191 (defun viper-exec-Change (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1192 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1193 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1194 (viper-enlarge-region (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1195 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1196 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1197 (cond ((viper-valid-register viper-use-register '(letter digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1198 (copy-to-register
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1199 viper-use-register (mark t) (point) nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1200 ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1201 (viper-append-to-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1202 (downcase viper-use-register) (mark t) (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1203 (t (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1204 (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1205 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1206 (delete-region (mark t) (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1207 (open-line 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1208 (if (= com ?C)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1209 (viper-change-state-to-insert)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1210 (viper-yank-last-insertion)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1211
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1212 (defun viper-exec-delete (m-com com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1213 (or (and (markerp viper-com-point) (marker-position viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1214 (set-marker viper-com-point (point) (current-buffer)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1215 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1216 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1217 (cond ((viper-valid-register viper-use-register '(letter digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1218 (copy-to-register
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1219 viper-use-register viper-com-point (point) nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1220 ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1221 (viper-append-to-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1222 (downcase viper-use-register) viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1223 (t (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1224 (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1225 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1226 (setq last-command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1227 (if (eq last-command 'd-command) 'kill-region nil))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1228 (kill-region viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1229 (setq this-command 'd-command)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1230 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1231 (if (and (eolp) (not (bolp))) (backward-char 1))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1232
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1233 (defun viper-exec-Delete (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1234 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1235 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1236 (viper-enlarge-region (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1237 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1238 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1239 (cond ((viper-valid-register viper-use-register '(letter digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1240 (copy-to-register
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1241 viper-use-register (mark t) (point) nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1242 ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1243 (viper-append-to-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1244 (downcase viper-use-register) (mark t) (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1245 (t (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1246 (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1247 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1248 (setq last-command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1249 (if (eq last-command 'D-command) 'kill-region nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1250 (kill-region (mark t) (point))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1251 (if (eq m-com 'viper-line) (setq this-command 'D-command)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1252 (back-to-indentation))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1253
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1254 (defun viper-exec-yank (m-com com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1255 (or (and (markerp viper-com-point) (marker-position viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1256 (set-marker viper-com-point (point) (current-buffer)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1257 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1258 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1259 (cond ((viper-valid-register viper-use-register '(letter digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1260 (copy-to-register
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1261 viper-use-register viper-com-point (point) nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1262 ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1263 (viper-append-to-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1264 (downcase viper-use-register) viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1265 (t (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1266 (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1267 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1268 (setq last-command nil)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1269 (copy-region-as-kill viper-com-point (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1270 (goto-char viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1271
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1272 (defun viper-exec-Yank (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1273 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1274 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1275 (viper-enlarge-region (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1276 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1277 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1278 (cond ((viper-valid-register viper-use-register '(letter digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1279 (copy-to-register
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1280 viper-use-register (mark t) (point) nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1281 ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1282 (viper-append-to-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1283 (downcase viper-use-register) (mark t) (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1284 (t (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1285 (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1286 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1287 (setq last-command nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1288 (copy-region-as-kill (mark t) (point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1289 (viper-deactivate-mark)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1290 (goto-char viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1291
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1292 (defun viper-exec-bang (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1293 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1294 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1295 (viper-enlarge-region (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1296 (exchange-point-and-mark)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1297 (shell-command-on-region
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1298 (mark t) (point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1299 (if (= com ?!)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1300 (setq viper-last-shell-com
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1301 (viper-read-string-with-history
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1302 "!"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1303 nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1304 'viper-shell-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1305 (car viper-shell-history)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1306 ))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1307 viper-last-shell-com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1308 t)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1309
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1310 (defun viper-exec-equals (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1311 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1312 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1313 (viper-enlarge-region (mark t) (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1314 (if (> (mark t) (point)) (exchange-point-and-mark))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1315 (indent-region (mark t) (point) nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1316
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1317 (defun viper-exec-shift (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1318 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1319 (set-mark viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1320 (viper-enlarge-region (mark t) (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1321 (if (> (mark t) (point)) (exchange-point-and-mark))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1322 (indent-rigidly (mark t) (point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1323 (if (= com ?>)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1324 viper-shift-width
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1325 (- viper-shift-width))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1326 ;; return point to where it was before shift
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1327 (goto-char viper-com-point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1328
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1329 ;; this is needed because some commands fake com by setting it to ?r, which
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1330 ;; denotes repeated insert command.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1331 (defsubst viper-exec-dummy (m-com com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1332 nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1333
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1334 (defun viper-exec-buffer-search (m-com com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1335 (setq viper-s-string (buffer-substring (point) viper-com-point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1336 (setq viper-s-forward t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1337 (setq viper-search-history (cons viper-s-string viper-search-history))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1338 (viper-search viper-s-string viper-s-forward 1))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1339
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1340 (defvar viper-exec-array (make-vector 128 nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1341
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1342 ;; Using a dispatch array allows adding functions like buffer search
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1343 ;; without affecting other functions. Buffer search can now be bound
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1344 ;; to any character.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1345
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1346 (aset viper-exec-array ?c 'viper-exec-change)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1347 (aset viper-exec-array ?C 'viper-exec-Change)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1348 (aset viper-exec-array ?d 'viper-exec-delete)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1349 (aset viper-exec-array ?D 'viper-exec-Delete)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1350 (aset viper-exec-array ?y 'viper-exec-yank)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1351 (aset viper-exec-array ?Y 'viper-exec-Yank)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1352 (aset viper-exec-array ?r 'viper-exec-dummy)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1353 (aset viper-exec-array ?! 'viper-exec-bang)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1354 (aset viper-exec-array ?< 'viper-exec-shift)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1355 (aset viper-exec-array ?> 'viper-exec-shift)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1356 (aset viper-exec-array ?= 'viper-exec-equals)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1357
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1358
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1359
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1360 ;; This function is called by various movement commands to execute a
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1361 ;; destructive command on the region specified by the movement command. For
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1362 ;; instance, if the user types cw, then the command viper-forward-word will
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1363 ;; call viper-execute-com to execute viper-exec-change, which eventually will
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1364 ;; call viper-change to invoke the replace mode on the region.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1365 ;;
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1366 ;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1367 ;; via a call to viper-set-destructive-command, for later use by viper-repeat.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1368 (defun viper-execute-com (m-com val com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1369 (let ((reg viper-use-register))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1370 ;; this is the special command `#'
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1371 (if (> com 128)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1372 (viper-special-prefix-com (- com 128))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1373 (let ((fn (aref viper-exec-array (if (< com 0) (- com) com))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1374 (if (null fn)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1375 (error "%c: %s" com viper-InvalidViCommand)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1376 (funcall fn m-com com))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1377 (if (viper-dotable-command-p com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1378 (viper-set-destructive-command
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1379 (list m-com val
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1380 (if (memq com (list ?c ?C ?!)) (- com) com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1381 reg nil nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1382 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1383
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1384
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1385 (defun viper-repeat (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1386 "Re-execute last destructive command.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1387 Use the info in viper-d-com, which has the form
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1388 \(com val ch reg inserted-text command-keys\),
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1389 where `com' is the command to be re-executed, `val' is the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1390 argument to `com', `ch' is a flag for repeat, and `reg' is optional;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1391 if it exists, it is the name of the register for `com'.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1392 If the prefix argument, ARG, is non-nil, it is used instead of `val'."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1393 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1394 (let ((save-point (point)) ; save point before repeating prev cmd
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1395 ;; Pass along that we are repeating a destructive command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1396 ;; This tells viper-set-destructive-command not to update
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1397 ;; viper-command-ring
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1398 (viper-intermediate-command 'viper-repeat))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1399 (if (eq last-command 'viper-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1400 ;; if the last command was viper-undo, then undo-more
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1401 (viper-undo-more)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1402 ;; otherwise execute the command stored in viper-d-com. if arg is
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1403 ;; non-nil its prefix value is used as new prefix value for the command.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1404 (let ((m-com (car viper-d-com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1405 (val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1406 (com (nth 2 viper-d-com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1407 (reg (nth 3 viper-d-com)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1408 (if (null val) (setq val (nth 1 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1409 (if (null m-com) (error "No previous command to repeat."))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1410 (setq viper-use-register reg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1411 (if (nth 4 viper-d-com) ; text inserted by command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1412 (setq viper-last-insertion (nth 4 viper-d-com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1413 viper-d-char (nth 4 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1414 (funcall m-com (cons val com))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1415 (cond ((and (< save-point (point)) viper-keep-point-on-repeat)
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
1416 (goto-char save-point)) ; go back to before repeat.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1417 ((and (< save-point (point)) viper-ex-style-editing)
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
1418 (or (bolp) (backward-char 1))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1419 (if (and (eolp) (not (bolp)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1420 (backward-char 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1421 ))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1422 (viper-adjust-undo) ; take care of undo
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1423 ;; If the prev cmd was rotating the command ring, this means that `.' has
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1424 ;; just executed a command from that ring. So, push it on the ring again.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1425 ;; If we are just executing previous command , then don't push viper-d-com
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1426 ;; because viper-d-com is not fully constructed in this case (its keys and
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1427 ;; the inserted text may be nil). Besides, in this case, the command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1428 ;; executed by `.' is already on the ring.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1429 (if (eq last-command 'viper-display-current-destructive-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1430 (viper-push-onto-ring viper-d-com 'viper-command-ring))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1431 (viper-deactivate-mark)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1432 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1433
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1434 (defun viper-repeat-from-history ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1435 "Repeat a destructive command from history.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1436 Doesn't change viper-command-ring in any way, so `.' will work as before
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1437 executing this command.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1438 This command is supposed to be bound to a two-character Vi macro where
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1439 the second character is a digit 0 to 9. The digit indicates which
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1440 history command to execute. `<char>0' is equivalent to `.', `<char>1'
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1441 invokes the command before that, etc."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1442 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1443 (let* ((viper-intermediate-command 'repeating-display-destructive-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1444 (idx (cond (viper-this-kbd-macro
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1445 (string-to-number
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1446 (symbol-name (elt viper-this-kbd-macro 1))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1447 (t 0)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1448 (num idx)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1449 (viper-d-com viper-d-com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1450
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1451 (or (and (numberp num) (<= 0 num) (<= num 9))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1452 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1453 (setq idx 0
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1454 num 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1455 (message
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1456 "`viper-repeat-from-history' must be invoked as a Vi macro bound to `<key><digit>'")))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1457 (while (< 0 num)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1458 (setq viper-d-com (viper-special-ring-rotate1 viper-command-ring -1))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1459 (setq num (1- num)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1460 (viper-repeat nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1461 (while (> idx num)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1462 (viper-special-ring-rotate1 viper-command-ring 1)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1463 (setq num (1+ num)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1464 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1465
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1466
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1467 ;; The hash-command. It is invoked interactively by the key sequence #<char>.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1468 ;; The chars that can follow `#' are determined by viper-hash-command-p
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1469 (defun viper-special-prefix-com (char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1470 (cond ((= char ?c)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1471 (downcase-region (min viper-com-point (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1472 (max viper-com-point (point))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1473 ((= char ?C)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1474 (upcase-region (min viper-com-point (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1475 (max viper-com-point (point))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1476 ((= char ?g)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1477 (push-mark viper-com-point t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1478 (viper-global-execute))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1479 ((= char ?q)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1480 (push-mark viper-com-point t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1481 (viper-quote-region))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1482 ((= char ?s) (funcall viper-spell-function viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1483 (t (error "#%c: %s" char viper-InvalidViCommand))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1484
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1485
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1486 ;; undoing
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1487
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1488 (defun viper-undo ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1489 "Undo previous change."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1490 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1491 (message "undo!")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1492 (let ((modified (buffer-modified-p))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1493 (before-undo-pt (point-marker))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1494 (after-change-functions after-change-functions)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1495 undo-beg-posn undo-end-posn)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1496
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1497 ;; no need to remove this hook, since this var has scope inside a let.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1498 (add-hook 'after-change-functions
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1499 '(lambda (beg end len)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1500 (setq undo-beg-posn beg
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1501 undo-end-posn (or end beg))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1502
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1503 (undo-start)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1504 (undo-more 2)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1505 (setq undo-beg-posn (or undo-beg-posn before-undo-pt)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1506 undo-end-posn (or undo-end-posn undo-beg-posn))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1507
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1508 (goto-char undo-beg-posn)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1509 (sit-for 0)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1510 (if (and viper-keep-point-on-undo
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1511 (pos-visible-in-window-p before-undo-pt))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1512 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1513 (push-mark (point-marker) t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1514 (viper-sit-for-short 300)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1515 (goto-char undo-end-posn)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1516 (viper-sit-for-short 300)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1517 (if (and (> (viper-chars-in-region undo-beg-posn before-undo-pt) 1)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1518 (> (viper-chars-in-region undo-end-posn before-undo-pt) 1))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1519 (goto-char before-undo-pt)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1520 (goto-char undo-beg-posn)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1521 (push-mark before-undo-pt t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1522 (if (and (eolp) (not (bolp))) (backward-char 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1523 (if (not modified) (set-buffer-modified-p t)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1524 (setq this-command 'viper-undo))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1525
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1526 ;; Continue undoing previous changes.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1527 (defun viper-undo-more ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1528 (message "undo more!")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1529 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1530 (undo-more 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1531 (error (beep)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1532 (message "No further undo information in this buffer")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1533 (if (and (eolp) (not (bolp))) (backward-char 1))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1534 (setq this-command 'viper-undo))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1535
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1536 ;; The following two functions are used to set up undo properly.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1537 ;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1538 ;; they are undone all at once.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1539 (defun viper-adjust-undo ()
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1540 (if viper-undo-needs-adjustment
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1541 (let ((inhibit-quit t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1542 tmp tmp2)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1543 (setq viper-undo-needs-adjustment nil)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1544 (if (listp buffer-undo-list)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1545 (if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1546 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1547 (setq tmp2 (cdr tmp)) ; the part after mark
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1548
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1549 ;; cut tail from buffer-undo-list temporarily by direct
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1550 ;; manipulation with pointers in buffer-undo-list
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1551 (setcdr tmp nil)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1552
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1553 (setq buffer-undo-list (delq nil buffer-undo-list))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1554 (setq buffer-undo-list
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1555 (delq viper-buffer-undo-list-mark buffer-undo-list))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1556 ;; restore tail of buffer-undo-list
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1557 (setq buffer-undo-list (nconc buffer-undo-list tmp2)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1558 (setq buffer-undo-list (delq nil buffer-undo-list)))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1559 ))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1560
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1561
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1562 (defun viper-set-complex-command-for-undo ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1563 (if (listp buffer-undo-list)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1564 (if (not viper-undo-needs-adjustment)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1565 (let ((inhibit-quit t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1566 (setq buffer-undo-list
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1567 (cons viper-buffer-undo-list-mark buffer-undo-list))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1568 (setq viper-undo-needs-adjustment t)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1569
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1570
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1571
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1572
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1573 (defun viper-display-current-destructive-command ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1574 (let ((text (nth 4 viper-d-com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1575 (keys (nth 5 viper-d-com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1576 (max-text-len 30))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1577
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1578 (setq this-command 'viper-display-current-destructive-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1579
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1580 (message " `.' runs %s%s"
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1581 (concat "`" (viper-array-to-string keys) "'")
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1582 (viper-abbreviate-string
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1583 (if viper-xemacs-p
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1584 (replace-in-string
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1585 (cond ((characterp text) (char-to-string text))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1586 ((stringp text) text)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1587 (t ""))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1588 "\n" "^J")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1589 text)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1590 max-text-len
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1591 " inserting `" "'" " ......."))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1592 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1593
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1594
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1595 ;; don't change viper-d-com if it was viper-repeat command invoked with `.'
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1596 ;; or in some other way (non-interactively).
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1597 (defun viper-set-destructive-command (list)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1598 (or (eq viper-intermediate-command 'viper-repeat)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1599 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1600 (setq viper-d-com list)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1601 (setcar (nthcdr 5 viper-d-com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1602 (viper-array-to-string (if (arrayp viper-this-command-keys)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1603 viper-this-command-keys
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1604 (this-command-keys))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1605 (viper-push-onto-ring viper-d-com 'viper-command-ring)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1606 (setq viper-this-command-keys nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1607
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1608 (defun viper-prev-destructive-command (next)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1609 "Find previous destructive command in the history of destructive commands.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1610 With prefix argument, find next destructive command."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1611 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1612 (let (cmd viper-intermediate-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1613 (if (eq last-command 'viper-display-current-destructive-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1614 ;; repeated search through command history
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1615 (setq viper-intermediate-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1616 'repeating-display-destructive-command)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1617 ;; first search through command history--set temp ring
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1618 (setq viper-temp-command-ring (copy-list viper-command-ring)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1619 (setq cmd (if next
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1620 (viper-special-ring-rotate1 viper-temp-command-ring 1)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1621 (viper-special-ring-rotate1 viper-temp-command-ring -1)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1622 (if (null cmd)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1623 ()
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1624 (setq viper-d-com cmd))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1625 (viper-display-current-destructive-command)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1626
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1627 (defun viper-next-destructive-command ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1628 "Find next destructive command in the history of destructive commands."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1629 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1630 (viper-prev-destructive-command 'next))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1631
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1632 (defun viper-insert-prev-from-insertion-ring (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1633 "Cycle through insertion ring in the direction of older insertions.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1634 Undoes previous insertion and inserts new.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1635 With prefix argument, cycles in the direction of newer elements.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1636 In minibuffer, this command executes whatever the invocation key is bound
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1637 to in the global map, instead of cycling through the insertion ring."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1638 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1639 (let (viper-intermediate-command)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1640 (if (eq last-command 'viper-insert-from-insertion-ring)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1641 (progn ; repeated search through insertion history
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1642 (setq viper-intermediate-command 'repeating-insertion-from-ring)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1643 (if (eq viper-current-state 'replace-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1644 (undo 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1645 (if viper-last-inserted-string-from-insertion-ring
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1646 (backward-delete-char
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1647 (length viper-last-inserted-string-from-insertion-ring))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1648 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1649 ;;first search through insertion history
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1650 (setq viper-temp-insertion-ring (copy-list viper-insertion-ring)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1651 (setq this-command 'viper-insert-from-insertion-ring)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1652 ;; so that things will be undone properly
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1653 (setq buffer-undo-list (cons nil buffer-undo-list))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1654 (setq viper-last-inserted-string-from-insertion-ring
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1655 (viper-special-ring-rotate1 viper-temp-insertion-ring (if arg 1 -1)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1656
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1657 ;; this change of viper-intermediate-command must come after
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1658 ;; viper-special-ring-rotate1, so that the ring will rotate, but before the
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1659 ;; insertion.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1660 (setq viper-intermediate-command nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1661 (if viper-last-inserted-string-from-insertion-ring
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1662 (insert viper-last-inserted-string-from-insertion-ring))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1663 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1664
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1665 (defun viper-insert-next-from-insertion-ring ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1666 "Cycle through insertion ring in the direction of older insertions.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1667 Undo previous insertion and inserts new."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1668 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1669 (viper-insert-prev-from-insertion-ring 'next))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1670
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1671
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1672 ;; some region utilities
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1673
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1674 ;; If at the last line of buffer, add \\n before eob, if newline is missing.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1675 (defun viper-add-newline-at-eob-if-necessary ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1676 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1677 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1678 ;; make sure all lines end with newline, unless in the minibuffer or
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1679 ;; when requested otherwise (require-final-newline is nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1680 (if (and (eobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1681 (not (bolp))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1682 require-final-newline
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1683 (not (viper-is-in-minibuffer))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1684 (not buffer-read-only))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1685 (insert "\n"))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1686
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1687 (defun viper-yank-defun ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1688 (mark-defun)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1689 (copy-region-as-kill (point) (mark t)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1690
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1691 ;; Enlarge region between BEG and END.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1692 (defun viper-enlarge-region (beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1693 (or beg (setq beg end)) ; if beg is nil, set to end
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1694 (or end (setq end beg)) ; if end is nil, set to beg
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1695
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1696 (if (< beg end)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1697 (progn (goto-char beg) (set-mark end))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1698 (goto-char end)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1699 (set-mark beg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1700 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1701 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1702 (if (or (not (eobp)) (not (bolp))) (forward-line 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1703 (if (not (eobp)) (beginning-of-line))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1704 (if (> beg end) (exchange-point-and-mark)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1705
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1706
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1707 ;; Quote region by each line with a user supplied string.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1708 (defun viper-quote-region ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1709 (setq viper-quote-string
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1710 (viper-read-string-with-history
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1711 "Quote string: "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1712 nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1713 'viper-quote-region-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1714 viper-quote-string))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1715 (viper-enlarge-region (point) (mark t))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1716 (if (> (point) (mark t)) (exchange-point-and-mark))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1717 (insert viper-quote-string)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1718 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1719 (forward-line 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1720 (while (and (< (point) (mark t)) (bolp))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1721 (insert viper-quote-string)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1722 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1723 (forward-line 1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1724
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1725 ;; Tells whether BEG is on the same line as END.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1726 ;; If one of the args is nil, it'll return nil.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1727 (defun viper-same-line (beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1728 (let ((selective-display nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1729 (incr 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1730 temp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1731 (if (and beg end (> beg end))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1732 (setq temp beg
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1733 beg end
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1734 end temp))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1735 (if (and beg end)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1736 (cond ((or (> beg (point-max)) (> end (point-max))) ; out of range
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1737 nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1738 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1739 ;; This 'if' is needed because Emacs treats the next empty line
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1740 ;; as part of the previous line.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1741 (if (= (viper-line-pos 'start) end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1742 (setq incr 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1743 (<= (+ incr (count-lines beg end)) 1))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1744 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1745
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1746
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1747 ;; Check if the string ends with a newline.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1748 (defun viper-end-with-a-newline-p (string)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1749 (or (string= string "")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1750 (= (viper-seq-last-elt string) ?\n)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1751
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1752 (defun viper-tmp-insert-at-eob (msg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1753 (let ((savemax (point-max)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1754 (goto-char savemax)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1755 (insert msg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1756 (sit-for 2)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1757 (goto-char savemax) (delete-region (point) (point-max))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1758 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1759
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1760
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1761
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1762 ;;; Minibuffer business
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1763
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1764 (defsubst viper-set-minibuffer-style ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1765 (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1766
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1767
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1768 (defun viper-minibuffer-setup-sentinel ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1769 (let ((hook (if viper-vi-style-in-minibuffer
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1770 'viper-change-state-to-insert
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1771 'viper-change-state-to-emacs)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1772 (funcall hook)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1773 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1774
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1775 ;; Interpret last event in the local map first; if fails, use exit-minibuffer.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1776 ;; Run viper-minibuffer-exit-hook before exiting.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1777 (defun viper-exit-minibuffer ()
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1778 "Exit minibuffer Viper way."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1779 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1780 (let (command)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1781 (setq command (local-key-binding (char-to-string last-command-char)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1782 (run-hooks 'viper-minibuffer-exit-hook)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1783 (if command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1784 (command-execute command)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1785 (exit-minibuffer))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1786
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1787
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1788 (defcustom viper-smart-suffix-list
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1789 '("" "tex" "c" "cc" "C" "el" "java" "html" "htm" "pl" "P" "p")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1790 "*List of suffixes that Viper automatically tries to append to filenames ending with a `.'.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1791 This is useful when you the current directory contains files with the same
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1792 prefix and many different suffixes. Usually, only one of the suffixes
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1793 represents an editable file. However, file completion will stop at the `.'
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1794 The smart suffix feature lets you hit RET in such a case, and Viper will
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1795 select the appropriate suffix.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1796
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1797 Suffixes are tried in the order given and the first suffix for which a
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1798 corresponding file exists is selected. If no file exists for any of the
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1799 suffixes, the user is asked to confirm.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1800
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1801 To turn this feature off, set this variable to nil."
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1802 :type '(set string)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1803 :group 'viper)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1804
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1805
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1806 ;; Try to add a suitable suffix to files whose name ends with a `.'
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1807 ;; Useful when the user hits RET on a non-completed file name.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1808 ;; Used as a minibuffer exit hook in read-file-name
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1809 (defun viper-file-add-suffix ()
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1810 (let ((count 0)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1811 (len (length viper-smart-suffix-list))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1812 (file (buffer-string))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1813 found key cmd suff)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1814 (goto-char (point-max))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1815 (if (and viper-smart-suffix-list (string-match "\\.$" file))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1816 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1817 (while (and (not found) (< count len))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1818 (setq suff (nth count viper-smart-suffix-list)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1819 count (1+ count))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1820 (if (file-exists-p
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1821 (format "%s%s" (substitute-in-file-name file) suff))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1822 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1823 (setq found t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1824 (insert suff))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1825
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1826 (if found
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1827 ()
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1828 (viper-tmp-insert-at-eob " [Please complete file name]")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1829 (unwind-protect
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1830 (while (not (memq cmd
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1831 '(exit-minibuffer viper-exit-minibuffer)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1832 (setq cmd
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1833 (key-binding (setq key (read-key-sequence nil))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1834 (cond ((eq cmd 'self-insert-command)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1835 (if viper-xemacs-p
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1836 (insert (events-to-keys key))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1837 (insert key)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1838 ((memq cmd '(exit-minibuffer viper-exit-minibuffer))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1839 nil)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1840 (t (command-execute cmd)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1841 )))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1842 ))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1843
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1844
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1845 (defun viper-minibuffer-trim-tail ()
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1846 "Delete junk at the end of the first line of the minibuffer input.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1847 Remove this function from `viper-minibuffer-exit-hook', if this causes
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1848 problems."
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1849 (if (viper-is-in-minibuffer)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1850 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1851 (goto-char (point-min))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1852 (end-of-line)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1853 (delete-region (point) (point-max)))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
1854
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1855
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1856 ;;; Reading string with history
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1857
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1858 (defun viper-read-string-with-history (prompt &optional initial
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1859 history-var default keymap)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1860 ;; Read string, prompting with PROMPT and inserting the INITIAL
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1861 ;; value. Uses HISTORY-VAR. DEFAULT is the default value to accept if the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1862 ;; input is an empty string. Use KEYMAP, if given, or the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1863 ;; minibuffer-local-map.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1864 ;; Default value is displayed until the user types something in the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1865 ;; minibuffer.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1866 (let ((minibuffer-setup-hook
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1867 '(lambda ()
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1868 (if (stringp initial)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1869 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1870 ;; don't wait if we have unread events or in kbd macro
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1871 (or unread-command-events
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1872 executing-kbd-macro
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1873 (sit-for 840))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1874 (erase-buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1875 (insert initial)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1876 (viper-minibuffer-setup-sentinel)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1877 (val "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1878 (padding "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1879 temp-msg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1880
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1881 (setq keymap (or keymap minibuffer-local-map)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1882 initial (or initial "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1883 temp-msg (if default
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1884 (format "(default: %s) " default)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1885 ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1886
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1887 (setq viper-incomplete-ex-cmd nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1888 (setq val (read-from-minibuffer prompt
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1889 (concat temp-msg initial val padding)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1890 keymap nil history-var))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1891 (setq minibuffer-setup-hook nil
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1892 padding (viper-array-to-string (this-command-keys))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1893 temp-msg "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1894 ;; the following tries to be smart about what to put in history
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1895 (if (not (string= val (car (eval history-var))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1896 (set history-var (cons val (eval history-var))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1897 (if (or (string= (nth 0 (eval history-var)) (nth 1 (eval history-var)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1898 (string= (nth 0 (eval history-var)) ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1899 (set history-var (cdr (eval history-var))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1900 ;; If the user enters nothing but the prev cmd wasn't viper-ex,
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1901 ;; viper-command-argument, or `! shell-command', this probably means
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1902 ;; that the user typed something then erased. Return "" in this case, not
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1903 ;; the default---the default is too confusing in this case.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1904 (cond ((and (string= val "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1905 (not (string= prompt "!")) ; was a `! shell-command'
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1906 (not (memq last-command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1907 '(viper-ex
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1908 viper-command-argument
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1909 t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1910 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1911 "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1912 ((string= val "") (or default ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1913 (t val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1914 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1915
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1916
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1917
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1918 ;; insertion commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1919
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1920 ;; Called when state changes from Insert Vi command mode.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1921 ;; Repeats the insertion command if Insert state was entered with prefix
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1922 ;; argument > 1.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1923 (defun viper-repeat-insert-command ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1924 (let ((i-com (car viper-d-com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1925 (val (nth 1 viper-d-com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1926 (char (nth 2 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1927 (if (and val (> val 1)) ; first check that val is non-nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1928 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1929 (setq viper-d-com (list i-com (1- val) ?r nil nil nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1930 (viper-repeat nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1931 (setq viper-d-com (list i-com val char nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1932 ))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1933
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1934 (defun viper-insert (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1935 "Insert before point."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1936 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1937 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1938 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1939 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1940 (viper-set-destructive-command (list 'viper-insert val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1941 (if com
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1942 (viper-loop val (viper-yank-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1943 (viper-change-state-to-insert))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1944
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1945 (defun viper-append (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1946 "Append after point."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1947 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1948 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1949 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1950 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1951 (viper-set-destructive-command (list 'viper-append val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1952 (if (not (eolp)) (forward-char))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1953 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1954 (viper-loop val (viper-yank-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1955 (viper-change-state-to-insert))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1956
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1957 (defun viper-Append (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1958 "Append at end of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1959 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1960 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1961 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1962 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1963 (viper-set-destructive-command (list 'viper-Append val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1964 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1965 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1966 (viper-loop val (viper-yank-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1967 (viper-change-state-to-insert))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1968
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1969 (defun viper-Insert (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1970 "Insert before first non-white."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1971 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1972 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1973 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1974 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1975 (viper-set-destructive-command (list 'viper-Insert val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1976 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1977 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1978 (viper-loop val (viper-yank-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1979 (viper-change-state-to-insert))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1980
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1981 (defun viper-open-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1982 "Open line below."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1983 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1984 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1985 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1986 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1987 (viper-set-destructive-command (list 'viper-open-line val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1988 (let ((col (current-indentation)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1989 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1990 (viper-loop val
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1991 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1992 (newline 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1993 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1994 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1995 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
1996 (if viper-electric-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1997 (indent-according-to-mode)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1998 (indent-to col))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
1999 ))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2000 (viper-yank-last-insertion))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2001 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2002 (newline 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2003 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2004 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2005 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2006 (if viper-electric-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2007 (indent-according-to-mode)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2008 (indent-to col))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2009 (viper-change-state-to-insert)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2010
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2011 (defun viper-Open-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2012 "Open line above."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2013 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2014 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2015 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2016 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2017 (viper-set-destructive-command (list 'viper-Open-line val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2018 (let ((col (current-indentation)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2019 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2020 (viper-loop val
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2021 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2022 (open-line 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2023 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2024 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2025 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2026 (if viper-electric-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2027 (indent-according-to-mode)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2028 (indent-to col))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2029 ))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2030 (viper-yank-last-insertion))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2031 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2032 (open-line 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2033 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2034 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2035 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2036 (if viper-electric-mode
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2037 (indent-according-to-mode)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2038 (indent-to col))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2039 ))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2040 (viper-change-state-to-insert)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2041
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2042 (defun viper-open-line-at-point (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2043 "Open line at point."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2044 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2045 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2046 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2047 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2048 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2049 (list 'viper-open-line-at-point val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2050 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2051 (viper-loop val
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2052 (open-line 1)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2053 (viper-yank-last-insertion))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2054 (open-line 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2055 (viper-change-state-to-insert))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2056
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2057 (defun viper-substitute (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2058 "Substitute characters."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2059 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2060 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2061 (com (viper-getcom arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2062 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2063 (forward-char val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2064 (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2065 (viper-change-subr (mark t) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2066 (viper-change (mark t) (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2067 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2068 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2069
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2070 ;; Command bound to S
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2071 (defun viper-substitute-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2072 "Substitute lines."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2073 (interactive "p")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2074 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2075 (viper-line (cons arg ?C)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2076
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2077 ;; Prepare for replace
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2078 (defun viper-start-replace ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2079 (setq viper-began-as-replace t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2080 viper-sitting-in-replace t
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2081 viper-replace-chars-to-delete 0)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2082 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2083 'viper-after-change-functions 'viper-replace-mode-spy-after t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2084 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2085 'viper-before-change-functions 'viper-replace-mode-spy-before t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2086 ;; this will get added repeatedly, but no harm
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2087 (add-hook 'after-change-functions 'viper-after-change-sentinel t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2088 (add-hook 'before-change-functions 'viper-before-change-sentinel t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2089 (viper-move-marker-locally 'viper-last-posn-in-replace-region
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2090 (viper-replace-start))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2091 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2092 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2093 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2094 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2095 ;; guard against a smartie who switched from R-replace to normal replace
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2096 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2097 'viper-post-command-hooks 'viper-R-state-post-command-sentinel)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2098 (if overwrite-mode (overwrite-mode nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2099 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2100
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2101
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2102 (defun viper-replace-mode-spy-before (beg end)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2103 (setq viper-replace-region-chars-deleted (viper-chars-in-region beg end))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2104 )
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2105
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2106 ;; Invoked as an after-change-function to calculate how many chars have to be
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2107 ;; deleted. This function may be called several times within a single command,
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2108 ;; if this command performs several separate buffer changes. Therefore, if adds
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2109 ;; up the number of chars inserted and subtracts the number of chars deleted.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2110 (defun viper-replace-mode-spy-after (beg end length)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2111 (if (memq viper-intermediate-command
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2112 '(dabbrev-expand repeating-insertion-from-ring))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2113 ;; Take special care of text insertion from insertion ring inside
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2114 ;; replacement overlays.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2115 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2116 (setq viper-replace-chars-to-delete 0)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2117 (viper-move-marker-locally
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2118 'viper-last-posn-in-replace-region (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2119
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2120 (let* ((real-end (min end (viper-replace-end)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2121 (column-shift (- (save-excursion (goto-char real-end)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2122 (current-column))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2123 (save-excursion (goto-char beg)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2124 (current-column))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2125 (chars-deleted 0))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2126
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2127 (if (> length 0)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2128 (setq chars-deleted viper-replace-region-chars-deleted))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2129 (setq viper-replace-region-chars-deleted 0)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2130 (setq viper-replace-chars-to-delete
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2131 (+ viper-replace-chars-to-delete
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2132 (-
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2133 ;; if column shift is bigger, due to a TAB insertion, take
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2134 ;; column-shift instead of the number of inserted chars
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2135 (max (viper-chars-in-region beg real-end)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2136 ;; This test accounts for Chinese/Japanese/... chars,
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2137 ;; which occupy 2 columns instead of one. If we use
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2138 ;; column-shift here, we may delete two chars instead of
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2139 ;; one when the user types one Chinese character. Deleting
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2140 ;; two would be OK, if they were European chars, but it is
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2141 ;; not OK if they are Chinese chars. Since it is hard to
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2142 ;; figure out which characters are being deleted in any
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2143 ;; given region, we decided to treat Eastern and European
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2144 ;; characters equally, even though Eastern chars may
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2145 ;; occupy more columns.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2146 (if (memq this-command '(self-insert-command
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2147 quoted-insert viper-insert-tab))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2148 column-shift
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2149 0))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2150 ;; the number of deleted chars
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2151 chars-deleted)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2152
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2153 (viper-move-marker-locally
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2154 'viper-last-posn-in-replace-region
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2155 (max (if (> end (viper-replace-end)) (viper-replace-end) end)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2156 (or (marker-position viper-last-posn-in-replace-region)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2157 (viper-replace-start))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2158 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2159
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2160 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2161
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2162 ;; Make sure we don't delete more than needed.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2163 ;; This is executed at viper-last-posn-in-replace-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2164 (defsubst viper-trim-replace-chars-to-delete-if-necessary ()
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2165 (setq viper-replace-chars-to-delete
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2166 (max 0
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2167 (min viper-replace-chars-to-delete
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2168 ;; Don't delete more than to the end of repl overlay
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2169 (viper-chars-in-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2170 (viper-replace-end) viper-last-posn-in-replace-region)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2171 ;; point is viper-last-posn-in-replace-region now
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2172 ;; So, this limits deletion to the end of line
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2173 (viper-chars-in-region (point) (viper-line-pos 'end))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2174 ))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2175
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2176
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2177 ;; Delete stuff between viper-last-posn-in-replace-region and the end of
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2178 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2179 ;; the overlay and current point is before the end of the overlay.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2180 ;; Don't delete anything if current point is past the end of the overlay.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2181 (defun viper-finish-change ()
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2182 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2183 'viper-after-change-functions 'viper-replace-mode-spy-after)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2184 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2185 'viper-before-change-functions 'viper-replace-mode-spy-before)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2186 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2187 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2188 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2189 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2190 (viper-restore-cursor-color-after-replace)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2191 (setq viper-sitting-in-replace nil) ; just in case we'll need to know it
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2192 (save-excursion
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2193 (if (and viper-replace-overlay
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2194 (viper-pos-within-region viper-last-posn-in-replace-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2195 (viper-replace-start)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2196 (viper-replace-end))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2197 (< (point) (viper-replace-end)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2198 (delete-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2199 viper-last-posn-in-replace-region (viper-replace-end))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2200
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2201 (if (eq viper-current-state 'replace-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2202 (viper-downgrade-to-insert))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2203 ;; replace mode ended => nullify viper-last-posn-in-replace-region
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2204 (viper-move-marker-locally 'viper-last-posn-in-replace-region nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2205 (viper-hide-replace-overlay)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2206 (viper-refresh-mode-line)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2207 (viper-put-string-on-kill-ring viper-last-replace-region)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2208 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2209
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2210 ;; Make STRING be the first element of the kill ring.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2211 (defun viper-put-string-on-kill-ring (string)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2212 (setq kill-ring (cons string kill-ring))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2213 (if (> (length kill-ring) kill-ring-max)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2214 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2215 (setq kill-ring-yank-pointer kill-ring))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2216
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2217 (defun viper-finish-R-mode ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2218 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2219 'viper-post-command-hooks 'viper-R-state-post-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2220 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2221 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2222 (viper-downgrade-to-insert))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2223
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2224 (defun viper-start-R-mode ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2225 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2226 (overwrite-mode 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2227 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2228 'viper-post-command-hooks 'viper-R-state-post-command-sentinel t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2229 (viper-add-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2230 'viper-pre-command-hooks 'viper-replace-state-pre-command-sentinel t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2231 ;; guard against a smartie who switched from R-replace to normal replace
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2232 (viper-remove-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2233 'viper-post-command-hooks 'viper-replace-state-post-command-sentinel)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2234 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2235
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2236
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2237
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2238 (defun viper-replace-state-exit-cmd ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2239 "Binding for keys that cause Replace state to switch to Vi or to Insert.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2240 These keys are ESC, RET, and LineFeed"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2241 (interactive)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2242 (if overwrite-mode ; if in replace mode invoked via 'R'
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2243 (viper-finish-R-mode)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2244 (viper-finish-change))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2245 (let (com)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2246 (if (eq this-command 'viper-intercept-ESC-key)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2247 (setq com 'viper-exit-insert-state)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2248 (viper-set-unread-command-events last-input-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2249 (setq com (key-binding (read-key-sequence nil))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2250
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2251 (condition-case conds
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2252 (command-execute com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2253 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2254 (viper-message-conditions conds)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2255 )
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2256 (viper-hide-replace-overlay))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2257
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2258
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2259 (defun viper-replace-state-carriage-return ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2260 "Carriage return in Viper replace state."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2261 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2262 ;; If Emacs start supporting overlay maps, as it currently supports
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2263 ;; text-property maps, we could do away with viper-replace-minor-mode and
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2264 ;; just have keymap attached to replace overlay. Then the "if part" of this
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2265 ;; statement can be deleted.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2266 (if (or (< (point) (viper-replace-start))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2267 (> (point) (viper-replace-end)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2268 (let (viper-replace-minor-mode com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2269 (viper-set-unread-command-events last-input-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2270 (setq com (key-binding (read-key-sequence nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2271 (condition-case conds
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2272 (command-execute com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2273 (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2274 (viper-message-conditions conds))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2275 (if (not viper-allow-multiline-replace-regions)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2276 (viper-replace-state-exit-cmd)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2277 (if (viper-same-line (point) (viper-replace-end))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2278 (viper-replace-state-exit-cmd)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2279 ;; delete the rest of line
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2280 (delete-region (point) (viper-line-pos 'end))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2281 (save-excursion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2282 (end-of-line)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2283 (if (eobp) (error "Last line in buffer")))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2284 ;; skip to the next line
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2285 (forward-line 1)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2286 (back-to-indentation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2287 ))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2288
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2289
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2290 ;; This is the function bound to 'R'---unlimited replace.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2291 ;; Similar to Emacs's own overwrite-mode.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2292 (defun viper-overwrite (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2293 "Begin overwrite mode."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2294 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2295 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2296 (com (viper-getcom arg)) (len))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2297 (viper-set-destructive-command (list 'viper-overwrite val ?r nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2298 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2299 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2300 ;; Viper saves inserted text in viper-last-insertion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2301 (setq len (length viper-last-insertion))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2302 (delete-char len)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2303 (viper-loop val (viper-yank-last-insertion)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2304 (setq last-command 'viper-overwrite)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2305 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2306 (viper-set-replace-overlay (point) (viper-line-pos 'end))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2307 (viper-change-state-to-replace)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2308 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2309
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2310
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2311 ;; line commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2312
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2313 (defun viper-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2314 (let ((val (car arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2315 (com (cdr arg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2316 (viper-move-marker-locally 'viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2317 (if (not (eobp))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2318 (viper-next-line-carefully (1- val)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2319 ;; this ensures that dd, cc, D, yy will do the right thing on the last
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2320 ;; line of buffer when this line has no \n.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2321 (viper-add-newline-at-eob-if-necessary)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2322 (viper-execute-com 'viper-line val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2323 (if (and (eobp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2324 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2325
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2326 (defun viper-yank-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2327 "Yank ARG lines (in Vi's sense)."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2328 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2329 (let ((val (viper-p-val arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2330 (viper-line (cons val ?Y))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2331
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2332
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2333 ;; region commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2334
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2335 (defun viper-region (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2336 "Execute command on a region."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2337 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2338 (let ((val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2339 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2340 (viper-move-marker-locally 'viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2341 (exchange-point-and-mark)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2342 (viper-execute-com 'viper-region val com)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2343
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2344 (defun viper-Region (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2345 "Execute command on a Region."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2346 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2347 (let ((val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2348 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2349 (viper-move-marker-locally 'viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2350 (exchange-point-and-mark)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2351 (viper-execute-com 'viper-Region val com)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2352
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2353 (defun viper-replace-char (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2354 "Replace the following ARG chars by the character read."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2355 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2356 (if (and (eolp) (bolp)) (error "No character to replace here"))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2357 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2358 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2359 (viper-replace-char-subr com val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2360 (if (and (eolp) (not (bolp))) (forward-char 1))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2361 (setq viper-this-command-keys
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2362 (format "%sr" (if (integerp arg) arg "")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2363 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2364 (list 'viper-replace-char val ?r nil viper-d-char nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2365 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2366
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2367 (defun viper-replace-char-subr (com arg)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2368 (let (char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2369 (setq char (if (equal com ?r)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2370 viper-d-char
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2371 (read-char)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2372 (let (inhibit-quit) ; preserve consistency of undo-list and iso-accents
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2373 (if (and viper-automatic-iso-accents (memq char '(?' ?\" ?^ ?~)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2374 ;; get European characters
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2375 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2376 (viper-set-iso-accents-mode t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2377 (viper-set-unread-command-events char)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2378 (setq char (aref (read-key-sequence nil) 0))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2379 (viper-set-iso-accents-mode nil)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2380 (viper-set-complex-command-for-undo)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2381 (if (eq char ?\C-m) (setq char ?\n))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2382 (if (and viper-special-input-method (fboundp 'quail-start-translation))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2383 ;; get Intl. characters
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2384 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2385 (viper-set-input-method t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2386 (setq last-command-event
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2387 (viper-copy-event
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2388 (if viper-xemacs-p (character-to-event char) char)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2389 (delete-char 1 t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2390 (condition-case nil
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2391 (if com
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2392 (insert char)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2393 (if viper-emacs-p
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2394 (quail-start-translation 1)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2395 (quail-start-translation)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2396 (error))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2397 ;; quail translation failed
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2398 (if (and (not (stringp quail-current-str))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2399 (not (viper-characterp quail-current-str)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2400 (progn
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2401 (viper-adjust-undo)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2402 (undo-start)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2403 (undo-more 1)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2404 (viper-set-input-method nil)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2405 (error "Composing character failed, changes undone")))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2406 ;; quail translation seems ok
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2407 (or com
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2408 ;;(setq char quail-current-str))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2409 (setq char (viper-char-at-pos 'backward)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2410 (setq viper-d-char char)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2411 (viper-loop (1- (if (> arg 0) arg (- arg)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2412 (delete-char 1 t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2413 (insert char))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2414 (viper-set-input-method nil))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2415 (delete-char arg t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2416 (setq viper-d-char char)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2417 (viper-loop (if (> arg 0) arg (- arg))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2418 (insert char)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2419 (viper-adjust-undo)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2420 (backward-char arg))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2421
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2422
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2423 ;; basic cursor movement. j, k, l, h commands.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2424
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2425 (defun viper-forward-char (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2426 "Move point right ARG characters (left if ARG negative).
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2427 On reaching end of line, stop and signal error."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2428 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2429 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2430 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2431 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2432 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2433 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2434 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2435 ;; the boundary condition check gets weird here because
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2436 ;; forward-char may be the parameter of a delete, and 'dl' works
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2437 ;; just like 'x' for the last char on a line, so we have to allow
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2438 ;; the forward motion before the 'viper-execute-com', but, of
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2439 ;; course, 'dl' doesn't work on an empty line, so we have to
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2440 ;; catch that condition before 'viper-execute-com'
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2441 (if (and (eolp) (bolp)) (error "") (forward-char val))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2442 (if com (viper-execute-com 'viper-forward-char val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2443 (if (eolp) (progn (backward-char 1) (error ""))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2444 (forward-char val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2445 (if com (viper-execute-com 'viper-forward-char val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2446
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2447 (defun viper-backward-char (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2448 "Move point left ARG characters (right if ARG negative).
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2449 On reaching beginning of line, stop and signal error."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2450 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2451 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2452 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2453 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2454 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2455 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2456 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2457 (if (bolp) (error "") (backward-char val))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2458 (if com (viper-execute-com 'viper-backward-char val com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2459 (backward-char val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2460 (if com (viper-execute-com 'viper-backward-char val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2461
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2462 ;; Like forward-char, but doesn't move at end of buffer.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2463 ;; Returns distance traveled
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2464 ;; (positive or 0, if arg positive; negative if arg negative).
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2465 (defun viper-forward-char-carefully (&optional arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2466 (setq arg (or arg 1))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2467 (let ((pt (point)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2468 (condition-case nil
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2469 (forward-char arg)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2470 (error))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2471 (if (< (point) pt) ; arg was negative
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2472 (- (viper-chars-in-region pt (point)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2473 (viper-chars-in-region pt (point)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2474
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2475 ;; Like backward-char, but doesn't move at beg of buffer.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2476 ;; Returns distance traveled
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2477 ;; (negative or 0, if arg positive; positive if arg negative).
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2478 (defun viper-backward-char-carefully (&optional arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2479 (setq arg (or arg 1))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2480 (let ((pt (point)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2481 (condition-case nil
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2482 (backward-char arg)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2483 (error))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2484 (if (> (point) pt) ; arg was negative
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2485 (viper-chars-in-region pt (point))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2486 (- (viper-chars-in-region pt (point))))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2487
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2488 (defun viper-next-line-carefully (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2489 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2490 (next-line arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2491 (error nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2492
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2493
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2494
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2495 ;;; Word command
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2496
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2497 ;; Words are formed from alpha's and nonalphas - <sp>,\t\n are separators for
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2498 ;; word movement. When executed with a destructive command, \n is usually left
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2499 ;; untouched for the last word. Viper uses syntax table to determine what is a
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2500 ;; word and what is a separator. However, \n is always a separator. Also, if
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2501 ;; viper-syntax-preference is 'vi, then `_' is part of the word.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2502
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2503 ;; skip only one \n
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2504 (defun viper-skip-separators (forward)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2505 (if forward
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2506 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2507 (viper-skip-all-separators-forward 'within-line)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2508 (if (looking-at "\n")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2509 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2510 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2511 (viper-skip-all-separators-forward 'within-line))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2512 (viper-skip-all-separators-backward 'within-line)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2513 (viper-backward-char-carefully)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2514 (if (looking-at "\n")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2515 (viper-skip-all-separators-backward 'within-line)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2516 (forward-char))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2517
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2518 (defun viper-forward-word-kernel (val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2519 (while (> val 0)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2520 (cond ((viper-looking-at-alpha)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2521 (viper-skip-alpha-forward "_")
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2522 (viper-skip-separators t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2523 ((viper-looking-at-separator)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2524 (viper-skip-separators t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2525 ((not (viper-looking-at-alphasep))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2526 (viper-skip-nonalphasep-forward)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2527 (viper-skip-separators t)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2528 (setq val (1- val))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2529
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2530 ;; first skip non-newline separators backward, then skip \n. Then, if TWICE is
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2531 ;; non-nil, skip non-\n back again, but don't overshoot the limit LIM.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2532 (defun viper-separator-skipback-special (twice lim)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2533 (let ((prev-char (viper-char-at-pos 'backward))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2534 (saved-point (point)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2535 ;; skip non-newline separators backward
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2536 (while (and (not (memq prev-char '(nil \n)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2537 (< lim (point))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2538 ;; must be non-newline separator
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2539 (if (eq viper-syntax-preference 'strict-vi)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2540 (memq prev-char '(?\ ?\t))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2541 (memq (char-syntax prev-char) '(?\ ?-))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2542 (viper-backward-char-carefully)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2543 (setq prev-char (viper-char-at-pos 'backward)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2544
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2545 (if (and (< lim (point)) (eq prev-char ?\n))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2546 (backward-char)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2547 ;; If we skipped to the next word and the prefix of this line doesn't
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2548 ;; consist of separators preceded by a newline, then don't skip backwards
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2549 ;; at all.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2550 (goto-char saved-point))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2551 (setq prev-char (viper-char-at-pos 'backward))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2552
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2553 ;; skip again, but make sure we don't overshoot the limit
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2554 (if twice
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2555 (while (and (not (memq prev-char '(nil \n)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2556 (< lim (point))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2557 ;; must be non-newline separator
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2558 (if (eq viper-syntax-preference 'strict-vi)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2559 (memq prev-char '(?\ ?\t))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2560 (memq (char-syntax prev-char) '(?\ ?-))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2561 (viper-backward-char-carefully)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2562 (setq prev-char (viper-char-at-pos 'backward))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2563
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2564 (if (= (point) lim)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2565 (viper-forward-char-carefully))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2566 ))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2567
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2568
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2569 (defun viper-forward-word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2570 "Forward word."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2571 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2572 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2573 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2574 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2575 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2576 (viper-forward-word-kernel val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2577 (if com (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2578 (cond ((memq com (list ?c (- ?c)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2579 (viper-separator-skipback-special 'twice viper-com-point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2580 ;; Yank words including the whitespace, but not newline
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2581 ((memq com (list ?y (- ?y)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2582 (viper-separator-skipback-special nil viper-com-point))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2583 ((viper-dotable-command-p com)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2584 (viper-separator-skipback-special nil viper-com-point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2585 (viper-execute-com 'viper-forward-word val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2586
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2587
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2588 (defun viper-forward-Word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2589 "Forward word delimited by white characters."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2590 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2591 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2592 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2593 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2594 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2595 (viper-loop val
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2596 (viper-skip-nonseparators 'forward)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2597 (viper-skip-separators t))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2598 (if com (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2599 (cond ((memq com (list ?c (- ?c)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2600 (viper-separator-skipback-special 'twice viper-com-point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2601 ;; Yank words including the whitespace, but not newline
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2602 ((memq com (list ?y (- ?y)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2603 (viper-separator-skipback-special nil viper-com-point))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2604 ((viper-dotable-command-p com)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2605 (viper-separator-skipback-special nil viper-com-point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2606 (viper-execute-com 'viper-forward-Word val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2607
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2608
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2609 ;; this is a bit different from Vi, but Vi's end of word
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2610 ;; makes no sense whatsoever
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2611 (defun viper-end-of-word-kernel ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2612 (if (viper-end-of-word-p) (forward-char))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2613 (if (viper-looking-at-separator)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2614 (viper-skip-all-separators-forward))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2615
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2616 (cond ((viper-looking-at-alpha) (viper-skip-alpha-forward "_"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2617 ((not (viper-looking-at-alphasep)) (viper-skip-nonalphasep-forward)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2618 (viper-backward-char-carefully))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2619
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2620 (defun viper-end-of-word-p ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2621 (or (eobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2622 (save-excursion
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2623 (cond ((viper-looking-at-alpha)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2624 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2625 (not (viper-looking-at-alpha)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2626 ((not (viper-looking-at-alphasep))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2627 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2628 (viper-looking-at-alphasep))))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2629
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2630
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2631 (defun viper-end-of-word (arg &optional careful)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2632 "Move point to end of current word."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2633 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2634 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2635 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2636 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2637 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2638 (viper-loop val (viper-end-of-word-kernel))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2639 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2640 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2641 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2642 (viper-execute-com 'viper-end-of-word val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2643
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2644 (defun viper-end-of-Word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2645 "Forward to end of word delimited by white character."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2646 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2647 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2648 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2649 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2650 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2651 (viper-loop val
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2652 (viper-end-of-word-kernel)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2653 (viper-skip-nonseparators 'forward)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2654 (backward-char))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2655 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2656 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2657 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2658 (viper-execute-com 'viper-end-of-Word val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2659
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2660 (defun viper-backward-word-kernel (val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2661 (while (> val 0)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2662 (viper-backward-char-carefully)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2663 (cond ((viper-looking-at-alpha)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2664 (viper-skip-alpha-backward "_"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2665 ((viper-looking-at-separator)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2666 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2667 (viper-skip-separators nil)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2668 (viper-backward-char-carefully)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2669 (cond ((viper-looking-at-alpha)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2670 (viper-skip-alpha-backward "_"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2671 ((not (viper-looking-at-alphasep))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2672 (viper-skip-nonalphasep-backward))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2673 ((bobp)) ; could still be at separator, but at beg of buffer
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2674 (t (forward-char))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2675 ((not (viper-looking-at-alphasep))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2676 (viper-skip-nonalphasep-backward)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2677 (setq val (1- val))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2678
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2679 (defun viper-backward-word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2680 "Backward word."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2681 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2682 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2683 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2684 (com (viper-getcom arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2685 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2686 (let (i)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2687 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2688 (backward-char))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2689 (viper-move-marker-locally 'viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2690 (if i (forward-char))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2691 (viper-backward-word-kernel val)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2692 (if com (viper-execute-com 'viper-backward-word val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2693
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2694 (defun viper-backward-Word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2695 "Backward word delimited by white character."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2696 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2697 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2698 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2699 (com (viper-getcom arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2700 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2701 (let (i)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2702 (if (setq i (save-excursion (backward-char) (looking-at "\n")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2703 (backward-char))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2704 (viper-move-marker-locally 'viper-com-point (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2705 (if i (forward-char))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2706 (viper-loop val
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2707 (viper-skip-separators nil) ; nil means backward here
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2708 (viper-skip-nonseparators 'backward))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2709 (if com (viper-execute-com 'viper-backward-Word val com))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2710
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2711
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2712
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2713 ;; line commands
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2714
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2715 (defun viper-beginning-of-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2716 "Go to beginning of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2717 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2718 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2719 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2720 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2721 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2722 (beginning-of-line val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2723 (if com (viper-execute-com 'viper-beginning-of-line val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2724
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2725 (defun viper-bol-and-skip-white (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2726 "Beginning of line at first non-white character."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2727 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2728 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2729 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2730 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2731 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2732 (forward-to-indentation (1- val))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2733 (if com (viper-execute-com 'viper-bol-and-skip-white val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2734
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2735 (defun viper-goto-eol (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2736 "Go to end of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2737 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2738 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2739 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2740 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2741 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2742 (end-of-line val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2743 (if com (viper-execute-com 'viper-goto-eol val com))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2744 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2745 (if (and (eolp) (not (bolp))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2746 ;; a fix for viper-change-to-eol
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2747 (not (equal viper-current-state 'insert-state)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2748 (backward-char 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2749 ))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2750
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2751
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2752 (defun viper-goto-col (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2753 "Go to ARG's column."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2754 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2755 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2756 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2757 (com (viper-getcom arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2758 line-len)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2759 (setq line-len
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2760 (viper-chars-in-region
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2761 (viper-line-pos 'start) (viper-line-pos 'end)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2762 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2763 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2764 (forward-char (1- (min line-len val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2765 (while (> (current-column) (1- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2766 (backward-char 1))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2767 (if com (viper-execute-com 'viper-goto-col val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2768 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2769 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2770 (if (> val (current-column)) (error "")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2771 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2772
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2773
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2774 (defun viper-next-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2775 "Go to next line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2776 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2777 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2778 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2779 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2780 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2781 (next-line val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2782 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2783 (if (and (eolp) (not (bolp))) (backward-char 1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2784 (setq this-command 'next-line)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2785 (if com (viper-execute-com 'viper-next-line val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2786
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2787 (defun viper-next-line-at-bol (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2788 "Next line at beginning of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2789 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2790 (viper-leave-region-active)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2791 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2792 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2793 (if (eobp) (error "Last line in buffer")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2794 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2795 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2796 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2797 (forward-line val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2798 (back-to-indentation)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2799 (if com (viper-execute-com 'viper-next-line-at-bol val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2800
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2801 (defun viper-previous-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2802 "Go to previous line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2803 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2804 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2805 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2806 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2807 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2808 (previous-line val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2809 (if viper-ex-style-motion
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2810 (if (and (eolp) (not (bolp))) (backward-char 1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2811 (setq this-command 'previous-line)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2812 (if com (viper-execute-com 'viper-previous-line val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2813
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2814
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2815 (defun viper-previous-line-at-bol (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2816 "Previous line at beginning of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2817 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2818 (viper-leave-region-active)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2819 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2820 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2821 (if (bobp) (error "First line in buffer")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2822 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2823 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2824 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2825 (forward-line (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2826 (back-to-indentation)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2827 (if com (viper-execute-com 'viper-previous-line val com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2828
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2829 (defun viper-change-to-eol (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2830 "Change to end of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2831 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2832 (viper-goto-eol (cons arg ?c)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2833
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2834 (defun viper-kill-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2835 "Delete line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2836 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2837 (viper-goto-eol (cons arg ?d)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2838
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2839 (defun viper-erase-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2840 "Erase line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2841 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2842 (viper-beginning-of-line (cons arg ?d)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2843
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2844
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2845 ;;; Moving around
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2846
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2847 (defun viper-goto-line (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2848 "Go to ARG's line. Without ARG go to end of buffer."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2849 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2850 (let ((val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2851 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2852 (viper-move-marker-locally 'viper-com-point (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2853 (viper-deactivate-mark)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2854 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2855 (if (null val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2856 (goto-char (point-max))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2857 (goto-char (point-min))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2858 (forward-line (1- val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2859
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2860 ;; positioning is done twice: before and after command execution
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2861 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2862 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2863
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2864 (if com (viper-execute-com 'viper-goto-line val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2865
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2866 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2867 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2868 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2869
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2870 ;; Find ARG's occurrence of CHAR on the current line.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2871 ;; If FORWARD then search is forward, otherwise backward. OFFSET is used to
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2872 ;; adjust point after search.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2873 (defun viper-find-char (arg char forward offset)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2874 (or (char-or-string-p char) (error ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2875 (let ((arg (if forward arg (- arg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2876 (cmd (if (eq viper-intermediate-command 'viper-repeat)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2877 (nth 5 viper-d-com)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2878 (viper-array-to-string (this-command-keys))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2879 point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2880 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2881 (save-restriction
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2882 (if (> arg 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2883 (narrow-to-region
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2884 ;; forward search begins here
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2885 (if (eolp) (error "Command `%s': At end of line" cmd) (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2886 ;; forward search ends here
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2887 (progn (end-of-line) (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2888 (narrow-to-region
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2889 ;; backward search begins from here
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2890 (if (bolp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2891 (error "Command `%s': At beginning of line" cmd) (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2892 ;; backward search ends here
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2893 (progn (beginning-of-line) (point))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2894 ;; if arg > 0, point is forwarded before search.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2895 (if (> arg 0) (goto-char (1+ (point-min)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2896 (goto-char (point-max)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2897 (if (let ((case-fold-search nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2898 (search-forward (char-to-string char) nil 0 arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2899 (setq point (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2900 (error "Command `%s': `%c' not found" cmd char))))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2901 (goto-char point)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2902 (if (> arg 0)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2903 (backward-char (if offset 2 1))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
2904 (forward-char (if offset 1 0)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2905
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2906 (defun viper-find-char-forward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2907 "Find char on the line.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2908 If called interactively read the char to find from the terminal, and if
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2909 called from viper-repeat, the char last used is used. This behaviour is
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2910 controlled by the sign of prefix numeric value."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2911 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2912 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2913 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2914 (cmd-representation (nth 5 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2915 (if (> val 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2916 ;; this means that the function was called interactively
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2917 (setq viper-f-char (read-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2918 viper-f-forward t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2919 viper-f-offset nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2920 ;; viper-repeat --- set viper-F-char from command-keys
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2921 (setq viper-F-char (if (stringp cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2922 (viper-seq-last-elt cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2923 viper-F-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2924 viper-f-char viper-F-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2925 (setq val (- val)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2926 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2927 (viper-find-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2928 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2929 (setq val (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2930 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2931 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2932 (setq viper-F-char viper-f-char) ; set new viper-F-char
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2933 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2934 (viper-execute-com 'viper-find-char-forward val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2935
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2936 (defun viper-goto-char-forward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2937 "Go up to char ARG forward on line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2938 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2939 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2940 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2941 (cmd-representation (nth 5 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2942 (if (> val 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2943 ;; this means that the function was called interactively
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2944 (setq viper-f-char (read-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2945 viper-f-forward t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2946 viper-f-offset t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2947 ;; viper-repeat --- set viper-F-char from command-keys
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2948 (setq viper-F-char (if (stringp cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2949 (viper-seq-last-elt cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2950 viper-F-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2951 viper-f-char viper-F-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2952 (setq val (- val)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2953 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2954 (viper-find-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2955 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) t t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2956 (setq val (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2957 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2958 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2959 (setq viper-F-char viper-f-char) ; set new viper-F-char
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2960 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2961 (viper-execute-com 'viper-goto-char-forward val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2962
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2963 (defun viper-find-char-backward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2964 "Find char ARG on line backward."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2965 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2966 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2967 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2968 (cmd-representation (nth 5 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2969 (if (> val 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2970 ;; this means that the function was called interactively
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2971 (setq viper-f-char (read-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2972 viper-f-forward nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2973 viper-f-offset nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2974 ;; viper-repeat --- set viper-F-char from command-keys
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2975 (setq viper-F-char (if (stringp cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2976 (viper-seq-last-elt cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2977 viper-F-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2978 viper-f-char viper-F-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2979 (setq val (- val)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2980 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2981 (viper-find-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2982 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2983 (setq val (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2984 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2985 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2986 (setq viper-F-char viper-f-char) ; set new viper-F-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2987 (viper-execute-com 'viper-find-char-backward val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2988
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2989 (defun viper-goto-char-backward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2990 "Go up to char ARG backward on line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2991 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2992 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2993 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2994 (cmd-representation (nth 5 viper-d-com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2995 (if (> val 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
2996 ;; this means that the function was called interactively
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2997 (setq viper-f-char (read-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2998 viper-f-forward nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
2999 viper-f-offset t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3000 ;; viper-repeat --- set viper-F-char from command-keys
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3001 (setq viper-F-char (if (stringp cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3002 (viper-seq-last-elt cmd-representation)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3003 viper-F-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3004 viper-f-char viper-F-char)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3005 (setq val (- val)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3006 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3007 (viper-find-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3008 val (if (> (viper-p-val arg) 0) viper-f-char viper-F-char) nil t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3009 (setq val (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3010 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3011 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3012 (setq viper-F-char viper-f-char) ; set new viper-F-char
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3013 (viper-execute-com 'viper-goto-char-backward val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3014
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3015 (defun viper-repeat-find (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3016 "Repeat previous find command."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3017 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3018 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3019 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3020 (viper-deactivate-mark)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3021 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3022 (viper-find-char val viper-f-char viper-f-forward viper-f-offset)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3023 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3024 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3025 (if viper-f-forward (forward-char))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3026 (viper-execute-com 'viper-repeat-find val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3027
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3028 (defun viper-repeat-find-opposite (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3029 "Repeat previous find command in the opposite direction."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3030 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3031 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3032 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3033 (viper-deactivate-mark)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3034 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3035 (viper-find-char val viper-f-char (not viper-f-forward) viper-f-offset)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3036 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3037 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3038 (if viper-f-forward (forward-char))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3039 (viper-execute-com 'viper-repeat-find-opposite val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3040
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3041
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3042 ;; window scrolling etc.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3043
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3044 (defun viper-window-top (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3045 "Go to home window line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3046 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3047 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3048 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3049 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3050 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3051 (move-to-window-line (1- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3052
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3053 ;; positioning is done twice: before and after command execution
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3054 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3055 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3056
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3057 (if com (viper-execute-com 'viper-window-top val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3058
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3059 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3060 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3061 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3062
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3063 (defun viper-window-middle (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3064 "Go to middle window line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3065 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3066 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3067 (com (viper-getCom arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3068 lines)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3069 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3070 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3071 (if (not (pos-visible-in-window-p (point-max)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3072 (move-to-window-line (+ (/ (1- (window-height)) 2) (1- val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3073 (setq lines (count-lines (window-start) (point-max)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3074 (move-to-window-line (+ (/ lines 2) (1- val))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3075
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3076 ;; positioning is done twice: before and after command execution
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3077 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3078 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3079
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3080 (if com (viper-execute-com 'viper-window-middle val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3081
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3082 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3083 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3084 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3085
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3086 (defun viper-window-bottom (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3087 "Go to last window line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3088 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3089 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3090 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3091 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3092 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3093 (move-to-window-line (- val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3094
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3095 ;; positioning is done twice: before and after command execution
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3096 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3097 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3098
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3099 (if com (viper-execute-com 'viper-window-bottom val com))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3100
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3101 (if (and (eobp) (bolp) (not (bobp))) (forward-line -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3102 (back-to-indentation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3103 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3104
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3105 (defun viper-line-to-top (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3106 "Put current line on the home line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3107 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3108 (recenter (1- arg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3109
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3110 (defun viper-line-to-middle (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3111 "Put current line on the middle line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3112 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3113 (recenter (+ (1- arg) (/ (1- (window-height)) 2))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3114
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3115 (defun viper-line-to-bottom (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3116 "Put current line on the last line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3117 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3118 (recenter (- (window-height) (1+ arg))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3119
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3120 ;; If point is within viper-search-scroll-threshold of window top or bottom,
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3121 ;; scroll up or down 1/7 of window height, depending on whether we are at the
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3122 ;; bottom or at the top of the window. This function is called by viper-search
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3123 ;; (which is called from viper-search-forward/backward/next). If the value of
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3124 ;; viper-search-scroll-threshold is negative - don't scroll.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3125 (defun viper-adjust-window ()
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3126 (let ((win-height (if viper-emacs-p
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3127 (1- (window-height)) ; adjust for modeline
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3128 (window-displayed-height)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3129 (pt (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3130 at-top-p at-bottom-p
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3131 min-scroll direction)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3132 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3133 (move-to-window-line 0) ; top
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3134 (setq at-top-p
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3135 (<= (count-lines pt (point))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3136 viper-search-scroll-threshold))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3137 (move-to-window-line -1) ; bottom
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3138 (setq at-bottom-p
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3139 (<= (count-lines pt (point)) viper-search-scroll-threshold))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3140 )
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3141 (cond (at-top-p (setq min-scroll (1- viper-search-scroll-threshold)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3142 direction 1))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3143 (at-bottom-p (setq min-scroll (1+ viper-search-scroll-threshold)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3144 direction -1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3145 (if min-scroll
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3146 (recenter
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3147 (* (max min-scroll (/ win-height 7)) direction)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3148 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3149
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3150
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3151 ;; paren match
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3152 ;; must correct this to only match ( to ) etc. On the other hand
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3153 ;; it is good that paren match gets confused, because that way you
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3154 ;; catch _all_ imbalances.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3155
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3156 (defun viper-paren-match (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3157 "Go to the matching parenthesis."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3158 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3159 (viper-leave-region-active)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3160 (let ((com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3161 (parse-sexp-ignore-comments viper-parse-sexp-ignore-comments)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3162 anchor-point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3163 (if (integerp arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3164 (if (or (> arg 99) (< arg 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3165 (error "Prefix must be between 1 and 99")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3166 (goto-char
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3167 (if (> (point-max) 80000)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3168 (* (/ (point-max) 100) arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3169 (/ (* (point-max) arg) 100)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3170 (back-to-indentation))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3171 (let (beg-lim end-lim)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3172 (if (and (eolp) (not (bolp))) (forward-char -1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3173 (if (not (looking-at "[][(){}]"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3174 (setq anchor-point (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3175 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3176 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3177 (setq beg-lim (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3178 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3179 (setq end-lim (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3180 (cond ((re-search-forward "[][(){}]" end-lim t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3181 (backward-char) )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3182 ((re-search-backward "[][(){}]" beg-lim t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3183 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3184 (error "No matching character on line"))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3185 (cond ((looking-at "[\(\[{]")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3186 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3187 (forward-sexp 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3188 (if com
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3189 (viper-execute-com 'viper-paren-match nil com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3190 (backward-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3191 (anchor-point
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3192 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3193 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3194 (viper-move-marker-locally 'viper-com-point anchor-point)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3195 (forward-char 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3196 (viper-execute-com 'viper-paren-match nil com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3197 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3198 ((looking-at "[])}]")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3199 (forward-char)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3200 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3201 (backward-sexp 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3202 (if com (viper-execute-com 'viper-paren-match nil com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3203 (t (error ""))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3204
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3205 (defun viper-toggle-parse-sexp-ignore-comments ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3206 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3207 (setq viper-parse-sexp-ignore-comments
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3208 (not viper-parse-sexp-ignore-comments))
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3209 (princ (format
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3210 "From now on, `%%' will %signore parentheses inside comment fields"
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3211 (if viper-parse-sexp-ignore-comments "" "NOT "))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3212
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3213
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3214 ;; sentence ,paragraph and heading
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3215
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3216 (defun viper-forward-sentence (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3217 "Forward sentence."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3218 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3219 (push-mark nil t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3220 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3221 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3222 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3223 (forward-sentence val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3224 (if com (viper-execute-com 'viper-forward-sentence nil com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3225
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3226 (defun viper-backward-sentence (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3227 "Backward sentence."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3228 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3229 (push-mark nil t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3230 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3231 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3232 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3233 (backward-sentence val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3234 (if com (viper-execute-com 'viper-backward-sentence nil com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3235
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3236 (defun viper-forward-paragraph (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3237 "Forward paragraph."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3238 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3239 (push-mark nil t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3240 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3241 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3242 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3243 (forward-paragraph val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3244 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3245 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3246 (backward-char 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3247 (viper-execute-com 'viper-forward-paragraph nil com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3248
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3249 (defun viper-backward-paragraph (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3250 "Backward paragraph."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3251 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3252 (push-mark nil t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3253 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3254 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3255 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3256 (backward-paragraph val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3257 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3258 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3259 (forward-char 1)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3260 (viper-execute-com 'viper-backward-paragraph nil com)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3261 (backward-char 1)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3262
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3263 ;; should be mode-specific etc.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3264
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3265 (defun viper-prev-heading (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3266 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3267 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3268 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3269 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3270 (re-search-backward viper-heading-start nil t val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3271 (goto-char (match-beginning 0))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3272 (if com (viper-execute-com 'viper-prev-heading nil com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3273
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3274 (defun viper-heading-end (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3275 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3276 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3277 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3278 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3279 (re-search-forward viper-heading-end nil t val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3280 (goto-char (match-beginning 0))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3281 (if com (viper-execute-com 'viper-heading-end nil com))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3282
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3283 (defun viper-next-heading (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3284 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3285 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3286 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3287 (if com (viper-move-marker-locally 'viper-com-point (point)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3288 (end-of-line)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3289 (re-search-forward viper-heading-start nil t val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3290 (goto-char (match-beginning 0))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3291 (if com (viper-execute-com 'viper-next-heading nil com))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3292
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3293
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3294 ;; scrolling
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3295
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3296 (defun viper-scroll-screen (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3297 "Scroll to next screen."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3298 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3299 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3300 (if (> arg 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3301 (while (> arg 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3302 (scroll-up)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3303 (setq arg (1- arg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3304 (while (> 0 arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3305 (scroll-down)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3306 (setq arg (1+ arg))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3307 (error (beep 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3308 (if (> arg 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3309 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3310 (message "End of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3311 (goto-char (point-max)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3312 (message "Beginning of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3313 (goto-char (point-min))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3314 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3315
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3316 (defun viper-scroll-screen-back (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3317 "Scroll to previous screen."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3318 (interactive "p")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3319 (viper-scroll-screen (- arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3320
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3321 (defun viper-scroll-down (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3322 "Pull down half screen."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3323 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3324 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3325 (if (null arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3326 (scroll-down (/ (window-height) 2))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3327 (scroll-down arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3328 (error (beep 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3329 (message "Beginning of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3330 (goto-char (point-min)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3331
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3332 (defun viper-scroll-down-one (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3333 "Scroll up one line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3334 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3335 (scroll-down arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3336
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3337 (defun viper-scroll-up (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3338 "Pull up half screen."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3339 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3340 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3341 (if (null arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3342 (scroll-up (/ (window-height) 2))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3343 (scroll-up arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3344 (error (beep 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3345 (message "End of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3346 (goto-char (point-max)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3347
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3348 (defun viper-scroll-up-one (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3349 "Scroll down one line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3350 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3351 (scroll-up arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3352
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3353
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3354 ;; searching
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3355
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3356 (defun viper-if-string (prompt)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3357 (if (memq viper-intermediate-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3358 '(viper-command-argument viper-digit-argument viper-repeat))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3359 (setq viper-this-command-keys (this-command-keys)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3360 (let ((s (viper-read-string-with-history
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3361 prompt
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3362 nil ; no initial
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3363 'viper-search-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3364 (car viper-search-history))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3365 (if (not (string= s ""))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3366 (setq viper-s-string s))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3367
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3368
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3369 (defun viper-toggle-search-style (arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3370 "Toggle the value of viper-case-fold-search/viper-re-search.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3371 Without prefix argument, will ask which search style to toggle. With prefix
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3372 arg 1,toggles viper-case-fold-search; with arg 2 toggles viper-re-search.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3373
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3374 Although this function is bound to \\[viper-toggle-search-style], the most
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3375 convenient way to use it is to bind `//' to the macro
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3376 `1 M-x viper-toggle-search-style' and `///' to
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3377 `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3378 toggle case-fold-search and hitting `/' three times witth toggle regexp
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3379 search. Macros are more convenient in this case because they don't affect
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3380 the Emacs binding of `/'."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3381 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3382 (let (msg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3383 (cond ((or (eq arg 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3384 (and (null arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3385 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3386 (if viper-case-fold-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3387 "case-insensitive" "case-sensitive")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3388 (if viper-case-fold-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3389 "case-sensitive"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3390 "case-insensitive")))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3391 (setq viper-case-fold-search (null viper-case-fold-search))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3392 (if viper-case-fold-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3393 (setq msg "Search becomes case-insensitive")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3394 (setq msg "Search becomes case-sensitive")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3395 ((or (eq arg 2)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3396 (and (null arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3397 (y-or-n-p (format "Search style: '%s'. Want '%s'? "
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3398 (if viper-re-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3399 "regexp-search" "vanilla-search")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3400 (if viper-re-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3401 "vanilla-search"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3402 "regexp-search")))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3403 (setq viper-re-search (null viper-re-search))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3404 (if viper-re-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3405 (setq msg "Search becomes regexp-style")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3406 (setq msg "Search becomes vanilla-style")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3407 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3408 (setq msg "Search style remains unchanged")))
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3409 (princ msg t)))
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3410
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3411 (defun viper-set-searchstyle-toggling-macros (unset)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3412 "Set the macros for toggling the search style in Viper's vi-state.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3413 The macro that toggles case sensitivity is bound to `//', and the one that
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3414 toggles regexp search is bound to `///'.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3415 With a prefix argument, this function unsets the macros. "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3416 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3417 (or noninteractive
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3418 (if (not unset)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3419 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3420 ;; toggle case sensitivity in search
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3421 (viper-record-kbd-macro
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3422 "//" 'vi-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3423 [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]
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3424 't)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3425 ;; toggle regexp/vanila search
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3426 (viper-record-kbd-macro
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3427 "///" 'vi-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3428 [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]
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3429 't)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3430 (if (interactive-p)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3431 (message
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3432 "// and /// now toggle case-sensitivity and regexp search")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3433 (viper-unrecord-kbd-macro "//" 'vi-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3434 (sit-for 2)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3435 (viper-unrecord-kbd-macro "///" 'vi-state))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3436
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3437
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3438 (defun viper-set-parsing-style-toggling-macro (unset)
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3439 "Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3440 This is used in conjunction with the `%' command.
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3441
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3442 With a prefix argument, unsets the macro."
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3443 (interactive "P")
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3444 (or noninteractive
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3445 (if (not unset)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3446 (progn
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3447 ;; Make %%% toggle parsing comments for matching parentheses
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3448 (viper-record-kbd-macro
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3449 "%%%" 'vi-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3450 [(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]
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3451 't)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3452 (if (interactive-p)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3453 (message
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3454 "%%%%%% now toggles whether comments should be parsed for matching parentheses")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3455 (viper-unrecord-kbd-macro "%%%" 'vi-state))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3456
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3457
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3458 (defun viper-set-emacs-state-searchstyle-macros (unset &optional arg-majormode)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3459 "Set the macros for toggling the search style in Viper's emacs-state.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3460 The macro that toggles case sensitivity is bound to `//', and the one that
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3461 toggles regexp search is bound to `///'.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3462 With a prefix argument, this function unsets the macros.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3463 If the optional prefix argument is non-nil and specifies a valid major mode,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3464 this sets the macros only in the macros in that major mode. Otherwise,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3465 the macros are set in the current major mode.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3466 \(When unsetting the macros, the second argument has no effect.\)"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3467 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3468 (or noninteractive
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3469 (if (not unset)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3470 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3471 ;; toggle case sensitivity in search
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3472 (viper-record-kbd-macro
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3473 "//" 'emacs-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3474 [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]
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3475 (or arg-majormode major-mode))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3476 ;; toggle regexp/vanila search
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3477 (viper-record-kbd-macro
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3478 "///" 'emacs-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3479 [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]
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3480 (or arg-majormode major-mode))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3481 (if (interactive-p)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3482 (message
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3483 "// and /// now toggle case-sensitivity and regexp search.")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3484 (viper-unrecord-kbd-macro "//" 'emacs-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3485 (sit-for 2)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3486 (viper-unrecord-kbd-macro "///" 'emacs-state))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3487
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3488
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3489 (defun viper-search-forward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3490 "Search a string forward.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3491 ARG is used to find the ARG's occurrence of the string.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3492 Null string will repeat previous search."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3493 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3494 (let ((val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3495 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3496 (old-str viper-s-string))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3497 (setq viper-s-forward t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3498 (viper-if-string "/")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3499 ;; this is not used at present, but may be used later
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3500 (if (or (not (equal old-str viper-s-string))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3501 (not (markerp viper-local-search-start-marker))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3502 (not (marker-buffer viper-local-search-start-marker)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3503 (setq viper-local-search-start-marker (point-marker)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3504 (viper-search viper-s-string t val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3505 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3506 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3507 (viper-move-marker-locally 'viper-com-point (mark t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3508 (viper-execute-com 'viper-search-next val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3509
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3510 (defun viper-search-backward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3511 "Search a string backward.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3512 ARG is used to find the ARG's occurrence of the string.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3513 Null string will repeat previous search."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3514 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3515 (let ((val (viper-P-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3516 (com (viper-getcom arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3517 (old-str viper-s-string))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3518 (setq viper-s-forward nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3519 (viper-if-string "?")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3520 ;; this is not used at present, but may be used later
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3521 (if (or (not (equal old-str viper-s-string))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3522 (not (markerp viper-local-search-start-marker))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3523 (not (marker-buffer viper-local-search-start-marker)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3524 (setq viper-local-search-start-marker (point-marker)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3525 (viper-search viper-s-string nil val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3526 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3527 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3528 (viper-move-marker-locally 'viper-com-point (mark t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3529 (viper-execute-com 'viper-search-next val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3530
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3531
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3532 ;; Search for COUNT's occurrence of STRING.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3533 ;; Search is forward if FORWARD is non-nil, otherwise backward.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3534 ;; INIT-POINT is the position where search is to start.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3535 ;; Arguments:
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3536 ;; (STRING FORW COUNT &optional NO-OFFSET INIT-POINT LIMIT FAIL-IF-NOT-FOUND)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3537 (defun viper-search (string forward arg
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3538 &optional no-offset init-point fail-if-not-found)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3539 (if (not (equal string ""))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3540 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3541 (com (viper-getcom arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3542 (offset (not no-offset))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3543 (case-fold-search viper-case-fold-search)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3544 (start-point (or init-point (point))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3545 (viper-deactivate-mark)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3546 (if forward
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3547 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3548 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3549 (if offset (viper-forward-char-carefully))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3550 (if viper-re-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3551 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3552 (re-search-forward string nil nil val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3553 (re-search-backward string))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3554 (search-forward string nil nil val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3555 (search-backward string))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3556 (if (not (equal start-point (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3557 (push-mark start-point t)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3558 (search-failed
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3559 (if (and (not fail-if-not-found) viper-search-wrap-around-t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3560 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3561 (message "Search wrapped around BOTTOM of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3562 (goto-char (point-min))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3563 (viper-search string forward (cons 1 com) t start-point 'fail)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3564 ;; don't wait in macros
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3565 (or executing-kbd-macro
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3566 (memq viper-intermediate-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3567 '(viper-repeat
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3568 viper-digit-argument
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3569 viper-command-argument))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3570 (sit-for 2))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3571 ;; delete the wrap-around message
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3572 (message "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3573 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3574 (goto-char start-point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3575 (error "`%s': %s not found"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3576 string
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3577 (if viper-re-search "Pattern" "String"))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3578 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3579 ;; backward
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3580 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3581 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3582 (if viper-re-search
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3583 (re-search-backward string nil nil val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3584 (search-backward string nil nil val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3585 (if (not (equal start-point (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3586 (push-mark start-point t)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3587 (search-failed
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3588 (if (and (not fail-if-not-found) viper-search-wrap-around-t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3589 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3590 (message "Search wrapped around TOP of buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3591 (goto-char (point-max))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3592 (viper-search string forward (cons 1 com) t start-point 'fail)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3593 ;; don't wait in macros
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3594 (or executing-kbd-macro
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3595 (memq viper-intermediate-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3596 '(viper-repeat
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3597 viper-digit-argument
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3598 viper-command-argument))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3599 (sit-for 2))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3600 ;; delete the wrap-around message
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3601 (message "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3602 )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3603 (goto-char start-point)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3604 (error "`%s': %s not found"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3605 string
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3606 (if viper-re-search "Pattern" "String"))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3607 ))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3608 ;; pull up or down if at top/bottom of window
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3609 (viper-adjust-window)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3610 ;; highlight the result of search
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3611 ;; don't wait and don't highlight in macros
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3612 (or executing-kbd-macro
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3613 (memq viper-intermediate-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3614 '(viper-repeat viper-digit-argument viper-command-argument))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3615 (viper-flash-search-pattern))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3616 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3617
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3618 (defun viper-search-next (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3619 "Repeat previous search."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3620 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3621 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3622 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3623 (if (null viper-s-string) (error viper-NoPrevSearch))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3624 (viper-search viper-s-string viper-s-forward arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3625 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3626 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3627 (viper-move-marker-locally 'viper-com-point (mark t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3628 (viper-execute-com 'viper-search-next val com)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3629
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3630 (defun viper-search-Next (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3631 "Repeat previous search in the reverse direction."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3632 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3633 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3634 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3635 (if (null viper-s-string) (error viper-NoPrevSearch))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3636 (viper-search viper-s-string (not viper-s-forward) arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3637 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3638 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3639 (viper-move-marker-locally 'viper-com-point (mark t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3640 (viper-execute-com 'viper-search-Next val com)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3641
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3642
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3643 ;; Search contents of buffer defined by one of Viper's motion commands.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3644 ;; Repeatable via `n' and `N'.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3645 (defun viper-buffer-search-enable (&optional c)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3646 (cond (c (setq viper-buffer-search-char c))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3647 ((null viper-buffer-search-char)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3648 (setq viper-buffer-search-char ?g)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3649 (define-key viper-vi-basic-map
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3650 (char-to-string viper-buffer-search-char) 'viper-command-argument)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3651 (aset viper-exec-array viper-buffer-search-char 'viper-exec-buffer-search)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3652 (setq viper-prefix-commands
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3653 (cons viper-buffer-search-char viper-prefix-commands)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3654
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3655 ;; This is a Viper wraper for isearch-forward.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3656 (defun viper-isearch-forward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3657 "Do incremental search forward."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3658 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3659 ;; emacs bug workaround
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3660 (if (listp arg) (setq arg (car arg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3661 (viper-exec-form-in-emacs (list 'isearch-forward arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3662
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3663 ;; This is a Viper wraper for isearch-backward."
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3664 (defun viper-isearch-backward (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3665 "Do incremental search backward."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3666 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3667 ;; emacs bug workaround
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3668 (if (listp arg) (setq arg (car arg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3669 (viper-exec-form-in-emacs (list 'isearch-backward arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3670
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3671
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3672 ;; visiting and killing files, buffers
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3673
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3674 (defun viper-switch-to-buffer ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3675 "Switch to buffer in the current window."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3676 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3677 (let (buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3678 (setq buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3679 (read-buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3680 (format "Switch to buffer in this window \(%s\): "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3681 (buffer-name (other-buffer (current-buffer))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3682 (switch-to-buffer buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3683 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3684
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3685 (defun viper-switch-to-buffer-other-window ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3686 "Switch to buffer in another window."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3687 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3688 (let (buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3689 (setq buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3690 (read-buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3691 (format "Switch to buffer in another window \(%s\): "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3692 (buffer-name (other-buffer (current-buffer))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3693 (switch-to-buffer-other-window buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3694 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3695
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3696 (defun viper-kill-buffer ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3697 "Kill a buffer."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3698 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3699 (let (buffer buffer-name)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3700 (setq buffer-name
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3701 (read-buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3702 (format "Kill buffer \(%s\): "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3703 (buffer-name (current-buffer)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3704 (setq buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3705 (if (null buffer-name)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3706 (current-buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3707 (get-buffer buffer-name)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3708 (if (null buffer) (error "`%s': No such buffer" buffer-name))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3709 (if (or (not (buffer-modified-p buffer))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3710 (y-or-n-p
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3711 (format
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3712 "Buffer `%s' is modified, are you sure you want to kill it? "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3713 buffer-name)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3714 (kill-buffer buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3715 (error "Buffer not killed"))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3716
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3717
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3718
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3719 ;; yank and pop
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3720
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3721 (defsubst viper-yank (text)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3722 "Yank TEXT silently. This works correctly with Emacs's yank-pop command."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3723 (insert text)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3724 (setq this-command 'yank))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3725
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3726 (defun viper-put-back (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3727 "Put back after point/below line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3728 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3729 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3730 (text (if viper-use-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3731 (cond ((viper-valid-register viper-use-register '(digit))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3732 (current-kill
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3733 (- viper-use-register ?1) 'do-not-rotate))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3734 ((viper-valid-register viper-use-register)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3735 (get-register (downcase viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3736 (t (error viper-InvalidRegister viper-use-register)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3737 (current-kill 0))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3738 (if (null text)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3739 (if viper-use-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3740 (let ((reg viper-use-register))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3741 (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3742 (error viper-EmptyRegister reg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3743 (error "")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3744 (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3745 (if (viper-end-with-a-newline-p text)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3746 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3747 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3748 (if (eobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3749 (insert "\n")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3750 (forward-line 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3751 (beginning-of-line))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3752 (if (not (eolp)) (viper-forward-char-carefully)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3753 (set-marker (viper-mark-marker) (point) (current-buffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3754 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3755 (list 'viper-put-back val nil viper-use-register nil nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3756 (viper-loop val (viper-yank text)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3757 ;; Vi puts cursor on the last char when the yanked text doesn't contain a
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3758 ;; newline; it leaves the cursor at the beginning when the text contains
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3759 ;; a newline
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3760 (if (viper-same-line (point) (mark))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3761 (or (= (point) (mark)) (viper-backward-char-carefully))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3762 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3763 (if (bolp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3764 (back-to-indentation)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3765 (viper-deactivate-mark))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3766
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3767 (defun viper-Put-back (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3768 "Put back at point/above line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3769 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3770 (let ((val (viper-p-val arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3771 (text (if viper-use-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3772 (cond ((viper-valid-register viper-use-register '(digit))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3773 (current-kill
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3774 (- viper-use-register ?1) 'do-not-rotate))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3775 ((viper-valid-register viper-use-register)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3776 (get-register (downcase viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3777 (t (error viper-InvalidRegister viper-use-register)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3778 (current-kill 0))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3779 (if (null text)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3780 (if viper-use-register
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3781 (let ((reg viper-use-register))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3782 (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3783 (error viper-EmptyRegister reg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3784 (error "")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3785 (setq viper-use-register nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3786 (if (viper-end-with-a-newline-p text) (beginning-of-line))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3787 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3788 (list 'viper-Put-back val nil viper-use-register nil nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3789 (set-marker (viper-mark-marker) (point) (current-buffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3790 (viper-loop val (viper-yank text)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3791 ;; Vi puts cursor on the last char when the yanked text doesn't contain a
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3792 ;; newline; it leaves the cursor at the beginning when the text contains
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3793 ;; a newline
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3794 (if (viper-same-line (point) (mark))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3795 (or (= (point) (mark)) (viper-backward-char-carefully))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3796 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3797 (if (bolp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3798 (back-to-indentation)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3799 (viper-deactivate-mark))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3800
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3801
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3802 ;; Copy region to kill-ring.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3803 ;; If BEG and END do not belong to the same buffer, copy empty region.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3804 (defun viper-copy-region-as-kill (beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3805 (condition-case nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3806 (copy-region-as-kill beg end)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3807 (error (copy-region-as-kill beg beg))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3808
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3809
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3810 (defun viper-delete-char (arg)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3811 "Delete next character."
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3812 (interactive "P")
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3813 (let ((val (viper-p-val arg))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3814 end-del-pos)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3815 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3816 (list 'viper-delete-char val nil nil nil nil))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3817 (if (and viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3818 (> val (viper-chars-in-region (point) (viper-line-pos 'end))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3819 (setq val (viper-chars-in-region (point) (viper-line-pos 'end))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3820 (if (and viper-ex-style-motion (eolp))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3821 (if (bolp) (error "") (setq val 0))) ; not bol---simply back 1 ch
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3822 (save-excursion
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3823 (viper-forward-char-carefully val)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3824 (setq end-del-pos (point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3825 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3826 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3827 (cond ((viper-valid-register viper-use-register '((Letter)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3828 (viper-append-to-register
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3829 (downcase viper-use-register) (point) end-del-pos))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3830 ((viper-valid-register viper-use-register)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3831 (copy-to-register
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3832 viper-use-register (point) end-del-pos nil))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3833 (t (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3834 (setq viper-use-register nil)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3835
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3836 (delete-char val t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3837 (if viper-ex-style-motion
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3838 (if (and (eolp) (not (bolp))) (backward-char 1)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3839 ))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3840
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3841 (defun viper-delete-backward-char (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3842 "Delete previous character. On reaching beginning of line, stop and beep."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3843 (interactive "P")
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3844 (let ((val (viper-p-val arg))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3845 end-del-pos)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3846 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3847 (list 'viper-delete-backward-char val nil nil nil nil))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3848 (if (and
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3849 viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3850 (> val (viper-chars-in-region (viper-line-pos 'start) (point))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3851 (setq val (viper-chars-in-region (viper-line-pos 'start) (point))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3852 (save-excursion
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3853 (viper-backward-char-carefully val)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3854 (setq end-del-pos (point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3855 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3856 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3857 (cond ((viper-valid-register viper-use-register '(Letter))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3858 (viper-append-to-register
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3859 (downcase viper-use-register) end-del-pos (point)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3860 ((viper-valid-register viper-use-register)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3861 (copy-to-register
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3862 viper-use-register end-del-pos (point) nil))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3863 (t (error viper-InvalidRegister viper-use-register)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3864 (setq viper-use-register nil)))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3865 (if (and (bolp) viper-ex-style-editing)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3866 (ding))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3867 (delete-backward-char val t)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3868
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3869 (defun viper-del-backward-char-in-insert ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3870 "Delete 1 char backwards while in insert mode."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3871 (interactive)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3872 (if (and viper-ex-style-editing (bolp))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3873 (beep 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3874 (delete-backward-char 1 t)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3875
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3876 (defun viper-del-backward-char-in-replace ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3877 "Delete one character in replace mode.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3878 If `viper-delete-backwards-in-replace' is t, then DEL key actually deletes
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3879 charecters. If it is nil, then the cursor just moves backwards, similarly
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3880 to Vi. The variable `viper-ex-style-editing', if t, doesn't let the
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3881 cursor move past the beginning of line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3882 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3883 (cond (viper-delete-backwards-in-replace
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3884 (cond ((not (bolp))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3885 (delete-backward-char 1 t))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3886 (viper-ex-style-editing
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3887 (beep 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3888 ((bobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3889 (beep 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3890 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3891 (delete-backward-char 1 t))))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3892 (viper-ex-style-editing
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3893 (if (bolp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3894 (beep 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3895 (backward-char 1)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3896 (t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3897 (backward-char 1))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3898
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3899
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3900
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3901 ;; join lines.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3902
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3903 (defun viper-join-lines (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3904 "Join this line to next, if ARG is nil. Otherwise, join ARG lines."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3905 (interactive "*P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3906 (let ((val (viper-P-val arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3907 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3908 (list 'viper-join-lines val nil nil nil nil))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3909 (viper-loop (if (null val) 1 (1- val))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3910 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3911 (if (not (eobp))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3912 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3913 (forward-line 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3914 (delete-region (point) (1- (point)))
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3915 (fixup-whitespace)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3916 ;; fixup-whitespace sometimes does not leave space
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3917 ;; between objects, so we insert it as in Vi
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3918 (or (looking-at " ")
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3919 (insert " ")
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
3920 (backward-char 1))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
3921 )))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3922
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3923
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3924 ;; Replace state
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3925
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3926 (defun viper-change (beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3927 (if (markerp beg) (setq beg (marker-position beg)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3928 (if (markerp end) (setq end (marker-position end)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3929 ;; beg is sometimes (mark t), which may be nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3930 (or beg (setq beg end))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3931
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3932 (viper-set-complex-command-for-undo)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3933 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3934 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3935 (copy-to-register viper-use-register beg end nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3936 (setq viper-use-register nil)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3937 (viper-set-replace-overlay beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3938 (setq last-command nil) ; separate repl text from prev kills
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3939
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3940 (if (= (viper-replace-start) (point-max))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3941 (error "End of buffer"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3942
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3943 (setq viper-last-replace-region
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3944 (buffer-substring (viper-replace-start)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3945 (viper-replace-end)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3946
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3947 ;; protect against error while inserting "@" and other disasters
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3948 ;; (e.g., read-only buff)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3949 (condition-case conds
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3950 (if (or viper-allow-multiline-replace-regions
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3951 (viper-same-line (viper-replace-start)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3952 (viper-replace-end)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3953 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3954 ;; tabs cause problems in replace, so untabify
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3955 (goto-char (viper-replace-end))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3956 (insert-before-markers "@") ; put placeholder after the TAB
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3957 (untabify (viper-replace-start) (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3958 ;; del @, don't put on kill ring
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3959 (delete-backward-char 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3960
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3961 (viper-set-replace-overlay-glyphs
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3962 viper-replace-region-start-delimiter
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3963 viper-replace-region-end-delimiter)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3964 ;; this move takes care of the last posn in the overlay, which
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3965 ;; has to be shifted because of insert. We can't simply insert
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3966 ;; "$" before-markers because then overlay-start will shift the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3967 ;; beginning of the overlay in case we are replacing a single
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3968 ;; character. This fixes the bug with `s' and `cl' commands.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3969 (viper-move-replace-overlay (viper-replace-start) (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3970 (goto-char (viper-replace-start))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3971 (viper-change-state-to-replace t))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3972 (kill-region (viper-replace-start)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3973 (viper-replace-end))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3974 (viper-hide-replace-overlay)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3975 (viper-change-state-to-insert))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3976 (error ;; make sure that the overlay doesn't stay.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3977 ;; go back to the original point
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3978 (goto-char (viper-replace-start))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3979 (viper-hide-replace-overlay)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3980 (viper-message-conditions conds))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3981
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3982
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3983 (defun viper-change-subr (beg end)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3984 ;; beg is sometimes (mark t), which may be nil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3985 (or beg (setq beg end))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3986 (if viper-use-register
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3987 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3988 (copy-to-register viper-use-register beg end nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3989 (setq viper-use-register nil)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3990 (kill-region beg end)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3991 (setq this-command 'viper-change)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3992 (viper-yank-last-insertion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3993
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3994 (defun viper-toggle-case (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3995 "Toggle character case."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
3996 (interactive "P")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3997 (let ((val (viper-p-val arg)) (c))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3998 (viper-set-destructive-command
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
3999 (list 'viper-toggle-case val nil nil nil nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4000 (while (> val 0)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4001 (setq c (following-char))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4002 (delete-char 1 nil)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4003 (if (eq c (upcase c))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4004 (insert-char (downcase c) 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4005 (insert-char (upcase c) 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4006 (if (eolp) (backward-char 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4007 (setq val (1- val)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4008
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4009
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4010 ;; query replace
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4011
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4012 (defun viper-query-replace ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4013 "Query replace.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4014 If a null string is suplied as the string to be replaced,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4015 the query replace mode will toggle between string replace
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4016 and regexp replace."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4017 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4018 (let (str)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4019 (setq str (viper-read-string-with-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4020 (if viper-re-query-replace "Query replace regexp: "
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4021 "Query replace: ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4022 nil ; no initial
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4023 'viper-replace1-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4024 (car viper-replace1-history) ; default
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4025 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4026 (if (string= str "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4027 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4028 (setq viper-re-query-replace (not viper-re-query-replace))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4029 (message "Query replace mode changed to %s"
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4030 (if viper-re-query-replace "regexp replace"
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4031 "string replace")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4032 (if viper-re-query-replace
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4033 (query-replace-regexp
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4034 str
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4035 (viper-read-string-with-history
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4036 (format "Query replace regexp `%s' with: " str)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4037 nil ; no initial
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4038 'viper-replace1-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4039 (car viper-replace1-history) ; default
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4040 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4041 (query-replace
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4042 str
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4043 (viper-read-string-with-history
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4044 (format "Query replace `%s' with: " str)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4045 nil ; no initial
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4046 'viper-replace1-history
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4047 (car viper-replace1-history) ; default
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4048 ))))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4049
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4050
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4051 ;; marking
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4052
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4053 (defun viper-mark-beginning-of-buffer ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4054 "Mark beginning of buffer."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4055 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4056 (push-mark (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4057 (goto-char (point-min))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4058 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4059 (message "Mark set at the beginning of buffer"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4060
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4061 (defun viper-mark-end-of-buffer ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4062 "Mark end of buffer."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4063 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4064 (push-mark (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4065 (goto-char (point-max))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4066 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4067 (message "Mark set at the end of buffer"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4068
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4069 (defun viper-mark-point ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4070 "Set mark at point of buffer."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4071 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4072 (let ((char (read-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4073 (cond ((and (<= ?a char) (<= char ?z))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4074 (point-to-register (1+ (- char ?a))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4075 ((= char ?<) (viper-mark-beginning-of-buffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4076 ((= char ?>) (viper-mark-end-of-buffer))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4077 ((= char ?.) (viper-set-mark-if-necessary))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4078 ((= char ?,) (viper-cycle-through-mark-ring))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4079 ((= char ?D) (mark-defun))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4080 (t (error ""))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4081 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4082
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4083 ;; Algorithm: If first invocation of this command save mark on ring, goto
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4084 ;; mark, M0, and pop the most recent elt from the mark ring into mark,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4085 ;; making it into the new mark, M1.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4086 ;; Push this mark back and set mark to the original point position, p1.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4087 ;; So, if you hit '' or `` then you can return to p1.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4088 ;;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4089 ;; If repeated command, pop top elt from the ring into mark and
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4090 ;; jump there. This forgets the position, p1, and puts M1 back into mark.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4091 ;; Then we save the current pos, which is M0, jump to M1 and pop M2 from
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4092 ;; the ring into mark. Push M2 back on the ring and set mark to M0.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4093 ;; etc.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4094 (defun viper-cycle-through-mark-ring ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4095 "Visit previous locations on the mark ring.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4096 One can use `` and '' to temporarily jump 1 step back."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4097 (let* ((sv-pt (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4098 ;; if repeated `m,' command, pop the previously saved mark.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4099 ;; Prev saved mark is actually prev saved point. It is used if the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4100 ;; user types `` or '' and is discarded
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4101 ;; from the mark ring by the next `m,' command.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4102 ;; In any case, go to the previous or previously saved mark.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4103 ;; Then push the current mark (popped off the ring) and set current
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4104 ;; point to be the mark. Current pt as mark is discarded by the next
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4105 ;; m, command.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4106 (if (eq last-command 'viper-cycle-through-mark-ring)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4107 ()
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4108 ;; save current mark if the first iteration
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4109 (setq mark-ring (delete (viper-mark-marker) mark-ring))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4110 (if (mark t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4111 (push-mark (mark t) t)) )
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4112 (pop-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4113 (set-mark-command 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4114 ;; don't duplicate mark on the ring
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4115 (setq mark-ring (delete (viper-mark-marker) mark-ring))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4116 (push-mark sv-pt t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4117 (viper-deactivate-mark)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4118 (setq this-command 'viper-cycle-through-mark-ring)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4119 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4120
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4121
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4122 (defun viper-goto-mark (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4123 "Go to mark."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4124 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4125 (let ((char (read-char))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4126 (com (viper-getcom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4127 (viper-goto-mark-subr char com nil)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4128
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4129 (defun viper-goto-mark-and-skip-white (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4130 "Go to mark and skip to first non-white character on line."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4131 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4132 (let ((char (read-char))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4133 (com (viper-getCom arg)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4134 (viper-goto-mark-subr char com t)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4135
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4136 (defun viper-goto-mark-subr (char com skip-white)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4137 (if (eobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4138 (if (bobp)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4139 (error "Empty buffer")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4140 (backward-char 1)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4141 (cond ((viper-valid-register char '(letter))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4142 (let* ((buff (current-buffer))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4143 (reg (1+ (- char ?a)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4144 (text-marker (get-register reg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4145 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4146 (if (not (viper-valid-marker text-marker))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4147 (error viper-EmptyTextmarker char))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4148 (if (and (viper-same-line (point) viper-last-jump)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4149 (= (point) viper-last-jump-ignore))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4150 (push-mark viper-last-jump t)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4151 (push-mark nil t)) ; no msg
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4152 (viper-register-to-point reg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4153 (setq viper-last-jump (point-marker))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4154 (cond (skip-white
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4155 (back-to-indentation)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4156 (setq viper-last-jump-ignore (point))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4157 (if com
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4158 (if (equal buff (current-buffer))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4159 (viper-execute-com (if skip-white
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4160 'viper-goto-mark-and-skip-white
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4161 'viper-goto-mark)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4162 nil com)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4163 (switch-to-buffer buff)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4164 (goto-char viper-com-point)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4165 (viper-change-state-to-vi)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4166 (error "")))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4167 ((and (not skip-white) (= char ?`))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4168 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4169 (if (and (viper-same-line (point) viper-last-jump)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4170 (= (point) viper-last-jump-ignore))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4171 (goto-char viper-last-jump))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4172 (if (null (mark t)) (error "Mark is not set in this buffer"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4173 (if (= (point) (mark t)) (pop-mark))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4174 (exchange-point-and-mark)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4175 (setq viper-last-jump (point-marker)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4176 viper-last-jump-ignore 0)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4177 (if com (viper-execute-com 'viper-goto-mark nil com)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4178 ((and skip-white (= char ?'))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4179 (if com (viper-move-marker-locally 'viper-com-point (point)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4180 (if (and (viper-same-line (point) viper-last-jump)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4181 (= (point) viper-last-jump-ignore))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4182 (goto-char viper-last-jump))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4183 (if (= (point) (mark t)) (pop-mark))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4184 (exchange-point-and-mark)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4185 (setq viper-last-jump (point))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4186 (back-to-indentation)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4187 (setq viper-last-jump-ignore (point))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4188 (if com (viper-execute-com 'viper-goto-mark-and-skip-white nil com)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4189 (t (error viper-InvalidTextmarker char))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4190
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4191 (defun viper-insert-tab ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4192 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4193 (insert-tab))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4194
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4195 (defun viper-exchange-point-and-mark ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4196 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4197 (exchange-point-and-mark)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4198 (back-to-indentation))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4199
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4200 ;; Input Mode Indentation
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4201
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4202 ;; Returns t, if the string before point matches the regexp STR.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4203 (defsubst viper-looking-back (str)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4204 (and (save-excursion (re-search-backward str nil t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4205 (= (point) (match-end 0))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4206
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4207
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4208 (defun viper-forward-indent ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4209 "Indent forward -- `C-t' in Vi."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4210 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4211 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4212 (indent-to (+ (current-column) viper-shift-width)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4213
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4214 (defun viper-backward-indent ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4215 "Backtab, C-d in VI"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4216 (interactive)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4217 (if viper-cted
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4218 (let ((p (point)) (c (current-column)) bol (indent t))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4219 (if (viper-looking-back "[0^]")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4220 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4221 (if (eq ?^ (preceding-char))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4222 (setq viper-preserve-indent t))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4223 (delete-backward-char 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4224 (setq p (point))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4225 (setq indent nil)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4226 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4227 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4228 (setq bol (point)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4229 (if (re-search-backward "[^ \t]" bol 1) (forward-char))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4230 (delete-region (point) p)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4231 (if indent
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4232 (indent-to (- c viper-shift-width)))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4233 (if (or (bolp) (viper-looking-back "[^ \t]"))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4234 (setq viper-cted nil)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4235
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4236 (defun viper-autoindent ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4237 "Auto Indentation, Vi-style."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4238 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4239 (let ((col (current-indentation)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4240 (if abbrev-mode (expand-abbrev))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4241 (if viper-preserve-indent
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4242 (setq viper-preserve-indent nil)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4243 (setq viper-current-indent col))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4244 ;; don't leave whitespace lines around
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4245 (if (memq last-command
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4246 '(viper-autoindent
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4247 viper-open-line viper-Open-line
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4248 viper-replace-state-exit-cmd))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4249 (indent-to-left-margin))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4250 ;; use \n instead of newline, or else <Return> will move the insert point
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4251 ;;(newline 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4252 (insert "\n")
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4253 (if viper-auto-indent
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4254 (progn
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4255 (setq viper-cted t)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4256 (if (and viper-electric-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4257 (not
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4258 (memq major-mode '(fundamental-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4259 text-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4260 paragraph-indent-text-mode ))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4261 (indent-according-to-mode)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4262 (indent-to viper-current-indent))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4263 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4264 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4265
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4266
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4267 ;; Viewing registers
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4268
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4269 (defun viper-ket-function (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4270 "Function called by \], the ket. View registers and call \]\]."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4271 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4272 (let ((reg (read-char)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4273 (cond ((viper-valid-register reg '(letter Letter))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4274 (view-register (downcase reg)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4275 ((viper-valid-register reg '(digit))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4276 (let ((text (current-kill (- reg ?1) 'do-not-rotate)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4277 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4278 (set-buffer (get-buffer-create "*Output*"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4279 (delete-region (point-min) (point-max))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4280 (insert (format "Register %c contains the string:\n" reg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4281 (insert text)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4282 (goto-char (point-min)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4283 (display-buffer "*Output*")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4284 ((= ?\] reg)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4285 (viper-next-heading arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4286 (t (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4287 viper-InvalidRegister reg)))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4288
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4289 (defun viper-brac-function (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4290 "Function called by \[, the brac. View textmarkers and call \[\["
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4291 (interactive "P")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4292 (let ((reg (read-char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4293 (cond ((= ?\[ reg)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4294 (viper-prev-heading arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4295 ((= ?\] reg)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4296 (viper-heading-end arg))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4297 ((viper-valid-register reg '(letter))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4298 (let* ((val (get-register (1+ (- reg ?a))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4299 (buf (if (not val)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4300 (error viper-EmptyTextmarker reg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4301 (marker-buffer val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4302 (pos (marker-position val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4303 line-no text (s pos) (e pos))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4304 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4305 (set-buffer (get-buffer-create "*Output*"))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4306 (delete-region (point-min) (point-max))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4307 (if (and buf pos)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4308 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4309 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4310 (set-buffer buf)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4311 (setq line-no (1+ (count-lines (point-min) val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4312 (goto-char pos)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4313 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4314 (if (re-search-backward "[^ \t]" nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4315 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4316 (beginning-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4317 (setq s (point))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4318 (goto-char pos)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4319 (forward-line 1)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4320 (if (re-search-forward "[^ \t]" nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4321 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4322 (end-of-line)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4323 (setq e (point))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4324 (setq text (buffer-substring s e))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4325 (setq text (format "%s<%c>%s"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4326 (substring text 0 (- pos s))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4327 reg (substring text (- pos s)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4328 (insert
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4329 (format
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4330 "Textmarker `%c' is in buffer `%s' at line %d.\n"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4331 reg (buffer-name buf) line-no))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4332 (insert (format "Here is some text around %c:\n\n %s"
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4333 reg text)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4334 (insert (format viper-EmptyTextmarker reg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4335 (goto-char (point-min)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4336 (display-buffer "*Output*")))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4337 (t (error viper-InvalidTextmarker reg)))))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4338
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4339
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4340
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4341 ;; commands in insertion mode
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4342
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4343 (defun viper-delete-backward-word (arg)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4344 "Delete previous word."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4345 (interactive "p")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4346 (save-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4347 (push-mark nil t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4348 (backward-word arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4349 (delete-region (point) (mark t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4350 (pop-mark)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4351
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4352
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4353 (defun viper-set-expert-level (&optional dont-change-unless)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4354 "Sets the expert level for a Viper user.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4355 Can be called interactively to change (temporarily or permanently) the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4356 current expert level.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4357
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4358 The optional argument DONT-CHANGE-UNLESS, if not nil, says that
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4359 the level should not be changed, unless its current value is
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4360 meaningless (i.e., not one of 1,2,3,4,5).
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4361
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4362 User level determines the setting of Viper variables that are most
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4363 sensitive for VI-style look-and-feel."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4364
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4365 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4366
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4367 (if (not (natnump viper-expert-level)) (setq viper-expert-level 0))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4368
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4369 (save-window-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4370 (delete-other-windows)
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4371 ;; if 0 < viper-expert-level < viper-max-expert-level
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4372 ;; & dont-change-unless = t -- use it; else ask
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4373 (viper-ask-level dont-change-unless))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4374
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4375 (setq viper-always t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4376 viper-ex-style-motion t
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4377 viper-ex-style-editing t
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4378 viper-want-ctl-h-help nil)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4379
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4380 (cond ((eq viper-expert-level 1) ; novice or beginner
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4381 (global-set-key ; in emacs-state
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4382 viper-toggle-key
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4383 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4384 (setq viper-no-multiple-ESC t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4385 viper-re-search t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4386 viper-vi-style-in-minibuffer t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4387 viper-search-wrap-around-t t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4388 viper-electric-mode nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4389 viper-want-emacs-keys-in-vi nil
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4390 viper-want-emacs-keys-in-insert nil))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4391
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4392 ((and (> viper-expert-level 1) (< viper-expert-level 5))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4393 ;; intermediate to guru
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4394 (setq viper-no-multiple-ESC (if (viper-window-display-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4395 t 'twice)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4396 viper-electric-mode t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4397 viper-want-emacs-keys-in-vi t
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4398 viper-want-emacs-keys-in-insert (> viper-expert-level 2))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4399
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4400 (if (eq viper-expert-level 4) ; respect user's ex-style motion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4401 ; and viper-no-multiple-ESC
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4402 (progn
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4403 (setq-default
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4404 viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4405 (viper-standard-value 'viper-ex-style-editing)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4406 viper-ex-style-motion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4407 (viper-standard-value 'viper-ex-style-motion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4408 (setq viper-ex-style-motion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4409 (viper-standard-value 'viper-ex-style-motion)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4410 viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4411 (viper-standard-value 'viper-ex-style-editing)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4412 viper-re-search
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4413 (viper-standard-value 'viper-re-search)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4414 viper-no-multiple-ESC
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4415 (viper-standard-value 'viper-no-multiple-ESC)))))
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4416
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4417 ;; A wizard!!
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4418 ;; Ideally, if 5 is selected, a buffer should pop up to let the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4419 ;; user toggle the values of variables.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4420 (t (setq-default viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4421 (viper-standard-value 'viper-ex-style-editing)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4422 viper-ex-style-motion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4423 (viper-standard-value 'viper-ex-style-motion))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4424 (setq viper-want-ctl-h-help
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4425 (viper-standard-value 'viper-want-ctl-h-help)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4426 viper-always
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4427 (viper-standard-value 'viper-always)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4428 viper-no-multiple-ESC
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4429 (viper-standard-value 'viper-no-multiple-ESC)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4430 viper-ex-style-motion
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4431 (viper-standard-value 'viper-ex-style-motion)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4432 viper-ex-style-editing
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4433 (viper-standard-value 'viper-ex-style-editing)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4434 viper-re-search
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4435 (viper-standard-value 'viper-re-search)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4436 viper-electric-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4437 (viper-standard-value 'viper-electric-mode)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4438 viper-want-emacs-keys-in-vi
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4439 (viper-standard-value 'viper-want-emacs-keys-in-vi)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4440 viper-want-emacs-keys-in-insert
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4441 (viper-standard-value 'viper-want-emacs-keys-in-insert))))
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4442
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4443 (viper-set-mode-vars-for viper-current-state)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4444 (if (or viper-always
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4445 (and (> viper-expert-level 0) (> 5 viper-expert-level)))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4446 (viper-set-hooks)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4447
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4448 ;; Ask user expert level.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4449 (defun viper-ask-level (dont-change-unless)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4450 (let ((ask-buffer " *viper-ask-level*")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4451 level-changed repeated)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4452 (save-window-excursion
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4453 (switch-to-buffer ask-buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4454
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4455 (while (or (> viper-expert-level viper-max-expert-level)
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4456 (< viper-expert-level 1)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4457 (null dont-change-unless))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4458 (erase-buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4459 (if repeated
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4460 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4461 (message "Invalid user level")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4462 (beep 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4463 (setq repeated t))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4464 (setq dont-change-unless t
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4465 level-changed t)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4466 (insert "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4467 Please specify your level of familiarity with the venomous VI PERil
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4468 (and the VI Plan for Emacs Rescue).
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4469 You can change it at any time by typing `M-x viper-set-expert-level RET'
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4470
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4471 1 -- BEGINNER: Almost all Emacs features are suppressed.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4472 Feels almost like straight Vi. File name completion and
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4473 command history in the minibuffer are thrown in as a bonus.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4474 To use Emacs productively, you must reach level 3 or higher.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4475 2 -- MASTER: C-c now has its standard Emacs meaning in Vi command state,
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4476 so most Emacs commands can be used when Viper is in Vi state.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4477 Good progress---you are well on the way to level 3!
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4478 3 -- GRAND MASTER: Like 3, but most Emacs commands are available also
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4479 in Viper's insert state.
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4480 4 -- GURU: Like 3, but user settings are respected for viper-no-multiple-ESC,
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4481 viper-ex-style-motion, viper-ex-style-editing, and
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4482 viper-re-search variables. Adjust these settings to your taste.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4483 5 -- WIZARD: Like 4, but user settings are also respected for viper-always,
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4484 viper-electric-mode, viper-want-ctl-h-help, viper-want-emacs-keys-in-vi,
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4485 and viper-want-emacs-keys-in-insert. Adjust these to your taste.
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4486
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4487 Please, specify your level now: ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4488
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4489 (setq viper-expert-level (- (viper-read-char-exclusive) ?0))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4490 ) ; end while
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4491
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4492 ;; tell the user if level was changed
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4493 (and level-changed
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4494 (progn
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4495 (insert
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4496 (format "\n\n\n\n\n\t\tYou have selected user level %d"
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4497 viper-expert-level))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4498 (if (y-or-n-p "Do you wish to make this change permanent? ")
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4499 ;; save the setting for viper-expert-level
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4500 (viper-save-setting
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4501 'viper-expert-level
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4502 (format "Saving user level %d ..." viper-expert-level)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4503 viper-custom-file-name))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4504 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4505 (bury-buffer) ; remove ask-buffer from screen
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4506 (message "")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4507 )))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4508
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4509
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4510 (defun viper-nil ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4511 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4512 (beep 1))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4513
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4514
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4515 ;; if ENFORCE-BUFFER is not nil, error if CHAR is a marker in another buffer
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4516 (defun viper-register-to-point (char &optional enforce-buffer)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4517 "Like jump-to-register, but switches to another buffer in another window."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4518 (interactive "cViper register to point: ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4519 (let ((val (get-register char)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4520 (cond
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4521 ((and (fboundp 'frame-configuration-p)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4522 (frame-configuration-p val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4523 (set-frame-configuration val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4524 ((window-configuration-p val)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4525 (set-window-configuration val))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4526 ((viper-valid-marker val)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4527 (if (and enforce-buffer
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4528 (not (equal (current-buffer) (marker-buffer val))))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4529 (error (concat viper-EmptyTextmarker " in this buffer")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4530 (1- (+ char ?a))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4531 (pop-to-buffer (marker-buffer val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4532 (goto-char val))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4533 ((and (consp val) (eq (car val) 'file))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4534 (find-file (cdr val)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4535 (t
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4536 (error viper-EmptyTextmarker (1- (+ char ?a)))))))
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4537
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4538
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4539 (defun viper-save-kill-buffer ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4540 "Save then kill current buffer. "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4541 (interactive)
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4542 (if (< viper-expert-level 2)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4543 (save-buffers-kill-emacs)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4544 (save-buffer)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4545 (kill-buffer (current-buffer))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4546
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4547
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4548
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4549 ;;; Bug Report
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4550
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4551 (defun viper-submit-report ()
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4552 "Submit bug report on Viper."
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4553 (interactive)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4554 (let ((reporter-prompt-for-summary-p t)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4555 (viper-device-type (viper-device-type))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4556 color-display-p frame-parameters
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4557 minibuffer-emacs-face minibuffer-vi-face minibuffer-insert-face
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4558 varlist salutation window-config)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4559
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4560 ;; If mode info is needed, add variable to `let' and then set it below,
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4561 ;; like we did with color-display-p.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4562 (setq color-display-p (if (viper-window-display-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4563 (viper-color-display-p)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4564 'non-x)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4565 minibuffer-vi-face (if (viper-has-face-support-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4566 (viper-get-face viper-minibuffer-vi-face)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4567 'non-x)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4568 minibuffer-insert-face (if (viper-has-face-support-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4569 (viper-get-face
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4570 viper-minibuffer-insert-face)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4571 'non-x)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4572 minibuffer-emacs-face (if (viper-has-face-support-p)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4573 (viper-get-face
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4574 viper-minibuffer-emacs-face)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4575 'non-x)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4576 frame-parameters (if (fboundp 'frame-parameters)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4577 (frame-parameters (selected-frame))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4578
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4579 (setq varlist (list 'viper-vi-minibuffer-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4580 'viper-insert-minibuffer-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4581 'viper-vi-intercept-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4582 'viper-vi-local-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4583 'viper-vi-kbd-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4584 'viper-vi-global-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4585 'viper-vi-state-modifier-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4586 'viper-vi-diehard-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4587 'viper-vi-basic-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4588 'viper-replace-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4589 'viper-insert-intercept-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4590 'viper-insert-local-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4591 'viper-insert-kbd-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4592 'viper-insert-global-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4593 'viper-insert-state-modifier-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4594 'viper-insert-diehard-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4595 'viper-insert-basic-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4596 'viper-emacs-intercept-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4597 'viper-emacs-local-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4598 'viper-emacs-kbd-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4599 'viper-emacs-global-user-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4600 'viper-emacs-state-modifier-minor-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4601 'viper-automatic-iso-accents
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4602 'viper-special-input-method
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4603 'viper-want-emacs-keys-in-insert
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4604 'viper-want-emacs-keys-in-vi
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4605 'viper-keep-point-on-undo
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4606 'viper-no-multiple-ESC
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4607 'viper-electric-mode
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4608 'viper-ESC-key
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4609 'viper-want-ctl-h-help
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 181
diff changeset
4610 'viper-ex-style-editing
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4611 'viper-delete-backwards-in-replace
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4612 'viper-vi-style-in-minibuffer
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4613 'viper-vi-state-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4614 'viper-insert-state-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4615 'viper-replace-state-hook
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4616 'viper-emacs-state-hook
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4617 'ex-cycle-other-window
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4618 'ex-cycle-through-non-files
175
2d532a89d707 Import from CVS: tag r20-3b14
cvs
parents: 163
diff changeset
4619 'viper-expert-level
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4620 'major-mode
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4621 'viper-device-type
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4622 'color-display-p
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4623 'frame-parameters
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4624 'minibuffer-vi-face
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4625 'minibuffer-insert-face
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4626 'minibuffer-emacs-face
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4627 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4628 (setq salutation "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4629 Congratulations! You may have unearthed a bug in Viper!
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4630 Please mail a concise, accurate summary of the problem to the address above.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4631
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4632 -------------------------------------------------------------------")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4633 (setq window-config (current-window-configuration))
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4634 (with-output-to-temp-buffer " *viper-info*"
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4635 (switch-to-buffer " *viper-info*")
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4636 (delete-other-windows)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4637 (princ "
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4638 PLEASE FOLLOW THESE PROCEDURES
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4639 ------------------------------
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4640
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4641 Before reporting a bug, please verify that it is related to Viper, and is
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4642 not cause by other packages you are using.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4643
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4644 Don't report compilation warnings, unless you are certain that there is a
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4645 problem. These warnings are normal and unavoidable.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4646
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4647 Please note that users should not modify variables and keymaps other than
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4648 those advertised in the manual. Such `customization' is likely to crash
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4649 Viper, as it would any other improperly customized Emacs package.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4650
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4651 If you are reporting an error message received while executing one of the
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4652 Viper commands, type:
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4653
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4654 M-x set-variable <Return> debug-on-error <Return> t <Return>
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4655
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4656 Then reproduce the error. The above command will cause Emacs to produce a
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4657 back trace of the execution that leads to the error. Please include this
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4658 trace in your bug report.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4659
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4660 If you believe that one of Viper's commands goes into an infinite loop
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4661 \(e.g., Emacs freezes\), type:
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4662
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4663 M-x set-variable <Return> debug-on-quit <Return> t <Return>
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4664
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4665 Then reproduce the problem. Wait for a few seconds, then type C-g to abort
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4666 the current command. Include the resulting back trace in the bug report.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4667
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4668 Mail anyway (y or n)? ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4669 (if (y-or-n-p "Mail anyway? ")
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4670 ()
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4671 (set-window-configuration window-config)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4672 (error "Bug report aborted")))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4673
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4674 (require 'reporter)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4675 (set-window-configuration window-config)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4676
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4677 (reporter-submit-bug-report "kifer@cs.sunysb.edu"
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4678 (viper-version)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4679 varlist
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4680 nil 'delete-other-windows
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4681 salutation)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4682 ))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4683
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4684
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4685
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4686
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4687 ;; Smoothes out the difference between Emacs' unread-command-events
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4688 ;; and XEmacs unread-command-event. Arg is a character, an event, a list of
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4689 ;; events or a sequence of keys.
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4690 ;;
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4691 ;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4692 ;; symbol in unread-command-events list may cause Emacs to turn this symbol
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4693 ;; into an event. Below, we delete nil from event lists, since nil is the most
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4694 ;; common symbol that might appear in this wrong context.
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4695 (defun viper-set-unread-command-events (arg)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4696 (if viper-emacs-p
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4697 (setq
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4698 unread-command-events
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4699 (let ((new-events
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4700 (cond ((eventp arg) (list arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4701 ((listp arg) arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4702 ((sequencep arg)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4703 (listify-key-sequence arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4704 (t (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4705 "viper-set-unread-command-events: Invalid argument, %S"
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4706 arg)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4707 (if (not (eventp nil))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4708 (setq new-events (delq nil new-events)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4709 (append new-events unread-command-events)))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4710 ;; XEmacs
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4711 (setq
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4712 unread-command-events
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4713 (append
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4714 (cond ((viper-characterp arg) (list (character-to-event arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4715 ((eventp arg) (list arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4716 ((stringp arg) (mapcar 'character-to-event arg))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4717 ((vectorp arg) (append arg nil)) ; turn into list
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4718 ((listp arg) (viper-eventify-list-xemacs arg))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4719 (t (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4720 "viper-set-unread-command-events: Invalid argument, %S" arg)))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4721 unread-command-events))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4722
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4723 ;; list is assumed to be a list of events of characters
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4724 (defun viper-eventify-list-xemacs (lis)
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4725 (mapcar
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4726 (function (lambda (elt)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4727 (cond ((viper-characterp elt) (character-to-event elt))
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4728 ((eventp elt) elt)
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4729 (t (error
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 175
diff changeset
4730 "viper-eventify-list-xemacs: can't convert to event, %S"
163
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4731 elt)))))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4732 lis))
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4733
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4734
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4735
0132846995bd Import from CVS: tag r20-3b8
cvs
parents:
diff changeset
4736 ;;; viper-cmd.el ends here