Mercurial > emacs
annotate lisp/emulation/viper-util.el @ 42811:cf0c0ef57504
*** empty log message ***
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 17 Jan 2002 19:29:24 +0000 |
| parents | 633233bf2bbf |
| children | 69c91aaa067a |
| rev | line source |
|---|---|
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
1 ;;; viper-util.el --- Utilities used by viper.el |
| 14169 | 2 |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
3 ;; Copyright (C) 1994, 95, 96, 97, 99, 2000, 01, 02 Free Software Foundation, Inc. |
| 11288 | 4 |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
|
39215
8dccf2552307
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38723
diff
changeset
|
6 |
| 10789 | 7 ;; This file is part of GNU Emacs. |
| 8 | |
| 9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 10 ;; it under the terms of the GNU General Public License as published by | |
| 11 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 12 ;; any later version. | |
| 13 | |
| 14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 ;; GNU General Public License for more details. | |
| 18 | |
| 19 ;; You should have received a copy of the GNU General Public License | |
| 14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
| 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 ;; Boston, MA 02111-1307, USA. | |
| 10789 | 23 |
|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
24 ;;; Commentary: |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
25 |
|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
26 ;;; Code: |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
27 |
|
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
28 ;; Compiler pacifier |
| 19079 | 29 (defvar viper-overriding-map) |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
30 (defvar pm-color-alist) |
|
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
31 (defvar zmacs-region-stays) |
| 19079 | 32 (defvar viper-minibuffer-current-face) |
| 33 (defvar viper-minibuffer-insert-face) | |
| 34 (defvar viper-minibuffer-vi-face) | |
| 35 (defvar viper-minibuffer-emacs-face) | |
| 36 (defvar viper-replace-overlay-face) | |
| 37 (defvar viper-fast-keyseq-timeout) | |
| 18047 | 38 (defvar ex-unix-type-shell) |
| 39 (defvar ex-unix-type-shell-options) | |
| 19079 | 40 (defvar viper-ex-tmp-buf-name) |
| 19462 | 41 (defvar viper-syntax-preference) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
42 (defvar viper-saved-mark) |
| 18047 | 43 |
| 44 (require 'cl) | |
| 45 (require 'ring) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
46 |
| 18172 | 47 (if noninteractive |
| 48 (eval-when-compile | |
| 49 (let ((load-path (cons (expand-file-name ".") load-path))) | |
| 50 (or (featurep 'viper-init) | |
| 51 (load "viper-init.el" nil nil 'nosuffix)) | |
| 52 ))) | |
| 18047 | 53 ;; end pacifier |
| 10789 | 54 |
| 18047 | 55 (require 'viper-init) |
|
15747
a0933adcee9e
(vip-ms-style-os-p, vip-vms-os-p): Moved here from viper.el.
Karl Heuer <kwzh@gnu.org>
parents:
15728
diff
changeset
|
56 |
|
14581
4951b11970a1
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14384
diff
changeset
|
57 |
| 19203 | 58 ;; A fix for NeXT Step |
| 59 ;; Should go away, when NS people fix the design flaw, which leaves the | |
| 60 ;; two x-* functions undefined. | |
| 61 (if (and (not (fboundp 'x-display-color-p)) (fboundp 'ns-display-color-p)) | |
| 62 (fset 'x-display-color-p (symbol-function 'ns-display-color-p))) | |
| 63 (if (and (not (fboundp 'x-color-defined-p)) (fboundp 'ns-color-defined-p)) | |
| 64 (fset 'x-color-defined-p (symbol-function 'ns-color-defined-p))) | |
| 65 | |
| 10789 | 66 |
| 18047 | 67 ;;; XEmacs support |
| 10789 | 68 |
| 69 | |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
70 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
71 (progn ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
72 (fset 'viper-overlay-p (symbol-function 'extentp)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
73 (fset 'viper-make-overlay (symbol-function 'make-extent)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
74 (fset 'viper-overlay-live-p (symbol-function 'extent-live-p)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
75 (fset 'viper-move-overlay (symbol-function 'set-extent-endpoints)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
76 (fset 'viper-overlay-start (symbol-function 'extent-start-position)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
77 (fset 'viper-overlay-end (symbol-function 'extent-end-position)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
78 (fset 'viper-overlay-get (symbol-function 'extent-property)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
79 (fset 'viper-overlay-put (symbol-function 'set-extent-property)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
80 (fset 'viper-read-event (symbol-function 'next-command-event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
81 (fset 'viper-characterp (symbol-function 'characterp)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
82 (fset 'viper-int-to-char (symbol-function 'int-to-char)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
83 (if (viper-window-display-p) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
84 (fset 'viper-iconify (symbol-function 'iconify-frame))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
85 (cond ((viper-has-face-support-p) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
86 (fset 'viper-get-face (symbol-function 'get-face)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
87 (fset 'viper-color-defined-p (symbol-function 'valid-color-name-p)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
88 ))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
89 (progn ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
90 (fset 'viper-overlay-p (symbol-function 'overlayp)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
91 (fset 'viper-make-overlay (symbol-function 'make-overlay)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
92 (fset 'viper-overlay-live-p (symbol-function 'overlayp)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
93 (fset 'viper-move-overlay (symbol-function 'move-overlay)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
94 (fset 'viper-overlay-start (symbol-function 'overlay-start)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
95 (fset 'viper-overlay-end (symbol-function 'overlay-end)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
96 (fset 'viper-overlay-get (symbol-function 'overlay-get)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
97 (fset 'viper-overlay-put (symbol-function 'overlay-put)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
98 (fset 'viper-read-event (symbol-function 'read-event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
99 (fset 'viper-characterp (symbol-function 'integerp)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
100 (fset 'viper-int-to-char (symbol-function 'identity)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
101 (if (viper-window-display-p) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
102 (fset 'viper-iconify (symbol-function 'iconify-or-deiconify-frame))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
103 (cond ((viper-has-face-support-p) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
104 (fset 'viper-get-face (symbol-function 'internal-get-face)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
105 (fset 'viper-color-defined-p (symbol-function 'x-color-defined-p)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
106 ))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
107 ) |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
108 |
| 18047 | 109 |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
110 |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33742
diff
changeset
|
111 ;; CHAR is supposed to be a char or an integer (positive or negative) |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33742
diff
changeset
|
112 ;; LIST is a list of chars, nil, and negative numbers |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
113 ;; Check if CHAR is a member by trying to convert in characters, if necessary. |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33742
diff
changeset
|
114 ;; Introduced for compatibility with XEmacs, where integers are not the same as |
|
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33742
diff
changeset
|
115 ;; chars. |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
116 (defun viper-memq-char (char list) |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
117 (cond ((and (integerp char) (>= char 0)) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
118 (memq (viper-int-to-char char) list)) |
|
33842
f6a67d77484a
* ediff-diff.el: Moved variables around to have it compile under NT.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33742
diff
changeset
|
119 ((memq char list)))) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
120 |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
121 ;; Check if char-or-int and char are the same as characters |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
122 (defun viper-char-equal (char-or-int char) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
123 (cond ((and (integerp char-or-int) (>= char-or-int 0)) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
124 (= (viper-int-to-char char-or-int) char)) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
125 ((eq char-or-int char)))) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
126 |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
127 ;; Like =, but accommodates null and also is t for eq-objects |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
128 (defun viper= (char char1) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
129 (cond ((eq char char1) t) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
130 ((and (viper-characterp char) (viper-characterp char1)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
131 (= char char1)) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
132 (t nil))) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
133 |
| 19079 | 134 (defsubst viper-color-display-p () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
135 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
136 (eq (device-class (selected-device)) 'color) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
137 (x-display-color-p) ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
138 )) |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
139 |
| 19079 | 140 (defsubst viper-get-cursor-color () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
141 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
142 ;; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
143 (color-instance-name (frame-property (selected-frame) 'cursor-color)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
144 (cdr (assoc 'cursor-color (frame-parameters))) ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
145 )) |
|
15578
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
146 |
|
16136
de1340e6ddb4
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15747
diff
changeset
|
147 |
| 10789 | 148 ;; OS/2 |
| 19079 | 149 (cond ((eq (viper-device-type) 'pm) |
| 150 (fset 'viper-color-defined-p | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
151 (lambda (color) (assoc color pm-color-alist))))) |
| 10789 | 152 |
|
14233
396316e5fbe6
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
153 |
|
396316e5fbe6
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
154 ;; cursor colors |
| 19079 | 155 (defun viper-change-cursor-color (new-color) |
| 156 (if (and (viper-window-display-p) (viper-color-display-p) | |
| 157 (stringp new-color) (viper-color-defined-p new-color) | |
| 158 (not (string= new-color (viper-get-cursor-color)))) | |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
159 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
160 (set-frame-property |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
161 (selected-frame) 'cursor-color (make-color-instance new-color)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
162 (modify-frame-parameters |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
163 (selected-frame) (list (cons 'cursor-color new-color))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
164 ) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
165 )) |
| 10789 | 166 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
167 ;; By default, saves current frame cursor color in the |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
168 ;; viper-saved-cursor-color-in-replace-mode property of viper-replace-overlay |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
169 (defun viper-save-cursor-color (before-which-mode) |
| 19079 | 170 (if (and (viper-window-display-p) (viper-color-display-p)) |
| 171 (let ((color (viper-get-cursor-color))) | |
| 172 (if (and (stringp color) (viper-color-defined-p color) | |
| 173 (not (string= color viper-replace-overlay-cursor-color))) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
174 (modify-frame-parameters |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
175 (selected-frame) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
176 (list |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
177 (cons |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
178 (if (eq before-which-mode 'before-replace-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
179 'viper-saved-cursor-color-in-replace-mode |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
180 'viper-saved-cursor-color-in-insert-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
181 color))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
182 )))) |
| 10789 | 183 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
184 |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
185 (defsubst viper-get-saved-cursor-color-in-replace-mode () |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
186 (or |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
187 (funcall |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
188 (if viper-emacs-p 'frame-parameter 'frame-property) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
189 (selected-frame) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
190 'viper-saved-cursor-color-in-replace-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
191 viper-vi-state-cursor-color)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
192 |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
193 (defsubst viper-get-saved-cursor-color-in-insert-mode () |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
194 (or |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
195 (funcall |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
196 (if viper-emacs-p 'frame-parameter 'frame-property) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
197 (selected-frame) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
198 'viper-saved-cursor-color-in-insert-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
199 viper-vi-state-cursor-color)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
200 |
|
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16329
diff
changeset
|
201 ;; restore cursor color from replace overlay |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
202 (defun viper-restore-cursor-color(after-which-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
203 (if (viper-overlay-p viper-replace-overlay) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
204 (viper-change-cursor-color |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
205 (if (eq after-which-mode 'after-replace-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
206 (viper-get-saved-cursor-color-in-replace-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
207 (viper-get-saved-cursor-color-in-insert-mode)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
208 ))) |
| 18047 | 209 |
| 210 | |
| 10789 | 211 ;; Check the current version against the major and minor version numbers |
| 212 ;; using op: cur-vers op major.minor If emacs-major-version or | |
| 213 ;; emacs-minor-version are not defined, we assume that the current version | |
| 214 ;; is hopelessly outdated. We assume that emacs-major-version and | |
| 215 ;; emacs-minor-version are defined. Otherwise, for Emacs/XEmacs 19, if the | |
| 216 ;; current minor version is < 10 (xemacs) or < 23 (emacs) the return value | |
| 217 ;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
218 ;; incorrect. However, this gives correct result in our cases, since we are |
| 10789 | 219 ;; testing for sufficiently high Emacs versions. |
| 19079 | 220 (defun viper-check-version (op major minor &optional type-of-emacs) |
| 10789 | 221 (if (and (boundp 'emacs-major-version) (boundp 'emacs-minor-version)) |
| 19079 | 222 (and (cond ((eq type-of-emacs 'xemacs) viper-xemacs-p) |
| 223 ((eq type-of-emacs 'emacs) viper-emacs-p) | |
| 10789 | 224 (t t)) |
| 225 (cond ((eq op '=) (and (= emacs-minor-version minor) | |
| 226 (= emacs-major-version major))) | |
| 227 ((memq op '(> >= < <=)) | |
| 228 (and (or (funcall op emacs-major-version major) | |
| 229 (= emacs-major-version major)) | |
| 230 (if (= emacs-major-version major) | |
| 231 (funcall op emacs-minor-version minor) | |
| 232 t))) | |
| 233 (t | |
| 19079 | 234 (error "%S: Invalid op in viper-check-version" op)))) |
| 10789 | 235 (cond ((memq op '(= > >=)) nil) |
| 236 ((memq op '(< <=)) t)))) | |
|
12693
321b2ad48a9c
(vip-add-hook,vip-remove-hook): new functions.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12212
diff
changeset
|
237 |
| 10789 | 238 |
| 19079 | 239 (defun viper-get-visible-buffer-window (wind) |
| 240 (if viper-xemacs-p | |
| 10789 | 241 (get-buffer-window wind t) |
| 242 (get-buffer-window wind 'visible))) | |
| 243 | |
| 244 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
245 ;; Return line position. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
246 ;; If pos is 'start then returns position of line start. |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
247 ;; If pos is 'end, returns line end. If pos is 'mid, returns line center. |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
248 ;; Pos = 'indent returns beginning of indentation. |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
249 ;; Otherwise, returns point. Current point is not moved in any case." |
| 19079 | 250 (defun viper-line-pos (pos) |
| 10789 | 251 (let ((cur-pos (point)) |
| 252 (result)) | |
| 253 (cond | |
| 254 ((equal pos 'start) | |
| 255 (beginning-of-line)) | |
| 256 ((equal pos 'end) | |
| 257 (end-of-line)) | |
| 258 ((equal pos 'mid) | |
| 19079 | 259 (goto-char (+ (viper-line-pos 'start) (viper-line-pos 'end) 2))) |
| 10789 | 260 ((equal pos 'indent) |
| 261 (back-to-indentation)) | |
| 262 (t nil)) | |
| 263 (setq result (point)) | |
| 264 (goto-char cur-pos) | |
| 265 result)) | |
| 266 | |
| 19462 | 267 ;; Emacs counts each multibyte character as several positions in the buffer, so |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
268 ;; we use Emacs' chars-in-region. XEmacs is counting each char as just one pos, |
| 19462 | 269 ;; so we can simply subtract. |
| 270 (defun viper-chars-in-region (beg end &optional preserve-sign) | |
| 271 (let ((count (abs (if (fboundp 'chars-in-region) | |
| 272 (chars-in-region beg end) | |
| 273 (- end beg))))) | |
| 274 (if (and (< end beg) preserve-sign) | |
| 275 (- count) | |
| 276 count))) | |
| 277 | |
| 278 ;; Test if POS is between BEG and END | |
| 279 (defsubst viper-pos-within-region (pos beg end) | |
| 280 (and (>= pos (min beg end)) (>= (max beg end) pos))) | |
| 281 | |
| 10789 | 282 |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
283 ;; Like move-marker but creates a virgin marker if arg isn't already a marker. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
284 ;; The first argument must eval to a variable name. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
285 ;; Arguments: (var-name position &optional buffer). |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
286 ;; |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
287 ;; This is useful for moving markers that are supposed to be local. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
288 ;; For this, VAR-NAME should be made buffer-local with nil as a default. |
| 19079 | 289 ;; Then, each time this var is used in `viper-move-marker-locally' in a new |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
290 ;; buffer, a new marker will be created. |
| 19079 | 291 (defun viper-move-marker-locally (var pos &optional buffer) |
| 10789 | 292 (if (markerp (eval var)) |
| 293 () | |
| 294 (set var (make-marker))) | |
| 295 (move-marker (eval var) pos buffer)) | |
| 296 | |
| 297 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
298 ;; Print CONDITIONS as a message. |
| 19079 | 299 (defun viper-message-conditions (conditions) |
| 10789 | 300 (let ((case (car conditions)) (msg (cdr conditions))) |
| 301 (if (null msg) | |
| 302 (message "%s" case) | |
| 303 (message "%s: %s" case (mapconcat 'prin1-to-string msg " "))) | |
| 304 (beep 1))) | |
| 305 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
306 |
| 10789 | 307 |
| 308 ;;; List/alist utilities | |
| 309 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
310 ;; Convert LIST to an alist |
| 19079 | 311 (defun viper-list-to-alist (lst) |
| 10789 | 312 (let ((alist)) |
| 313 (while lst | |
| 314 (setq alist (cons (list (car lst)) alist)) | |
| 315 (setq lst (cdr lst))) | |
| 316 alist)) | |
| 317 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
318 ;; Convert ALIST to a list. |
| 19079 | 319 (defun viper-alist-to-list (alst) |
| 10789 | 320 (let ((lst)) |
| 321 (while alst | |
| 322 (setq lst (cons (car (car alst)) lst)) | |
| 323 (setq alst (cdr alst))) | |
| 324 lst)) | |
| 325 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
326 ;; Filter ALIST using REGEXP. Return alist whose elements match the regexp. |
| 19079 | 327 (defun viper-filter-alist (regexp alst) |
| 10789 | 328 (interactive "s x") |
| 329 (let ((outalst) (inalst alst)) | |
| 330 (while (car inalst) | |
| 331 (if (string-match regexp (car (car inalst))) | |
| 332 (setq outalst (cons (car inalst) outalst))) | |
| 333 (setq inalst (cdr inalst))) | |
| 334 outalst)) | |
| 335 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
336 ;; Filter LIST using REGEXP. Return list whose elements match the regexp. |
| 19079 | 337 (defun viper-filter-list (regexp lst) |
| 10789 | 338 (interactive "s x") |
| 339 (let ((outlst) (inlst lst)) | |
| 340 (while (car inlst) | |
| 341 (if (string-match regexp (car inlst)) | |
| 342 (setq outlst (cons (car inlst) outlst))) | |
| 343 (setq inlst (cdr inlst))) | |
| 344 outlst)) | |
| 345 | |
| 346 | |
| 347 ;; Append LIS2 to LIS1, both alists, by side-effect and returns LIS1 | |
| 348 ;; LIS2 is modified by filtering it: deleting its members of the form | |
| 349 ;; \(car elt\) such that (car elt') is in LIS1. | |
| 19079 | 350 (defun viper-append-filter-alist (lis1 lis2) |
| 10789 | 351 (let ((temp lis1) |
| 352 elt) | |
| 353 ;;filter-append the second list | |
| 354 (while temp | |
| 355 ;; delete all occurrences | |
| 356 (while (setq elt (assoc (car (car temp)) lis2)) | |
| 357 (setq lis2 (delq elt lis2))) | |
| 358 (setq temp (cdr temp))) | |
| 359 | |
| 360 (nconc lis1 lis2))) | |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
361 |
|
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
33842
diff
changeset
|
362 |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
363 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
364 ;;; Support for :e, :r, :w file globbing |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
365 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
366 ;; Glob the file spec. |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
367 ;; This function is designed to work under Unix. It might also work under VMS. |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
368 (defun viper-glob-unix-files (filespec) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
369 (let ((gshell |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
370 (cond (ex-unix-type-shell shell-file-name) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
371 ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VAX VMS |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
372 (t "sh"))) ; probably Unix anyway |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
373 (gshell-options |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
374 ;; using cond in anticipation of further additions |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
375 (cond (ex-unix-type-shell-options) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
376 )) |
| 19079 | 377 (command (cond (viper-ms-style-os-p (format "\"ls -1 -d %s\"" filespec)) |
|
16136
de1340e6ddb4
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15747
diff
changeset
|
378 (t (format "ls -1 -d %s" filespec)))) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
379 status) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
380 (save-excursion |
| 19079 | 381 (set-buffer (get-buffer-create viper-ex-tmp-buf-name)) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
382 (erase-buffer) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
383 (setq status |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
384 (if gshell-options |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
385 (call-process gshell nil t nil |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
386 gshell-options |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
387 "-c" |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
388 command) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
389 (call-process gshell nil t nil |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
390 "-c" |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
391 command))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
392 (goto-char (point-min)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
393 ;; Issue an error, if no match. |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
394 (if (> status 0) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
395 (save-excursion |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
396 (skip-chars-forward " \t\n\j") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
397 (if (looking-at "ls:") |
| 19079 | 398 (viper-forward-Word 1)) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
399 (error "%s: %s" |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
400 (if (stringp gshell) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
401 gshell |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
402 "shell") |
| 19079 | 403 (buffer-substring (point) (viper-line-pos 'end))) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
404 )) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
405 (goto-char (point-min)) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
406 (viper-get-filenames-from-buffer 'one-per-line)) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
407 )) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
408 |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
409 |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
410 ;; Interpret the stuff in the buffer as a list of file names |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
411 ;; return a list of file names listed in the buffer beginning at point |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
412 ;; If optional arg is supplied, assume each filename is listed on a separate |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
413 ;; line |
| 19079 | 414 (defun viper-get-filenames-from-buffer (&optional one-per-line) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
415 (let ((skip-chars (if one-per-line "\t\n" " \t\n")) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
416 result fname delim) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
417 (skip-chars-forward skip-chars) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
418 (while (not (eobp)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
419 (if (cond ((looking-at "\"") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
420 (setq delim ?\") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
421 (re-search-forward "[^\"]+" nil t)) ; noerror |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
422 ((looking-at "'") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
423 (setq delim ?') |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
424 (re-search-forward "[^']+" nil t)) ; noerror |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
425 (t |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
426 (re-search-forward |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
427 (concat "[^" skip-chars "]+") nil t))) ;noerror |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
428 (setq fname |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
429 (buffer-substring (match-beginning 0) (match-end 0)))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
430 (if delim |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
431 (forward-char 1)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
432 (skip-chars-forward " \t\n") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
433 (setq result (cons fname result))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
434 result)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
435 |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
436 ;; convert MS-DOS wildcards to regexp |
| 19079 | 437 (defun viper-wildcard-to-regexp (wcard) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
438 (save-excursion |
| 19079 | 439 (set-buffer (get-buffer-create viper-ex-tmp-buf-name)) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
440 (erase-buffer) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
441 (insert wcard) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
442 (goto-char (point-min)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
443 (while (not (eobp)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
444 (skip-chars-forward "^*?.\\\\") |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
445 (cond ((eq (char-after (point)) ?*) (insert ".")(forward-char 1)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
446 ((eq (char-after (point)) ?.) (insert "\\")(forward-char 1)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
447 ((eq (char-after (point)) ?\\) (insert "\\")(forward-char 1)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
448 ((eq (char-after (point)) ??) (delete-char 1)(insert "."))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
449 ) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
450 (buffer-string) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
451 )) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
452 |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
453 |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
454 ;; glob windows files |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
455 ;; LIST is expected to be in reverse order |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
456 (defun viper-glob-mswindows-files (filespec) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
457 (let ((case-fold-search t) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
458 tmp tmp2) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
459 (save-excursion |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
460 (set-buffer (get-buffer-create viper-ex-tmp-buf-name)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
461 (erase-buffer) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
462 (insert filespec) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
463 (goto-char (point-min)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
464 (setq tmp (viper-get-filenames-from-buffer)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
465 (while tmp |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
466 (setq tmp2 (cons (directory-files |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
467 ;; the directory part |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
468 (or (file-name-directory (car tmp)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
469 "") |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
470 t ; return full names |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
471 ;; the regexp part: globs the file names |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
472 (concat "^" |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
473 (viper-wildcard-to-regexp |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
474 (file-name-nondirectory (car tmp))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
475 "$")) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
476 tmp2)) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
477 (setq tmp (cdr tmp))) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
478 (reverse (apply 'append tmp2))))) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
479 |
| 10789 | 480 |
| 481 ;;; Insertion ring | |
| 482 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
483 ;; Rotate RING's index. DIRection can be positive or negative. |
| 19079 | 484 (defun viper-ring-rotate1 (ring dir) |
| 10789 | 485 (if (and (ring-p ring) (> (ring-length ring) 0)) |
| 486 (progn | |
| 487 (setcar ring (cond ((> dir 0) | |
| 488 (ring-plus1 (car ring) (ring-length ring))) | |
| 489 ((< dir 0) | |
| 490 (ring-minus1 (car ring) (ring-length ring))) | |
| 491 ;; don't rotate if dir = 0 | |
| 492 (t (car ring)))) | |
| 19079 | 493 (viper-current-ring-item ring) |
| 10789 | 494 ))) |
| 495 | |
| 19079 | 496 (defun viper-special-ring-rotate1 (ring dir) |
| 497 (if (memq viper-intermediate-command | |
| 10789 | 498 '(repeating-display-destructive-command |
| 499 repeating-insertion-from-ring)) | |
| 19079 | 500 (viper-ring-rotate1 ring dir) |
| 10789 | 501 ;; don't rotate otherwise |
| 19079 | 502 (viper-ring-rotate1 ring 0))) |
| 10789 | 503 |
| 504 ;; current ring item; if N is given, then so many items back from the | |
| 505 ;; current | |
| 19079 | 506 (defun viper-current-ring-item (ring &optional n) |
| 10789 | 507 (setq n (or n 0)) |
| 508 (if (and (ring-p ring) (> (ring-length ring) 0)) | |
| 509 (aref (cdr (cdr ring)) (mod (- (car ring) 1 n) (ring-length ring))))) | |
| 510 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
511 ;; Push item onto ring. The second argument is a ring-variable, not value. |
| 19079 | 512 (defun viper-push-onto-ring (item ring-var) |
| 10789 | 513 (or (ring-p (eval ring-var)) |
| 514 (set ring-var (make-ring (eval (intern (format "%S-size" ring-var)))))) | |
| 515 (or (null item) ; don't push nil | |
| 516 (and (stringp item) (string= item "")) ; or empty strings | |
| 19079 | 517 (equal item (viper-current-ring-item (eval ring-var))) ; or old stuff |
| 518 ;; Since viper-set-destructive-command checks if we are inside | |
| 519 ;; viper-repeat, we don't check whether this-command-keys is a `.'. The | |
| 520 ;; cmd viper-repeat makes a call to the current function only if `.' is | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
521 ;; executing a command from the command history. It doesn't call the |
| 19079 | 522 ;; push-onto-ring function if `.' is simply repeating the last |
| 523 ;; destructive command. We only check for ESC (which happens when we do | |
| 524 ;; insert with a prefix argument, or if this-command-keys doesn't give | |
| 525 ;; anything meaningful (in that case we don't know what to show to the | |
| 526 ;; user). | |
| 527 (and (eq ring-var 'viper-command-ring) | |
| 10789 | 528 (string-match "\\([0-9]*\e\\|^[ \t]*$\\|escape\\)" |
| 19079 | 529 (viper-array-to-string (this-command-keys)))) |
| 530 (viper-ring-insert (eval ring-var) item)) | |
| 10789 | 531 ) |
| 532 | |
| 533 | |
| 534 ;; removing elts from ring seems to break it | |
| 19079 | 535 (defun viper-cleanup-ring (ring) |
| 10789 | 536 (or (< (ring-length ring) 2) |
| 19079 | 537 (null (viper-current-ring-item ring)) |
| 10789 | 538 ;; last and previous equal |
| 19079 | 539 (if (equal (viper-current-ring-item ring) |
| 540 (viper-current-ring-item ring 1)) | |
| 541 (viper-ring-pop ring)))) | |
| 10789 | 542 |
| 543 ;; ring-remove seems to be buggy, so we concocted this for our purposes. | |
| 19079 | 544 (defun viper-ring-pop (ring) |
| 10789 | 545 (let* ((ln (ring-length ring)) |
| 546 (vec (cdr (cdr ring))) | |
| 547 (veclen (length vec)) | |
| 548 (hd (car ring)) | |
| 549 (idx (max 0 (ring-minus1 hd ln))) | |
| 550 (top-elt (aref vec idx))) | |
| 551 | |
| 552 ;; shift elements | |
| 553 (while (< (1+ idx) veclen) | |
| 554 (aset vec idx (aref vec (1+ idx))) | |
| 555 (setq idx (1+ idx))) | |
| 556 (aset vec idx nil) | |
| 557 | |
| 558 (setq hd (max 0 (ring-minus1 hd ln))) | |
| 559 (if (= hd (1- ln)) (setq hd 0)) | |
| 560 (setcar ring hd) ; move head | |
| 561 (setcar (cdr ring) (max 0 (1- ln))) ; adjust length | |
| 562 top-elt | |
| 563 )) | |
| 564 | |
| 19079 | 565 (defun viper-ring-insert (ring item) |
| 10789 | 566 (let* ((ln (ring-length ring)) |
| 567 (vec (cdr (cdr ring))) | |
| 568 (veclen (length vec)) | |
| 569 (hd (car ring)) | |
| 570 (vecpos-after-hd (if (= hd 0) ln hd)) | |
| 571 (idx ln)) | |
| 572 | |
| 573 (if (= ln veclen) | |
| 574 (progn | |
| 575 (aset vec hd item) ; hd is always 1+ the actual head index in vec | |
| 576 (setcar ring (ring-plus1 hd ln))) | |
| 577 (setcar (cdr ring) (1+ ln)) | |
| 578 (setcar ring (ring-plus1 vecpos-after-hd (1+ ln))) | |
| 579 (while (and (>= idx vecpos-after-hd) (> ln 0)) | |
| 580 (aset vec idx (aref vec (1- idx))) | |
| 581 (setq idx (1- idx))) | |
| 582 (aset vec vecpos-after-hd item)) | |
| 583 item)) | |
| 584 | |
| 585 | |
| 586 ;;; String utilities | |
| 587 | |
| 588 ;; If STRING is longer than MAX-LEN, truncate it and print ...... instead | |
| 589 ;; PRE-STRING is a string to prepend to the abbrev string. | |
| 590 ;; POST-STRING is a string to append to the abbrev string. | |
| 591 ;; ABBREV_SIGN is a string to be inserted before POST-STRING | |
| 592 ;; if the orig string was truncated. | |
| 19079 | 593 (defun viper-abbreviate-string (string max-len |
| 10789 | 594 pre-string post-string abbrev-sign) |
| 595 (let (truncated-str) | |
| 596 (setq truncated-str | |
| 597 (if (stringp string) | |
| 598 (substring string 0 (min max-len (length string))))) | |
| 599 (cond ((null truncated-str) "") | |
| 600 ((> (length string) max-len) | |
| 601 (format "%s%s%s%s" | |
| 602 pre-string truncated-str abbrev-sign post-string)) | |
| 603 (t (format "%s%s%s" pre-string truncated-str post-string))))) | |
|
12204
a7bd91d4af97
(vip-over-whitespace-line): new function.
Karl Heuer <kwzh@gnu.org>
parents:
12139
diff
changeset
|
604 |
|
a7bd91d4af97
(vip-over-whitespace-line): new function.
Karl Heuer <kwzh@gnu.org>
parents:
12139
diff
changeset
|
605 ;; tells if we are over a whitespace-only line |
| 19079 | 606 (defsubst viper-over-whitespace-line () |
|
12204
a7bd91d4af97
(vip-over-whitespace-line): new function.
Karl Heuer <kwzh@gnu.org>
parents:
12139
diff
changeset
|
607 (save-excursion |
|
a7bd91d4af97
(vip-over-whitespace-line): new function.
Karl Heuer <kwzh@gnu.org>
parents:
12139
diff
changeset
|
608 (beginning-of-line) |
|
a7bd91d4af97
(vip-over-whitespace-line): new function.
Karl Heuer <kwzh@gnu.org>
parents:
12139
diff
changeset
|
609 (looking-at "^[ \t]*$"))) |
| 10789 | 610 |
| 611 | |
| 612 ;;; Saving settings in custom file | |
| 613 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
614 ;; Save the current setting of VAR in CUSTOM-FILE. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
615 ;; If given, MESSAGE is a message to be displayed after that. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
616 ;; This message is erased after 2 secs, if erase-msg is non-nil. |
|
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
617 ;; Arguments: var message custom-file &optional erase-message |
| 19079 | 618 (defun viper-save-setting (var message custom-file &optional erase-msg) |
| 10789 | 619 (let* ((var-name (symbol-name var)) |
| 620 (var-val (if (boundp var) (eval var))) | |
| 621 (regexp (format "^[^;]*%s[ \t\n]*[a-zA-Z---_']*[ \t\n)]" var-name)) | |
| 622 (buf (find-file-noselect (substitute-in-file-name custom-file))) | |
| 623 ) | |
|
14384
854325337547
Moved code around to minimize compiler warnings.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14336
diff
changeset
|
624 (message message) |
| 10789 | 625 (save-excursion |
| 626 (set-buffer buf) | |
| 627 (goto-char (point-min)) | |
| 628 (if (re-search-forward regexp nil t) | |
| 629 (let ((reg-end (1- (match-end 0)))) | |
| 630 (search-backward var-name) | |
| 631 (delete-region (match-beginning 0) reg-end) | |
| 632 (goto-char (match-beginning 0)) | |
| 633 (insert (format "%s '%S" var-name var-val))) | |
| 634 (goto-char (point-max)) | |
| 635 (if (not (bolp)) (insert "\n")) | |
| 636 (insert (format "(setq %s '%S)\n" var-name var-val))) | |
| 637 (save-buffer)) | |
| 638 (kill-buffer buf) | |
| 639 (if erase-msg | |
| 640 (progn | |
| 641 (sit-for 2) | |
| 642 (message ""))) | |
| 643 )) | |
| 644 | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
645 ;; Save STRING in CUSTOM-FILE. If PATTERN is non-nil, remove strings that |
| 10789 | 646 ;; match this pattern. |
| 19079 | 647 (defun viper-save-string-in-file (string custom-file &optional pattern) |
| 10789 | 648 (let ((buf (find-file-noselect (substitute-in-file-name custom-file)))) |
| 649 (save-excursion | |
| 650 (set-buffer buf) | |
| 21940 | 651 (let (buffer-read-only) |
| 652 (goto-char (point-min)) | |
| 653 (if pattern (delete-matching-lines pattern)) | |
| 654 (goto-char (point-max)) | |
| 655 (if string (insert string)) | |
| 656 (save-buffer))) | |
| 10789 | 657 (kill-buffer buf) |
| 658 )) | |
| 21940 | 659 |
| 660 | |
| 661 ;; define remote file test | |
| 662 (or (fboundp 'viper-file-remote-p) ; user supplied his own function: use it | |
| 663 (defun viper-file-remote-p (file-name) | |
| 664 (car (cond ((featurep 'efs-auto) (efs-ftp-path file-name)) | |
| 665 ((fboundp 'file-remote-p) (file-remote-p file-name)) | |
| 666 (t (require 'ange-ftp) | |
| 667 ;; Can happen only in Emacs, since XEmacs has file-remote-p | |
| 668 (ange-ftp-ftp-name file-name)))))) | |
| 669 | |
| 670 | |
| 671 | |
| 672 ;; This is a simple-minded check for whether a file is under version control. | |
| 673 ;; If file,v exists but file doesn't, this file is considered to be not checked | |
| 674 ;; in and not checked out for the purpose of patching (since patch won't be | |
| 675 ;; able to read such a file anyway). | |
| 676 ;; FILE is a string representing file name | |
| 677 ;;(defun viper-file-under-version-control (file) | |
| 678 ;; (let* ((filedir (file-name-directory file)) | |
| 679 ;; (file-nondir (file-name-nondirectory file)) | |
| 680 ;; (trial (concat file-nondir ",v")) | |
| 681 ;; (full-trial (concat filedir trial)) | |
| 682 ;; (full-rcs-trial (concat filedir "RCS/" trial))) | |
| 683 ;; (and (stringp file) | |
| 684 ;; (file-exists-p file) | |
| 685 ;; (or | |
| 686 ;; (and | |
| 687 ;; (file-exists-p full-trial) | |
| 688 ;; ;; in FAT FS, `file,v' and `file' may turn out to be the same! | |
| 689 ;; ;; don't be fooled by this! | |
| 690 ;; (not (equal (file-attributes file) | |
| 691 ;; (file-attributes full-trial)))) | |
| 692 ;; ;; check if a version is in RCS/ directory | |
| 693 ;; (file-exists-p full-rcs-trial))) | |
| 694 ;; )) | |
| 695 | |
| 696 | |
| 697 (defsubst viper-file-checked-in-p (file) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
698 (and (featurep 'vc-hooks) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
699 ;; CVS files are considered not checked in |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
700 (not (memq (vc-backend file) '(nil CVS))) |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
701 (if (fboundp 'vc-state) |
|
38723
3a1c2213b3d2
(viper-file-checked-in-p): Use `and'
Gerd Moellmann <gerd@gnu.org>
parents:
38514
diff
changeset
|
702 (and |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
703 (not (memq (vc-state file) '(edited needs-merge))) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
704 (not (stringp (vc-state file)))) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
705 ;; XEmacs has no vc-state |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
706 (not (vc-locking-user file))) |
|
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
707 )) |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
708 |
| 21940 | 709 ;; checkout if visited file is checked in |
| 710 (defun viper-maybe-checkout (buf) | |
| 711 (let ((file (expand-file-name (buffer-file-name buf))) | |
| 712 (checkout-function (key-binding "\C-x\C-q"))) | |
| 713 (if (and (viper-file-checked-in-p file) | |
| 714 (or (beep 1) t) | |
| 715 (y-or-n-p | |
| 716 (format | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
717 "File %s is checked in. Check it out? " |
| 21940 | 718 (viper-abbreviate-file-name file)))) |
| 719 (with-current-buffer buf | |
| 720 (command-execute checkout-function))))) | |
| 721 | |
| 722 | |
| 10789 | 723 |
| 724 | |
| 725 ;;; Overlays | |
|
28510
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
726 (defun viper-put-on-search-overlay (beg end) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
727 (if (viper-overlay-p viper-search-overlay) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
728 (viper-move-overlay viper-search-overlay beg end) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
729 (setq viper-search-overlay (viper-make-overlay beg end (current-buffer))) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
730 (viper-overlay-put |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
731 viper-search-overlay 'priority viper-search-overlay-priority)) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
732 (viper-overlay-put viper-search-overlay 'face viper-search-face)) |
| 10789 | 733 |
| 734 ;; Search | |
| 735 | |
| 19079 | 736 (defun viper-flash-search-pattern () |
|
28510
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
737 (if (not (viper-has-face-support-p)) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
738 nil |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
739 (viper-put-on-search-overlay (match-beginning 0) (match-end 0)) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
740 (sit-for 2) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
741 (viper-overlay-put viper-search-overlay 'face nil))) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
742 |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
743 (defun viper-hide-search-overlay () |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
744 (if (not (viper-overlay-p viper-search-overlay)) |
| 10789 | 745 (progn |
|
28510
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
746 (setq viper-search-overlay |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
747 (viper-make-overlay (point-min) (point-min) (current-buffer))) |
|
28510
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
748 (viper-overlay-put |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
749 viper-search-overlay 'priority viper-search-overlay-priority))) |
|
6fb7a3864791
2000-04-07 Mikio Nakajima <minakaji@osaka.email.ne.jp>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
27899
diff
changeset
|
750 (viper-overlay-put viper-search-overlay 'face nil)) |
|
16136
de1340e6ddb4
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15747
diff
changeset
|
751 |
| 10789 | 752 ;; Replace state |
| 753 | |
| 19079 | 754 (defsubst viper-move-replace-overlay (beg end) |
| 755 (viper-move-overlay viper-replace-overlay beg end)) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
756 |
| 19079 | 757 (defun viper-set-replace-overlay (beg end) |
|
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
758 (if (viper-overlay-live-p viper-replace-overlay) |
| 19079 | 759 (viper-move-replace-overlay beg end) |
| 760 (setq viper-replace-overlay (viper-make-overlay beg end (current-buffer))) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
761 ;; never detach |
| 19079 | 762 (viper-overlay-put |
| 763 viper-replace-overlay (if viper-emacs-p 'evaporate 'detachable) nil) | |
| 764 (viper-overlay-put | |
| 765 viper-replace-overlay 'priority viper-replace-overlay-priority) | |
| 18047 | 766 ;; If Emacs will start supporting overlay maps, as it currently supports |
| 19079 | 767 ;; text-property maps, we could do away with viper-replace-minor-mode and |
| 18047 | 768 ;; just have keymap attached to replace overlay. |
| 19079 | 769 ;;(viper-overlay-put |
| 770 ;; viper-replace-overlay | |
| 771 ;; (if viper-xemacs-p 'keymap 'local-map) | |
| 772 ;; viper-replace-map) | |
| 18047 | 773 ) |
| 19079 | 774 (if (viper-has-face-support-p) |
| 775 (viper-overlay-put | |
| 776 viper-replace-overlay 'face viper-replace-overlay-face)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
777 (viper-save-cursor-color 'before-replace-mode) |
| 19079 | 778 (viper-change-cursor-color viper-replace-overlay-cursor-color) |
| 10789 | 779 ) |
| 780 | |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
781 |
| 19079 | 782 (defun viper-set-replace-overlay-glyphs (before-glyph after-glyph) |
|
27899
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
783 (or (viper-overlay-live-p viper-replace-overlay) |
|
42f9a58e0fc4
* viper-cmd.el (viper-envelop-ESC-key): added the option to
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
784 (viper-set-replace-overlay (point-min) (point-min))) |
| 19079 | 785 (if (or (not (viper-has-face-support-p)) |
| 786 viper-use-replace-region-delimiters) | |
| 787 (let ((before-name (if viper-xemacs-p 'begin-glyph 'before-string)) | |
| 788 (after-name (if viper-xemacs-p 'end-glyph 'after-string))) | |
| 789 (viper-overlay-put viper-replace-overlay before-name before-glyph) | |
| 790 (viper-overlay-put viper-replace-overlay after-name after-glyph)))) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
791 |
| 19079 | 792 (defun viper-hide-replace-overlay () |
| 793 (viper-set-replace-overlay-glyphs nil nil) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
794 (viper-restore-cursor-color 'after-replace-mode) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
795 (viper-restore-cursor-color 'after-insert-mode) |
| 19079 | 796 (if (viper-has-face-support-p) |
| 797 (viper-overlay-put viper-replace-overlay 'face nil))) | |
| 10789 | 798 |
| 799 | |
| 19079 | 800 (defsubst viper-replace-start () |
| 801 (viper-overlay-start viper-replace-overlay)) | |
| 802 (defsubst viper-replace-end () | |
| 803 (viper-overlay-end viper-replace-overlay)) | |
| 10789 | 804 |
| 805 | |
| 806 ;; Minibuffer | |
| 807 | |
| 19079 | 808 (defun viper-set-minibuffer-overlay () |
| 809 (viper-check-minibuffer-overlay) | |
| 810 (if (viper-has-face-support-p) | |
| 10789 | 811 (progn |
| 19079 | 812 (viper-overlay-put |
| 813 viper-minibuffer-overlay 'face viper-minibuffer-current-face) | |
| 814 (viper-overlay-put | |
| 815 viper-minibuffer-overlay 'priority viper-minibuffer-overlay-priority) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
816 ;; never detach |
| 19079 | 817 (viper-overlay-put |
| 818 viper-minibuffer-overlay | |
| 819 (if viper-emacs-p 'evaporate 'detachable) | |
| 820 nil) | |
| 821 ;; make viper-minibuffer-overlay open-ended | |
|
14233
396316e5fbe6
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
822 ;; In emacs, it is made open ended at creation time |
| 19079 | 823 (if viper-xemacs-p |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
824 (progn |
| 19079 | 825 (viper-overlay-put viper-minibuffer-overlay 'start-open nil) |
| 826 (viper-overlay-put viper-minibuffer-overlay 'end-open nil))) | |
|
14233
396316e5fbe6
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
827 ))) |
| 10789 | 828 |
| 19079 | 829 (defun viper-check-minibuffer-overlay () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
830 (if (viper-overlay-live-p viper-minibuffer-overlay) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
831 (viper-move-overlay |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
832 viper-minibuffer-overlay |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
833 (if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
834 (1+ (buffer-size))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
835 (setq viper-minibuffer-overlay |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
836 (if viper-xemacs-p |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
837 (viper-make-overlay 1 (1+ (buffer-size)) (current-buffer)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
838 ;; make overlay open-ended |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
839 (viper-make-overlay |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
840 (if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
841 (1+ (buffer-size)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
842 (current-buffer) nil 'rear-advance))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
843 )) |
| 10789 | 844 |
| 845 | |
| 19079 | 846 (defsubst viper-is-in-minibuffer () |
| 21940 | 847 (save-match-data |
| 848 (string-match "\*Minibuf-" (buffer-name)))) | |
| 10789 | 849 |
| 850 | |
| 851 | |
| 852 ;;; XEmacs compatibility | |
|
14581
4951b11970a1
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14384
diff
changeset
|
853 |
| 19079 | 854 (defun viper-abbreviate-file-name (file) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
855 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
856 ;; XEmacs requires addl argument |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
857 (abbreviate-file-name file t) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
858 ;; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
859 (abbreviate-file-name file) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
860 )) |
| 10789 | 861 |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
862 ;; Sit for VAL milliseconds. XEmacs doesn't support the millisecond arg |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
863 ;; in sit-for, so this function smoothes out the differences. |
| 19079 | 864 (defsubst viper-sit-for-short (val &optional nodisp) |
| 865 (if viper-xemacs-p | |
| 10789 | 866 (sit-for (/ val 1000.0) nodisp) |
| 867 (sit-for 0 val nodisp))) | |
| 868 | |
| 869 ;; EVENT may be a single event of a sequence of events | |
| 19079 | 870 (defsubst viper-ESC-event-p (event) |
| 10789 | 871 (let ((ESC-keys '(?\e (control \[) escape)) |
| 19079 | 872 (key (viper-event-key event))) |
| 10789 | 873 (member key ESC-keys))) |
| 18047 | 874 |
| 875 ;; checks if object is a marker, has a buffer, and points to within that buffer | |
| 19079 | 876 (defun viper-valid-marker (marker) |
| 18047 | 877 (if (and (markerp marker) (marker-buffer marker)) |
| 878 (let ((buf (marker-buffer marker)) | |
| 879 (pos (marker-position marker))) | |
| 880 (save-excursion | |
| 881 (set-buffer buf) | |
| 882 (and (<= pos (point-max)) (<= (point-min) pos)))))) | |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
883 |
| 19079 | 884 (defsubst viper-mark-marker () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
885 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
886 (mark-marker t) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
887 (mark-marker) ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
888 )) |
|
14909
7ff1df13b124
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14588
diff
changeset
|
889 |
| 10789 | 890 ;; like (set-mark-command nil) but doesn't push twice, if (car mark-ring) |
| 891 ;; is the same as (mark t). | |
| 19079 | 892 (defsubst viper-set-mark-if-necessary () |
| 893 (setq mark-ring (delete (viper-mark-marker) mark-ring)) | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
894 (set-mark-command nil) |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
895 (setq viper-saved-mark (point))) |
| 10789 | 896 |
| 897 ;; In transient mark mode (zmacs mode), it is annoying when regions become | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
898 ;; highlighted due to Viper's pushing marks. So, we deactivate marks, unless |
| 10789 | 899 ;; the user explicitly wants highlighting, e.g., by hitting '' or `` |
| 19079 | 900 (defun viper-deactivate-mark () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
901 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
902 (zmacs-deactivate-region) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
903 (deactivate-mark) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
904 )) |
| 10789 | 905 |
| 19079 | 906 (defsubst viper-leave-region-active () |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
907 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
908 (setq zmacs-region-stays t) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
909 nil |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
910 )) |
|
12899
e0dfd3c3837e
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12693
diff
changeset
|
911 |
| 18047 | 912 ;; Check if arg is a valid character for register |
| 913 ;; TYPE is a list that can contain `letter', `Letter', and `digit'. | |
| 914 ;; Letter means lowercase letters, Letter means uppercase letters, and | |
| 915 ;; digit means digits from 1 to 9. | |
| 916 ;; If TYPE is nil, then down/uppercase letters and digits are allowed. | |
| 19079 | 917 (defun viper-valid-register (reg &optional type) |
| 18047 | 918 (or type (setq type '(letter Letter digit))) |
| 919 (or (if (memq 'letter type) | |
| 920 (and (<= ?a reg) (<= reg ?z))) | |
| 921 (if (memq 'digit type) | |
| 922 (and (<= ?1 reg) (<= reg ?9))) | |
| 923 (if (memq 'Letter type) | |
| 924 (and (<= ?A reg) (<= reg ?Z))) | |
| 925 )) | |
| 926 | |
| 10789 | 927 |
| 19079 | 928 (defsubst viper-events-to-keys (events) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
929 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
930 (events-to-keys events) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
931 events ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
932 )) |
| 10789 | 933 |
| 934 | |
| 18047 | 935 ;; it is suggested that an event must be copied before it is assigned to |
| 936 ;; last-command-event in XEmacs | |
| 19079 | 937 (defun viper-copy-event (event) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
938 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
939 (copy-event event) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
940 event ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
941 )) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
942 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
943 ;; Uses different timeouts for ESC-sequences and others |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
944 (defsubst viper-fast-keysequence-p () |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
945 (not (viper-sit-for-short |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
946 (if (viper-ESC-event-p last-input-event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
947 viper-ESC-keyseq-timeout |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
948 viper-fast-keyseq-timeout) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
949 t))) |
| 10789 | 950 |
| 951 ;; like read-event, but in XEmacs also try to convert to char, if possible | |
| 19079 | 952 (defun viper-read-event-convert-to-char () |
| 10789 | 953 (let (event) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
954 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
955 (progn |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
956 (setq event (next-command-event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
957 (or (event-to-character event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
958 event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
959 (read-event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
960 ) |
| 10789 | 961 )) |
| 962 | |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
963 ;; Viperized read-key-sequence |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
964 (defun viper-read-key-sequence (prompt &optional continue-echo) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
965 (let (inhibit-quit event keyseq) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
966 (setq keyseq (read-key-sequence prompt continue-echo)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
967 (setq event (if viper-xemacs-p |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
968 (elt keyseq 0) ; XEmacs returns vector of events |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
969 (elt (listify-key-sequence keyseq) 0))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
970 (if (viper-ESC-event-p event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
971 (let (unread-command-events) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
972 (viper-set-unread-command-events keyseq) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
973 (if (viper-fast-keysequence-p) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
974 (let ((viper-vi-global-user-minor-mode nil) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
975 (viper-vi-local-user-minor-mode nil) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
976 (viper-replace-minor-mode nil) ; actually unnecessary |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
977 (viper-insert-global-user-minor-mode nil) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
978 (viper-insert-local-user-minor-mode nil)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
979 (setq keyseq (read-key-sequence prompt continue-echo))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
980 (setq keyseq (read-key-sequence prompt continue-echo))))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
981 keyseq)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
982 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
983 |
|
12693
321b2ad48a9c
(vip-add-hook,vip-remove-hook): new functions.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12212
diff
changeset
|
984 ;; This function lets function-key-map convert key sequences into logical |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
985 ;; keys. This does a better job than viper-read-event when it comes to kbd |
|
15578
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
986 ;; macros, since it enables certain macros to be shared between X and TTY modes |
|
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
987 ;; by correctly mapping key sequences for Left/Right/... (one an ascii |
|
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
988 ;; terminal) into logical keys left, right, etc. |
| 19079 | 989 (defun viper-read-key () |
| 990 (let ((overriding-local-map viper-overriding-map) | |
|
15578
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
991 (inhibit-quit t) |
| 19203 | 992 help-char key) |
| 19079 | 993 (use-global-map viper-overriding-map) |
| 19203 | 994 (unwind-protect |
|
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38414
diff
changeset
|
995 (setq key (elt (viper-read-key-sequence nil) 0)) |
| 19203 | 996 (use-global-map global-map)) |
|
15578
fadc581e380e
(vip-read-key): inhibit quit added.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
997 key)) |
|
12693
321b2ad48a9c
(vip-add-hook,vip-remove-hook): new functions.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12212
diff
changeset
|
998 |
| 10789 | 999 |
|
12139
e16c06646396
(vip-event-key): now handles keys 128--255 as meta-chars.
Karl Heuer <kwzh@gnu.org>
parents:
11288
diff
changeset
|
1000 ;; Emacs has a bug in eventp, which causes (eventp nil) to return (nil) |
|
14584
6674e3119d9e
(vip-event-key): ignore consp events.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14581
diff
changeset
|
1001 ;; instead of nil, if '(nil) was previously inadvertently assigned to |
| 10789 | 1002 ;; unread-command-events |
| 19079 | 1003 (defun viper-event-key (event) |
| 10789 | 1004 (or (and event (eventp event)) |
| 19079 | 1005 (error "viper-event-key: Wrong type argument, eventp, %S" event)) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1006 (when (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1007 (or (key-press-event-p event) (mouse-event-p event)) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1008 t ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1009 ) |
| 18047 | 1010 (let ((mod (event-modifiers event)) |
| 1011 basis) | |
| 1012 (setq basis | |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1013 (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1014 ;; XEmacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1015 (cond ((key-press-event-p event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1016 (event-key event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1017 ((button-event-p event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1018 (concat "mouse-" (prin1-to-string (event-button event)))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1019 (t |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1020 (error "viper-event-key: Unknown event, %S" event))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1021 ;; Emacs doesn't handle capital letters correctly, since |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1022 ;; \S-a isn't considered the same as A (it behaves as |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1023 ;; plain `a' instead). So we take care of this here |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1024 (cond ((and (viper-characterp event) (<= ?A event) (<= event ?Z)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1025 (setq mod nil |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1026 event event)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1027 ;; Emacs has the oddity whereby characters 128+char |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1028 ;; represent M-char *if* this appears inside a string. |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1029 ;; So, we convert them manually to (meta char). |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1030 ((and (viper-characterp event) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1031 (< ?\C-? event) (<= event 255)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1032 (setq mod '(meta) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1033 event (- event ?\C-? 1))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1034 ((and (null mod) (eq event 'return)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1035 (setq event ?\C-m)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1036 ((and (null mod) (eq event 'space)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1037 (setq event ?\ )) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1038 ((and (null mod) (eq event 'delete)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1039 (setq event ?\C-?)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1040 ((and (null mod) (eq event 'backspace)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1041 (setq event ?\C-h)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1042 (t (event-basic-type event))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1043 ) ; viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1044 ) |
| 19079 | 1045 (if (viper-characterp basis) |
| 18047 | 1046 (setq basis |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1047 (if (viper= basis ?\C-?) |
| 18047 | 1048 (list 'control '\?) ; taking care of an emacs bug |
| 1049 (intern (char-to-string basis))))) | |
| 1050 (if mod | |
| 1051 (append mod (list basis)) | |
| 1052 basis)))) | |
| 10789 | 1053 |
| 19079 | 1054 (defun viper-key-to-emacs-key (key) |
| 10789 | 1055 (let (key-name char-p modifiers mod-char-list base-key base-key-name) |
| 19079 | 1056 (cond (viper-xemacs-p key) |
| 18839 | 1057 |
| 10789 | 1058 ((symbolp key) |
| 1059 (setq key-name (symbol-name key)) | |
| 18839 | 1060 (cond ((= (length key-name) 1) ; character event |
| 1061 (string-to-char key-name)) | |
| 1062 ;; Emacs doesn't recognize `return' and `escape' as events on | |
| 1063 ;; dumb terminals, so we translate them into characters | |
| 19079 | 1064 ((and viper-emacs-p (not (viper-window-display-p)) |
| 18839 | 1065 (string= key-name "return")) |
| 1066 ?\C-m) | |
| 19079 | 1067 ((and viper-emacs-p (not (viper-window-display-p)) |
| 18839 | 1068 (string= key-name "escape")) |
| 1069 ?\e) | |
| 1070 ;; pass symbol-event as is | |
| 1071 (t key))) | |
| 1072 | |
| 10789 | 1073 ((listp key) |
| 1074 (setq modifiers (subseq key 0 (1- (length key))) | |
| 19079 | 1075 base-key (viper-seq-last-elt key) |
| 10789 | 1076 base-key-name (symbol-name base-key) |
| 1077 char-p (= (length base-key-name) 1)) | |
| 1078 (setq mod-char-list | |
| 1079 (mapcar | |
| 1080 '(lambda (elt) (upcase (substring (symbol-name elt) 0 1))) | |
| 1081 modifiers)) | |
| 1082 (if char-p | |
| 1083 (setq key-name | |
| 1084 (car (read-from-string | |
| 1085 (concat | |
| 1086 "?\\" | |
| 1087 (mapconcat 'identity mod-char-list "-\\") | |
| 1088 "-" | |
| 1089 base-key-name)))) | |
| 1090 (setq key-name | |
| 1091 (intern | |
| 1092 (concat | |
| 1093 (mapconcat 'identity mod-char-list "-") | |
| 1094 "-" | |
| 1095 base-key-name)))))) | |
| 1096 )) | |
| 1097 | |
| 1098 | |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1099 ;; LIS is assumed to be a list of events of characters |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1100 (defun viper-eventify-list-xemacs (lis) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1101 (mapcar |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1102 (lambda (elt) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1103 (cond ((viper-characterp elt) (character-to-event elt)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1104 ((eventp elt) elt) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1105 (t (error |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1106 "viper-eventify-list-xemacs: can't convert to event, %S" |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1107 elt)))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1108 lis)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1109 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1110 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1111 ;; Smoothes out the difference between Emacs' unread-command-events |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1112 ;; and XEmacs unread-command-event. Arg is a character, an event, a list of |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1113 ;; events or a sequence of keys. |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1114 ;; |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1115 ;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1116 ;; symbol in unread-command-events list may cause Emacs to turn this symbol |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1117 ;; into an event. Below, we delete nil from event lists, since nil is the most |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1118 ;; common symbol that might appear in this wrong context. |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1119 (defun viper-set-unread-command-events (arg) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1120 (if viper-emacs-p |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1121 (setq |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1122 unread-command-events |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1123 (let ((new-events |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1124 (cond ((eventp arg) (list arg)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1125 ((listp arg) arg) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1126 ((sequencep arg) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1127 (listify-key-sequence arg)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1128 (t (error |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1129 "viper-set-unread-command-events: Invalid argument, %S" |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1130 arg))))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1131 (if (not (eventp nil)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1132 (setq new-events (delq nil new-events))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1133 (append new-events unread-command-events))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1134 ;; XEmacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1135 (setq |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1136 unread-command-events |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1137 (append |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1138 (cond ((viper-characterp arg) (list (character-to-event arg))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1139 ((eventp arg) (list arg)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1140 ((stringp arg) (mapcar 'character-to-event arg)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1141 ((vectorp arg) (append arg nil)) ; turn into list |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1142 ((listp arg) (viper-eventify-list-xemacs arg)) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1143 (t (error |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1144 "viper-set-unread-command-events: Invalid argument, %S" arg))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1145 unread-command-events)))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1146 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1147 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1148 ;; Check if vec is a vector of key-press events representing characters |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1149 ;; XEmacs only |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1150 (defun viper-event-vector-p (vec) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1151 (and (vectorp vec) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1152 (eval (cons 'and (mapcar '(lambda (elt) (if (eventp elt) t)) vec))))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1153 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1154 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1155 ;; check if vec is a vector of character symbols |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1156 (defun viper-char-symbol-sequence-p (vec) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1157 (and |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1158 (sequencep vec) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1159 (eval |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1160 (cons 'and |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1161 (mapcar (lambda (elt) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1162 (and (symbolp elt) (= (length (symbol-name elt)) 1))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1163 vec))))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1164 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1165 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1166 (defun viper-char-array-p (array) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1167 (eval (cons 'and (mapcar 'viper-characterp array)))) |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1168 |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1169 |
| 10789 | 1170 ;; Args can be a sequence of events, a string, or a Viper macro. Will try to |
| 1171 ;; convert events to keys and, if all keys are regular printable | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
1172 ;; characters, will return a string. Otherwise, will return a string |
|
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
1173 ;; representing a vector of converted events. If the input was a Viper macro, |
| 10789 | 1174 ;; will return a string that represents this macro as a vector. |
| 19079 | 1175 (defun viper-array-to-string (event-seq) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1176 (let (temp temp2) |
| 10789 | 1177 (cond ((stringp event-seq) event-seq) |
| 19079 | 1178 ((viper-event-vector-p event-seq) |
| 1179 (setq temp (mapcar 'viper-event-key event-seq)) | |
| 1180 (cond ((viper-char-symbol-sequence-p temp) | |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1181 (mapconcat 'symbol-name temp "")) |
| 19079 | 1182 ((and (viper-char-array-p |
| 1183 (setq temp2 (mapcar 'viper-key-to-character temp)))) | |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1184 (mapconcat 'char-to-string temp2 "")) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1185 (t (prin1-to-string (vconcat temp))))) |
| 19079 | 1186 ((viper-char-symbol-sequence-p event-seq) |
| 10789 | 1187 (mapconcat 'symbol-name event-seq "")) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1188 ((and (vectorp event-seq) |
| 19079 | 1189 (viper-char-array-p |
| 1190 (setq temp (mapcar 'viper-key-to-character event-seq)))) | |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1191 (mapconcat 'char-to-string temp "")) |
| 10789 | 1192 (t (prin1-to-string event-seq))))) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1193 |
| 19079 | 1194 (defun viper-key-press-events-to-chars (events) |
|
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1195 (mapconcat (viper-cond-compile-for-xemacs-or-emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1196 (lambda (elt) (char-to-string (event-to-character elt))) ; xemacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1197 'char-to-string ; emacs |
|
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
39215
diff
changeset
|
1198 ) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1199 events |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1200 "")) |
| 10789 | 1201 |
| 1202 | |
| 19079 | 1203 (defun viper-read-char-exclusive () |
| 10789 | 1204 (let (char |
| 1205 (echo-keystrokes 1)) | |
| 1206 (while (null char) | |
| 1207 (condition-case nil | |
| 1208 (setq char (read-char)) | |
| 1209 (error | |
| 1210 ;; skip event if not char | |
| 19079 | 1211 (viper-read-event)))) |
| 10789 | 1212 char)) |
| 1213 | |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1214 ;; key is supposed to be in viper's representation, e.g., (control l), a |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1215 ;; character, etc. |
| 19079 | 1216 (defun viper-key-to-character (key) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1217 (cond ((eq key 'space) ?\ ) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1218 ((eq key 'delete) ?\C-?) |
| 19079 | 1219 ((eq key 'return) ?\C-m) |
|
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1220 ((eq key 'backspace) ?\C-h) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1221 ((and (symbolp key) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1222 (= 1 (length (symbol-name key)))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1223 (string-to-char (symbol-name key))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1224 ((and (listp key) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1225 (eq (car key) 'control) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1226 (symbol-name (nth 1 key)) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1227 (= 1 (length (symbol-name (nth 1 key))))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1228 (read (format "?\\C-%s" (symbol-name (nth 1 key))))) |
|
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14909
diff
changeset
|
1229 (t key))) |
| 10789 | 1230 |
| 1231 | |
| 19079 | 1232 (defun viper-setup-master-buffer (&rest other-files-or-buffers) |
| 10789 | 1233 "Set up the current buffer as a master buffer. |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
1234 Arguments become related buffers. This function should normally be used in |
| 10789 | 1235 the `Local variables' section of a file." |
| 19079 | 1236 (setq viper-related-files-and-buffers-ring |
| 10789 | 1237 (make-ring (1+ (length other-files-or-buffers)))) |
| 1238 (mapcar '(lambda (elt) | |
| 19079 | 1239 (viper-ring-insert viper-related-files-and-buffers-ring elt)) |
| 10789 | 1240 other-files-or-buffers) |
| 19079 | 1241 (viper-ring-insert viper-related-files-and-buffers-ring (buffer-name)) |
| 10789 | 1242 ) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1243 |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1244 ;;; Movement utilities |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1245 |
| 19462 | 1246 ;; Characters that should not be considered as part of the word, in reformed-vi |
| 1247 ;; syntax mode. | |
| 1248 (defconst viper-non-word-characters-reformed-vi | |
| 1249 "!@#$%^&*()-+=|\\~`{}[];:'\",<.>/?") | |
| 1250 ;; These are characters that are not to be considered as parts of a word in | |
| 1251 ;; Viper. | |
| 1252 ;; Set each time state changes and at loading time | |
| 1253 (viper-deflocalvar viper-non-word-characters nil) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1254 |
| 19462 | 1255 ;; must be buffer-local |
| 19079 | 1256 (viper-deflocalvar viper-ALPHA-char-class "w" |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1257 "String of syntax classes characterizing Viper's alphanumeric symbols. |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1258 In addition, the symbol `_' may be considered alphanumeric if |
| 19462 | 1259 `viper-syntax-preference' is `strict-vi' or `reformed-vi'.") |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1260 |
| 19462 | 1261 (defconst viper-strict-ALPHA-chars "a-zA-Z0-9_" |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1262 "Regexp matching the set of alphanumeric characters acceptable to strict |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1263 Vi.") |
| 19462 | 1264 (defconst viper-strict-SEP-chars " \t\n" |
| 1265 "Regexp matching the set of alphanumeric characters acceptable to strict | |
| 1266 Vi.") | |
| 1267 (defconst viper-strict-SEP-chars-sans-newline " \t" | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1268 "Regexp matching the set of alphanumeric characters acceptable to strict |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1269 Vi.") |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1270 |
| 19462 | 1271 (defconst viper-SEP-char-class " -" |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1272 "String of syntax classes for Vi separators. |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1273 Usually contains ` ', linefeed, TAB or formfeed.") |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1274 |
| 19462 | 1275 |
| 1276 ;; Set Viper syntax classes and related variables according to | |
| 1277 ;; `viper-syntax-preference'. | |
| 1278 (defun viper-update-syntax-classes (&optional set-default) | |
| 1279 (let ((preference (cond ((eq viper-syntax-preference 'emacs) | |
| 1280 "w") ; Viper words have only Emacs word chars | |
| 1281 ((eq viper-syntax-preference 'extended) | |
| 1282 "w_") ; Viper words have Emacs word & symbol chars | |
| 1283 (t "w"))) ; Viper words are Emacs words plus `_' | |
| 1284 (non-word-chars (cond ((eq viper-syntax-preference 'reformed-vi) | |
| 1285 (viper-string-to-list | |
| 1286 viper-non-word-characters-reformed-vi)) | |
| 1287 (t nil)))) | |
| 1288 (if set-default | |
| 1289 (setq-default viper-ALPHA-char-class preference | |
| 1290 viper-non-word-characters non-word-chars) | |
| 1291 (setq viper-ALPHA-char-class preference | |
| 1292 viper-non-word-characters non-word-chars)) | |
| 1293 )) | |
| 1294 | |
| 1295 ;; SYMBOL is used because customize requires it, but it is ignored, unless it | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
1296 ;; is `nil'. If nil, use setq. |
| 19462 | 1297 (defun viper-set-syntax-preference (&optional symbol value) |
| 1298 "Set Viper syntax preference. | |
| 1299 If called interactively or if SYMBOL is nil, sets syntax preference in current | |
|
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
22284
diff
changeset
|
1300 buffer. If called non-interactively, preferably via the customization widget, |
| 19462 | 1301 sets the default value." |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1302 (interactive) |
| 19462 | 1303 (or value |
| 1304 (setq value | |
| 1305 (completing-read | |
| 1306 "Viper syntax preference: " | |
| 1307 '(("strict-vi") ("reformed-vi") ("extended") ("emacs")) | |
| 1308 nil 'require-match))) | |
| 1309 (if (stringp value) (setq value (intern value))) | |
| 1310 (or (memq value '(strict-vi reformed-vi extended emacs)) | |
| 1311 (error "Invalid Viper syntax preference, %S" value)) | |
| 1312 (if symbol | |
| 1313 (setq-default viper-syntax-preference value) | |
| 1314 (setq viper-syntax-preference value)) | |
| 1315 (viper-update-syntax-classes)) | |
| 1316 | |
| 1317 (defcustom viper-syntax-preference 'reformed-vi | |
| 1318 "*Syntax type characterizing Viper's alphanumeric symbols. | |
| 1319 Affects movement and change commands that deal with Vi-style words. | |
| 1320 Works best when set in the hooks to various major modes. | |
| 1321 | |
| 1322 `strict-vi' means Viper words are (hopefully) exactly as in Vi. | |
| 1323 | |
| 1324 `reformed-vi' means Viper words are like Emacs words \(as determined using | |
| 1325 Emacs syntax tables, which are different for different major modes\) with two | |
| 1326 exceptions: the symbol `_' is always part of a word and typical Vi non-word | |
| 1327 symbols, such as `,',:,\",),{, etc., are excluded. | |
| 1328 This behaves very close to `strict-vi', but also works well with non-ASCII | |
| 1329 characters from various alphabets. | |
| 1330 | |
| 1331 `extended' means Viper word constituents are symbols that are marked as being | |
| 1332 parts of words OR symbols in Emacs syntax tables. | |
| 1333 This is most appropriate for major modes intended for editing programs. | |
| 1334 | |
| 1335 `emacs' means Viper words are the same as Emacs words as specified by Emacs | |
| 1336 syntax tables. | |
| 1337 This option is appropriate if you like Emacs-style words." | |
| 1338 :type '(radio (const strict-vi) (const reformed-vi) | |
| 1339 (const extended) (const emacs)) | |
| 1340 :set 'viper-set-syntax-preference | |
| 1341 :group 'viper) | |
| 1342 (make-variable-buffer-local 'viper-syntax-preference) | |
| 1343 | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1344 |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1345 ;; addl-chars are characters to be temporarily considered as alphanumerical |
| 19079 | 1346 (defun viper-looking-at-alpha (&optional addl-chars) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1347 (or (stringp addl-chars) (setq addl-chars "")) |
| 19079 | 1348 (if (eq viper-syntax-preference 'reformed-vi) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1349 (setq addl-chars (concat addl-chars "_"))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1350 (let ((char (char-after (point)))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1351 (if char |
| 19079 | 1352 (if (eq viper-syntax-preference 'strict-vi) |
| 1353 (looking-at (concat "[" viper-strict-ALPHA-chars addl-chars "]")) | |
| 19462 | 1354 (or |
| 1355 ;; or one of the additional chars being asked to include | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1356 (viper-memq-char char (viper-string-to-list addl-chars)) |
| 19462 | 1357 (and |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1358 ;; not one of the excluded word chars (note: |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1359 ;; viper-non-word-characters is a list) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1360 (not (viper-memq-char char viper-non-word-characters)) |
| 19462 | 1361 ;; char of the Viper-word syntax class |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1362 (viper-memq-char (char-syntax char) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1363 (viper-string-to-list viper-ALPHA-char-class)))))) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1364 )) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1365 |
| 19079 | 1366 (defun viper-looking-at-separator () |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1367 (let ((char (char-after (point)))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1368 (if char |
| 19462 | 1369 (if (eq viper-syntax-preference 'strict-vi) |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1370 (viper-memq-char char (viper-string-to-list viper-strict-SEP-chars)) |
| 19462 | 1371 (or (eq char ?\n) ; RET is always a separator in Vi |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1372 (viper-memq-char (char-syntax char) |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1373 (viper-string-to-list viper-SEP-char-class))))) |
| 19462 | 1374 )) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1375 |
| 19079 | 1376 (defsubst viper-looking-at-alphasep (&optional addl-chars) |
| 1377 (or (viper-looking-at-separator) (viper-looking-at-alpha addl-chars))) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1378 |
| 19079 | 1379 (defun viper-skip-alpha-forward (&optional addl-chars) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1380 (or (stringp addl-chars) (setq addl-chars "")) |
| 19079 | 1381 (viper-skip-syntax |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1382 'forward |
| 19079 | 1383 (cond ((eq viper-syntax-preference 'strict-vi) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1384 "") |
| 19241 | 1385 (t viper-ALPHA-char-class)) |
| 19079 | 1386 (cond ((eq viper-syntax-preference 'strict-vi) |
| 1387 (concat viper-strict-ALPHA-chars addl-chars)) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1388 (t addl-chars)))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1389 |
| 19079 | 1390 (defun viper-skip-alpha-backward (&optional addl-chars) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1391 (or (stringp addl-chars) (setq addl-chars "")) |
| 19079 | 1392 (viper-skip-syntax |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1393 'backward |
| 19079 | 1394 (cond ((eq viper-syntax-preference 'strict-vi) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1395 "") |
| 19241 | 1396 (t viper-ALPHA-char-class)) |
| 19079 | 1397 (cond ((eq viper-syntax-preference 'strict-vi) |
| 1398 (concat viper-strict-ALPHA-chars addl-chars)) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1399 (t addl-chars)))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1400 |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1401 ;; weird syntax tables may confuse strict-vi style |
| 19079 | 1402 (defsubst viper-skip-all-separators-forward (&optional within-line) |
| 19462 | 1403 (if (eq viper-syntax-preference 'strict-vi) |
| 1404 (if within-line | |
| 1405 (skip-chars-forward viper-strict-SEP-chars-sans-newline) | |
| 1406 (skip-chars-forward viper-strict-SEP-chars)) | |
| 1407 (viper-skip-syntax 'forward | |
| 1408 viper-SEP-char-class | |
| 1409 (or within-line "\n") | |
| 1410 (if within-line (viper-line-pos 'end))))) | |
| 19079 | 1411 (defsubst viper-skip-all-separators-backward (&optional within-line) |
| 19462 | 1412 (if (eq viper-syntax-preference 'strict-vi) |
| 1413 (if within-line | |
| 1414 (skip-chars-backward viper-strict-SEP-chars-sans-newline) | |
| 1415 (skip-chars-backward viper-strict-SEP-chars)) | |
| 1416 (viper-skip-syntax 'backward | |
| 1417 viper-SEP-char-class | |
| 1418 (or within-line "\n") | |
| 1419 (if within-line (viper-line-pos 'start))))) | |
| 19079 | 1420 (defun viper-skip-nonseparators (direction) |
| 19462 | 1421 (viper-skip-syntax |
| 1422 direction | |
| 1423 (concat "^" viper-SEP-char-class) | |
| 1424 nil | |
| 1425 (viper-line-pos (if (eq direction 'forward) 'end 'start)))) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1426 |
| 19462 | 1427 |
| 1428 ;; skip over non-word constituents and non-separators | |
| 19079 | 1429 (defun viper-skip-nonalphasep-forward () |
| 1430 (if (eq viper-syntax-preference 'strict-vi) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1431 (skip-chars-forward |
| 19079 | 1432 (concat "^" viper-strict-SEP-chars viper-strict-ALPHA-chars)) |
| 19462 | 1433 (viper-skip-syntax |
| 1434 'forward | |
| 1435 (concat "^" viper-ALPHA-char-class viper-SEP-char-class) | |
| 1436 ;; Emacs may consider some of these as words, but we don't want them | |
| 1437 viper-non-word-characters | |
| 1438 (viper-line-pos 'end)))) | |
| 19079 | 1439 (defun viper-skip-nonalphasep-backward () |
| 1440 (if (eq viper-syntax-preference 'strict-vi) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1441 (skip-chars-backward |
| 19079 | 1442 (concat "^" viper-strict-SEP-chars viper-strict-ALPHA-chars)) |
| 19462 | 1443 (viper-skip-syntax |
| 1444 'backward | |
| 1445 (concat "^" viper-ALPHA-char-class viper-SEP-char-class) | |
| 1446 ;; Emacs may consider some of these as words, but we don't want them | |
| 1447 viper-non-word-characters | |
| 19079 | 1448 (viper-line-pos 'start)))) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1449 |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1450 ;; Skip SYNTAX like skip-syntax-* and ADDL-CHARS like skip-chars-* |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1451 ;; Return the number of chars traveled. |
| 19462 | 1452 ;; Both SYNTAX or ADDL-CHARS can be strings or lists of characters. |
| 1453 ;; When SYNTAX is "w", then viper-non-word-characters are not considered to be | |
| 1454 ;; words, even if Emacs syntax table says they are. | |
| 19079 | 1455 (defun viper-skip-syntax (direction syntax addl-chars &optional limit) |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1456 (let ((total 0) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1457 (local 1) |
| 19462 | 1458 (skip-chars-func |
| 1459 (if (eq direction 'forward) | |
| 1460 'skip-chars-forward 'skip-chars-backward)) | |
| 1461 (skip-syntax-func | |
| 1462 (if (eq direction 'forward) | |
| 1463 'viper-forward-char-carefully 'viper-backward-char-carefully)) | |
| 1464 char-looked-at syntax-of-char-looked-at negated-syntax) | |
| 1465 (setq addl-chars | |
| 1466 (cond ((listp addl-chars) (viper-charlist-to-string addl-chars)) | |
| 1467 ((stringp addl-chars) addl-chars) | |
| 1468 (t ""))) | |
| 1469 (setq syntax | |
| 1470 (cond ((listp syntax) syntax) | |
| 1471 ((stringp syntax) (viper-string-to-list syntax)) | |
| 1472 (t nil))) | |
| 1473 (if (memq ?^ syntax) (setq negated-syntax t)) | |
| 1474 | |
|
22284
7c92be9aea04
(viper-skip-syntax): Bug fix for eob/bob cases.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
1475 (while (and (not (= local 0)) |
|
7c92be9aea04
(viper-skip-syntax): Bug fix for eob/bob cases.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
1476 (cond ((eq direction 'forward) |
|
7c92be9aea04
(viper-skip-syntax): Bug fix for eob/bob cases.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
1477 (not (eobp))) |
|
7c92be9aea04
(viper-skip-syntax): Bug fix for eob/bob cases.
Karl Heuer <kwzh@gnu.org>
parents:
21940
diff
changeset
|
1478 (t (not (bobp))))) |
| 19462 | 1479 (setq char-looked-at (viper-char-at-pos direction) |
| 1480 ;; if outside the range, set to nil | |
| 1481 syntax-of-char-looked-at (if char-looked-at | |
| 1482 (char-syntax char-looked-at))) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1483 (setq local |
| 19462 | 1484 (+ (if (and |
| 1485 (cond ((and limit (eq direction 'forward)) | |
| 1486 (< (point) limit)) | |
| 1487 (limit ; backward & limit | |
| 1488 (> (point) limit)) | |
| 1489 (t t)) ; no limit | |
| 1490 ;; char under/before cursor has appropriate syntax | |
| 1491 (if negated-syntax | |
| 1492 (not (memq syntax-of-char-looked-at syntax)) | |
| 1493 (memq syntax-of-char-looked-at syntax)) | |
| 1494 ;; if char-syntax class is "word", make sure it is not one | |
| 1495 ;; of the excluded characters | |
| 1496 (if (and (eq syntax-of-char-looked-at ?w) | |
| 1497 (not negated-syntax)) | |
|
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1498 (not (viper-memq-char |
|
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
28510
diff
changeset
|
1499 char-looked-at viper-non-word-characters)) |
| 19462 | 1500 t)) |
| 1501 (funcall skip-syntax-func 1) | |
| 1502 0) | |
|
13213
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1503 (funcall skip-chars-func addl-chars limit))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1504 (setq total (+ total local))) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1505 total |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1506 )) |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1507 |
|
68b3f6d9156f
(vip-leave-region-active): new function.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12899
diff
changeset
|
1508 |
| 10789 | 1509 |
| 18839 | 1510 (provide 'viper-util) |
| 10789 | 1511 |
| 18839 | 1512 |
| 1513 ;;; Local Variables: | |
| 19079 | 1514 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) |
| 18839 | 1515 ;;; End: |
| 10789 | 1516 |
|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
1517 ;;; viper-util.el ends here |
