* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
;;; viper-util.el --- Utilities used by viper.el
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
2005-08-01 15:47:19 +00:00
|
|
|
|
;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
|
|
|
|
|
;; 2004, 2005 Free Software Foundation, Inc.
|
1995-04-08 02:20:38 +00:00
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
2001-09-09 22:33:38 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 17:55:18 +00:00
|
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; Commentary:
|
1996-03-29 01:02:28 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; Code:
|
1996-03-29 01:02:28 +00:00
|
|
|
|
|
|
|
|
|
;; Compiler pacifier
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-overriding-map)
|
1996-03-29 01:02:28 +00:00
|
|
|
|
(defvar pm-color-alist)
|
|
|
|
|
(defvar zmacs-region-stays)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-minibuffer-current-face)
|
|
|
|
|
(defvar viper-minibuffer-insert-face)
|
|
|
|
|
(defvar viper-minibuffer-vi-face)
|
|
|
|
|
(defvar viper-minibuffer-emacs-face)
|
|
|
|
|
(defvar viper-replace-overlay-face)
|
|
|
|
|
(defvar viper-fast-keyseq-timeout)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(defvar ex-unix-type-shell)
|
|
|
|
|
(defvar ex-unix-type-shell-options)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defvar viper-ex-tmp-buf-name)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defvar viper-syntax-preference)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(defvar viper-saved-mark)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
|
|
|
|
(require 'ring)
|
|
|
|
|
|
1997-06-09 04:00:50 +00:00
|
|
|
|
(if noninteractive
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
|
|
(or (featurep 'viper-init)
|
|
|
|
|
(load "viper-init.el" nil nil 'nosuffix))
|
|
|
|
|
)))
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; end pacifier
|
|
|
|
|
|
|
|
|
|
(require 'viper-init)
|
1996-02-16 05:25:08 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-07 04:48:48 +00:00
|
|
|
|
;; A fix for NeXT Step
|
|
|
|
|
;; Should go away, when NS people fix the design flaw, which leaves the
|
|
|
|
|
;; two x-* functions undefined.
|
|
|
|
|
(if (and (not (fboundp 'x-display-color-p)) (fboundp 'ns-display-color-p))
|
|
|
|
|
(fset 'x-display-color-p (symbol-function 'ns-display-color-p)))
|
|
|
|
|
(if (and (not (fboundp 'x-color-defined-p)) (fboundp 'ns-color-defined-p))
|
|
|
|
|
(fset 'x-color-defined-p (symbol-function 'ns-color-defined-p)))
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; XEmacs support
|
|
|
|
|
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(progn ; xemacs
|
|
|
|
|
(fset 'viper-overlay-p (symbol-function 'extentp))
|
|
|
|
|
(fset 'viper-make-overlay (symbol-function 'make-extent))
|
|
|
|
|
(fset 'viper-overlay-live-p (symbol-function 'extent-live-p))
|
|
|
|
|
(fset 'viper-move-overlay (symbol-function 'set-extent-endpoints))
|
|
|
|
|
(fset 'viper-overlay-start (symbol-function 'extent-start-position))
|
|
|
|
|
(fset 'viper-overlay-end (symbol-function 'extent-end-position))
|
|
|
|
|
(fset 'viper-overlay-get (symbol-function 'extent-property))
|
|
|
|
|
(fset 'viper-overlay-put (symbol-function 'set-extent-property))
|
|
|
|
|
(fset 'viper-read-event (symbol-function 'next-command-event))
|
|
|
|
|
(fset 'viper-characterp (symbol-function 'characterp))
|
|
|
|
|
(fset 'viper-int-to-char (symbol-function 'int-to-char))
|
|
|
|
|
(if (viper-window-display-p)
|
|
|
|
|
(fset 'viper-iconify (symbol-function 'iconify-frame)))
|
|
|
|
|
(cond ((viper-has-face-support-p)
|
|
|
|
|
(fset 'viper-get-face (symbol-function 'get-face))
|
|
|
|
|
(fset 'viper-color-defined-p (symbol-function 'valid-color-name-p))
|
|
|
|
|
)))
|
|
|
|
|
(progn ; emacs
|
|
|
|
|
(fset 'viper-overlay-p (symbol-function 'overlayp))
|
|
|
|
|
(fset 'viper-make-overlay (symbol-function 'make-overlay))
|
|
|
|
|
(fset 'viper-overlay-live-p (symbol-function 'overlayp))
|
|
|
|
|
(fset 'viper-move-overlay (symbol-function 'move-overlay))
|
|
|
|
|
(fset 'viper-overlay-start (symbol-function 'overlay-start))
|
|
|
|
|
(fset 'viper-overlay-end (symbol-function 'overlay-end))
|
|
|
|
|
(fset 'viper-overlay-get (symbol-function 'overlay-get))
|
|
|
|
|
(fset 'viper-overlay-put (symbol-function 'overlay-put))
|
|
|
|
|
(fset 'viper-read-event (symbol-function 'read-event))
|
|
|
|
|
(fset 'viper-characterp (symbol-function 'integerp))
|
|
|
|
|
(fset 'viper-int-to-char (symbol-function 'identity))
|
|
|
|
|
(if (viper-window-display-p)
|
|
|
|
|
(fset 'viper-iconify (symbol-function 'iconify-or-deiconify-frame)))
|
|
|
|
|
(cond ((viper-has-face-support-p)
|
|
|
|
|
(fset 'viper-get-face (symbol-function 'internal-get-face))
|
|
|
|
|
(fset 'viper-color-defined-p (symbol-function 'x-color-defined-p))
|
|
|
|
|
)))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
|
2000-11-24 08:15:11 +00:00
|
|
|
|
;; CHAR is supposed to be a char or an integer (positive or negative)
|
|
|
|
|
;; LIST is a list of chars, nil, and negative numbers
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
;; Check if CHAR is a member by trying to convert in characters, if necessary.
|
2000-11-24 08:15:11 +00:00
|
|
|
|
;; Introduced for compatibility with XEmacs, where integers are not the same as
|
|
|
|
|
;; chars.
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(defun viper-memq-char (char list)
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
(cond ((and (integerp char) (>= char 0))
|
|
|
|
|
(memq (viper-int-to-char char) list))
|
2000-11-24 08:15:11 +00:00
|
|
|
|
((memq char list))))
|
2000-10-29 04:56:45 +00:00
|
|
|
|
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
;; Check if char-or-int and char are the same as characters
|
|
|
|
|
(defun viper-char-equal (char-or-int char)
|
|
|
|
|
(cond ((and (integerp char-or-int) (>= char-or-int 0))
|
|
|
|
|
(= (viper-int-to-char char-or-int) char))
|
|
|
|
|
((eq char-or-int char))))
|
|
|
|
|
|
2000-10-29 04:56:45 +00:00
|
|
|
|
;; Like =, but accommodates null and also is t for eq-objects
|
|
|
|
|
(defun viper= (char char1)
|
|
|
|
|
(cond ((eq char char1) t)
|
|
|
|
|
((and (viper-characterp char) (viper-characterp char1))
|
|
|
|
|
(= char char1))
|
|
|
|
|
(t nil)))
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-color-display-p ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(eq (device-class (selected-device)) 'color) ; xemacs
|
|
|
|
|
(x-display-color-p) ; emacs
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-get-cursor-color ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
;; xemacs
|
|
|
|
|
(color-instance-name (frame-property (selected-frame) 'cursor-color))
|
|
|
|
|
(cdr (assoc 'cursor-color (frame-parameters))) ; emacs
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; OS/2
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq (viper-device-type) 'pm)
|
|
|
|
|
(fset 'viper-color-defined-p
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(lambda (color) (assoc color pm-color-alist)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1996-01-20 03:19:26 +00:00
|
|
|
|
|
|
|
|
|
;; cursor colors
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-change-cursor-color (new-color)
|
|
|
|
|
(if (and (viper-window-display-p) (viper-color-display-p)
|
|
|
|
|
(stringp new-color) (viper-color-defined-p new-color)
|
|
|
|
|
(not (string= new-color (viper-get-cursor-color))))
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(set-frame-property
|
|
|
|
|
(selected-frame) 'cursor-color (make-color-instance new-color))
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
(selected-frame) (list (cons 'cursor-color new-color)))
|
|
|
|
|
)
|
2000-10-29 04:56:45 +00:00
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; By default, saves current frame cursor color in the
|
|
|
|
|
;; viper-saved-cursor-color-in-replace-mode property of viper-replace-overlay
|
|
|
|
|
(defun viper-save-cursor-color (before-which-mode)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (and (viper-window-display-p) (viper-color-display-p))
|
|
|
|
|
(let ((color (viper-get-cursor-color)))
|
|
|
|
|
(if (and (stringp color) (viper-color-defined-p color)
|
|
|
|
|
(not (string= color viper-replace-overlay-cursor-color)))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
(selected-frame)
|
|
|
|
|
(list
|
|
|
|
|
(cons
|
|
|
|
|
(if (eq before-which-mode 'before-replace-mode)
|
|
|
|
|
'viper-saved-cursor-color-in-replace-mode
|
|
|
|
|
'viper-saved-cursor-color-in-insert-mode)
|
|
|
|
|
color)))
|
|
|
|
|
))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
|
|
|
|
|
(defsubst viper-get-saved-cursor-color-in-replace-mode ()
|
|
|
|
|
(or
|
|
|
|
|
(funcall
|
|
|
|
|
(if viper-emacs-p 'frame-parameter 'frame-property)
|
|
|
|
|
(selected-frame)
|
|
|
|
|
'viper-saved-cursor-color-in-replace-mode)
|
|
|
|
|
viper-vi-state-cursor-color))
|
|
|
|
|
|
|
|
|
|
(defsubst viper-get-saved-cursor-color-in-insert-mode ()
|
|
|
|
|
(or
|
|
|
|
|
(funcall
|
|
|
|
|
(if viper-emacs-p 'frame-parameter 'frame-property)
|
|
|
|
|
(selected-frame)
|
|
|
|
|
'viper-saved-cursor-color-in-insert-mode)
|
|
|
|
|
viper-vi-state-cursor-color))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; restore cursor color from replace overlay
|
|
|
|
|
(defun viper-restore-cursor-color(after-which-mode)
|
|
|
|
|
(if (viper-overlay-p viper-replace-overlay)
|
|
|
|
|
(viper-change-cursor-color
|
|
|
|
|
(if (eq after-which-mode 'after-replace-mode)
|
|
|
|
|
(viper-get-saved-cursor-color-in-replace-mode)
|
|
|
|
|
(viper-get-saved-cursor-color-in-insert-mode))
|
|
|
|
|
)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; Check the current version against the major and minor version numbers
|
|
|
|
|
;; using op: cur-vers op major.minor If emacs-major-version or
|
|
|
|
|
;; emacs-minor-version are not defined, we assume that the current version
|
|
|
|
|
;; is hopelessly outdated. We assume that emacs-major-version and
|
|
|
|
|
;; emacs-minor-version are defined. Otherwise, for Emacs/XEmacs 19, if the
|
|
|
|
|
;; current minor version is < 10 (xemacs) or < 23 (emacs) the return value
|
|
|
|
|
;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; incorrect. However, this gives correct result in our cases, since we are
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; testing for sufficiently high Emacs versions.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-check-version (op major minor &optional type-of-emacs)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(if (and (boundp 'emacs-major-version) (boundp 'emacs-minor-version))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(and (cond ((eq type-of-emacs 'xemacs) viper-xemacs-p)
|
|
|
|
|
((eq type-of-emacs 'emacs) viper-emacs-p)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(t t))
|
|
|
|
|
(cond ((eq op '=) (and (= emacs-minor-version minor)
|
|
|
|
|
(= emacs-major-version major)))
|
|
|
|
|
((memq op '(> >= < <=))
|
|
|
|
|
(and (or (funcall op emacs-major-version major)
|
|
|
|
|
(= emacs-major-version major))
|
|
|
|
|
(if (= emacs-major-version major)
|
|
|
|
|
(funcall op emacs-minor-version minor)
|
|
|
|
|
t)))
|
|
|
|
|
(t
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(error "%S: Invalid op in viper-check-version" op))))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(cond ((memq op '(= > >=)) nil)
|
|
|
|
|
((memq op '(< <=)) t))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-get-visible-buffer-window (wind)
|
|
|
|
|
(if viper-xemacs-p
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(get-buffer-window wind t)
|
|
|
|
|
(get-buffer-window wind 'visible)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Return line position.
|
|
|
|
|
;; If pos is 'start then returns position of line start.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; If pos is 'end, returns line end. If pos is 'mid, returns line center.
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Pos = 'indent returns beginning of indentation.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Otherwise, returns point. Current point is not moved in any case."
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-line-pos (pos)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((cur-pos (point))
|
|
|
|
|
(result))
|
|
|
|
|
(cond
|
|
|
|
|
((equal pos 'start)
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
((equal pos 'end)
|
|
|
|
|
(end-of-line))
|
|
|
|
|
((equal pos 'mid)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(goto-char (+ (viper-line-pos 'start) (viper-line-pos 'end) 2)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
((equal pos 'indent)
|
|
|
|
|
(back-to-indentation))
|
|
|
|
|
(t nil))
|
|
|
|
|
(setq result (point))
|
|
|
|
|
(goto-char cur-pos)
|
|
|
|
|
result))
|
|
|
|
|
|
2002-09-18 04:23:27 +00:00
|
|
|
|
;; Emacs used to count each multibyte character as several positions in the buffer,
|
|
|
|
|
;; so we had to use Emacs' chars-in-region to count characters. Since 20.3,
|
|
|
|
|
;; Emacs counts multibyte characters as 1 position. XEmacs has always been
|
|
|
|
|
;; counting each char as just one pos. So, now we can simply subtract beg from
|
|
|
|
|
;; end to determine the number of characters in a region.
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defun viper-chars-in-region (beg end &optional preserve-sign)
|
2002-09-18 04:23:27 +00:00
|
|
|
|
;;(let ((count (abs (if (fboundp 'chars-in-region)
|
|
|
|
|
;; (chars-in-region beg end)
|
|
|
|
|
;; (- end beg)))))
|
|
|
|
|
(let ((count (abs (- end beg))))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(if (and (< end beg) preserve-sign)
|
|
|
|
|
(- count)
|
|
|
|
|
count)))
|
|
|
|
|
|
|
|
|
|
;; Test if POS is between BEG and END
|
|
|
|
|
(defsubst viper-pos-within-region (pos beg end)
|
|
|
|
|
(and (>= pos (min beg end)) (>= (max beg end) pos)))
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Like move-marker but creates a virgin marker if arg isn't already a marker.
|
|
|
|
|
;; The first argument must eval to a variable name.
|
|
|
|
|
;; Arguments: (var-name position &optional buffer).
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;;
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; This is useful for moving markers that are supposed to be local.
|
|
|
|
|
;; For this, VAR-NAME should be made buffer-local with nil as a default.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; Then, each time this var is used in `viper-move-marker-locally' in a new
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; buffer, a new marker will be created.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-move-marker-locally (var pos &optional buffer)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(if (markerp (eval var))
|
|
|
|
|
()
|
|
|
|
|
(set var (make-marker)))
|
|
|
|
|
(move-marker (eval var) pos buffer))
|
|
|
|
|
|
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Print CONDITIONS as a message.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-message-conditions (conditions)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((case (car conditions)) (msg (cdr conditions)))
|
|
|
|
|
(if (null msg)
|
|
|
|
|
(message "%s" case)
|
|
|
|
|
(message "%s: %s" case (mapconcat 'prin1-to-string msg " ")))
|
|
|
|
|
(beep 1)))
|
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; List/alist utilities
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Convert LIST to an alist
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-list-to-alist (lst)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((alist))
|
|
|
|
|
(while lst
|
|
|
|
|
(setq alist (cons (list (car lst)) alist))
|
|
|
|
|
(setq lst (cdr lst)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
alist))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Convert ALIST to a list.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-alist-to-list (alst)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((lst))
|
|
|
|
|
(while alst
|
|
|
|
|
(setq lst (cons (car (car alst)) lst))
|
|
|
|
|
(setq alst (cdr alst)))
|
|
|
|
|
lst))
|
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Filter ALIST using REGEXP. Return alist whose elements match the regexp.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-filter-alist (regexp alst)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(interactive "s x")
|
|
|
|
|
(let ((outalst) (inalst alst))
|
|
|
|
|
(while (car inalst)
|
|
|
|
|
(if (string-match regexp (car (car inalst)))
|
|
|
|
|
(setq outalst (cons (car inalst) outalst)))
|
|
|
|
|
(setq inalst (cdr inalst)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
outalst))
|
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Filter LIST using REGEXP. Return list whose elements match the regexp.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-filter-list (regexp lst)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(interactive "s x")
|
|
|
|
|
(let ((outlst) (inlst lst))
|
|
|
|
|
(while (car inlst)
|
|
|
|
|
(if (string-match regexp (car inlst))
|
|
|
|
|
(setq outlst (cons (car inlst) outlst)))
|
|
|
|
|
(setq inlst (cdr inlst)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
outlst))
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; Append LIS2 to LIS1, both alists, by side-effect and returns LIS1
|
|
|
|
|
;; LIS2 is modified by filtering it: deleting its members of the form
|
|
|
|
|
;; \(car elt\) such that (car elt') is in LIS1.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-append-filter-alist (lis1 lis2)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((temp lis1)
|
|
|
|
|
elt)
|
|
|
|
|
;;filter-append the second list
|
|
|
|
|
(while temp
|
|
|
|
|
;; delete all occurrences
|
|
|
|
|
(while (setq elt (assoc (car (car temp)) lis2))
|
|
|
|
|
(setq lis2 (delq elt lis2)))
|
|
|
|
|
(setq temp (cdr temp)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(nconc lis1 lis2)))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
* viper-util.el: Spaces, indentation.
* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;;; Support for :e, :r, :w file globbing
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Glob the file spec.
|
|
|
|
|
;; This function is designed to work under Unix. It might also work under VMS.
|
|
|
|
|
(defun viper-glob-unix-files (filespec)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(let ((gshell
|
|
|
|
|
(cond (ex-unix-type-shell shell-file-name)
|
|
|
|
|
((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VAX VMS
|
|
|
|
|
(t "sh"))) ; probably Unix anyway
|
|
|
|
|
(gshell-options
|
|
|
|
|
;; using cond in anticipation of further additions
|
|
|
|
|
(cond (ex-unix-type-shell-options)
|
|
|
|
|
))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(command (cond (viper-ms-style-os-p (format "\"ls -1 -d %s\"" filespec))
|
1996-09-06 02:13:39 +00:00
|
|
|
|
(t (format "ls -1 -d %s" filespec))))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
status)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(save-excursion
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(set-buffer (get-buffer-create viper-ex-tmp-buf-name))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(setq status
|
|
|
|
|
(if gshell-options
|
|
|
|
|
(call-process gshell nil t nil
|
|
|
|
|
gshell-options
|
|
|
|
|
"-c"
|
|
|
|
|
command)
|
|
|
|
|
(call-process gshell nil t nil
|
|
|
|
|
"-c"
|
|
|
|
|
command)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; Issue an error, if no match.
|
2004-01-03 12:12:01 +00:00
|
|
|
|
(unless (eq 0 status)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-forward " \t\n\j")
|
|
|
|
|
(if (looking-at "ls:")
|
|
|
|
|
(viper-forward-Word 1))
|
|
|
|
|
(error "%s: %s"
|
|
|
|
|
(if (stringp gshell)
|
|
|
|
|
gshell
|
|
|
|
|
"shell")
|
|
|
|
|
(buffer-substring (point) (viper-line-pos 'end)))
|
|
|
|
|
))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(goto-char (point-min))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(viper-get-filenames-from-buffer 'one-per-line))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Interpret the stuff in the buffer as a list of file names
|
|
|
|
|
;; return a list of file names listed in the buffer beginning at point
|
|
|
|
|
;; If optional arg is supplied, assume each filename is listed on a separate
|
|
|
|
|
;; line
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-get-filenames-from-buffer (&optional one-per-line)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(let ((skip-chars (if one-per-line "\t\n" " \t\n"))
|
|
|
|
|
result fname delim)
|
|
|
|
|
(skip-chars-forward skip-chars)
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(if (cond ((looking-at "\"")
|
|
|
|
|
(setq delim ?\")
|
|
|
|
|
(re-search-forward "[^\"]+" nil t)) ; noerror
|
|
|
|
|
((looking-at "'")
|
|
|
|
|
(setq delim ?')
|
|
|
|
|
(re-search-forward "[^']+" nil t)) ; noerror
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(t
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(re-search-forward
|
|
|
|
|
(concat "[^" skip-chars "]+") nil t))) ;noerror
|
|
|
|
|
(setq fname
|
|
|
|
|
(buffer-substring (match-beginning 0) (match-end 0))))
|
|
|
|
|
(if delim
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(setq result (cons fname result)))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
;; convert MS-DOS wildcards to regexp
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-wildcard-to-regexp (wcard)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(save-excursion
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(set-buffer (get-buffer-create viper-ex-tmp-buf-name))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert wcard)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(skip-chars-forward "^*?.\\\\")
|
|
|
|
|
(cond ((eq (char-after (point)) ?*) (insert ".")(forward-char 1))
|
|
|
|
|
((eq (char-after (point)) ?.) (insert "\\")(forward-char 1))
|
|
|
|
|
((eq (char-after (point)) ?\\) (insert "\\")(forward-char 1))
|
|
|
|
|
((eq (char-after (point)) ??) (delete-char 1)(insert ".")))
|
|
|
|
|
)
|
|
|
|
|
(buffer-string)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; glob windows files
|
|
|
|
|
;; LIST is expected to be in reverse order
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(defun viper-glob-mswindows-files (filespec)
|
|
|
|
|
(let ((case-fold-search t)
|
|
|
|
|
tmp tmp2)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(save-excursion
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(set-buffer (get-buffer-create viper-ex-tmp-buf-name))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert filespec)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(setq tmp (viper-get-filenames-from-buffer))
|
|
|
|
|
(while tmp
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq tmp2 (cons (directory-files
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; the directory part
|
|
|
|
|
(or (file-name-directory (car tmp))
|
|
|
|
|
"")
|
|
|
|
|
t ; return full names
|
|
|
|
|
;; the regexp part: globs the file names
|
|
|
|
|
(concat "^"
|
|
|
|
|
(viper-wildcard-to-regexp
|
|
|
|
|
(file-name-nondirectory (car tmp)))
|
|
|
|
|
"$"))
|
|
|
|
|
tmp2))
|
|
|
|
|
(setq tmp (cdr tmp)))
|
|
|
|
|
(reverse (apply 'append tmp2)))))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; Insertion ring
|
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Rotate RING's index. DIRection can be positive or negative.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-ring-rotate1 (ring dir)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(if (and (ring-p ring) (> (ring-length ring) 0))
|
|
|
|
|
(progn
|
|
|
|
|
(setcar ring (cond ((> dir 0)
|
|
|
|
|
(ring-plus1 (car ring) (ring-length ring)))
|
|
|
|
|
((< dir 0)
|
|
|
|
|
(ring-minus1 (car ring) (ring-length ring)))
|
|
|
|
|
;; don't rotate if dir = 0
|
|
|
|
|
(t (car ring))))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-current-ring-item ring)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-special-ring-rotate1 (ring dir)
|
|
|
|
|
(if (memq viper-intermediate-command
|
1995-02-20 23:15:10 +00:00
|
|
|
|
'(repeating-display-destructive-command
|
|
|
|
|
repeating-insertion-from-ring))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-ring-rotate1 ring dir)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; don't rotate otherwise
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-ring-rotate1 ring 0)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; current ring item; if N is given, then so many items back from the
|
|
|
|
|
;; current
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-current-ring-item (ring &optional n)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(setq n (or n 0))
|
|
|
|
|
(if (and (ring-p ring) (> (ring-length ring) 0))
|
|
|
|
|
(aref (cdr (cdr ring)) (mod (- (car ring) 1 n) (ring-length ring)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Push item onto ring. The second argument is a ring-variable, not value.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-push-onto-ring (item ring-var)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(or (ring-p (eval ring-var))
|
|
|
|
|
(set ring-var (make-ring (eval (intern (format "%S-size" ring-var))))))
|
|
|
|
|
(or (null item) ; don't push nil
|
|
|
|
|
(and (stringp item) (string= item "")) ; or empty strings
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(equal item (viper-current-ring-item (eval ring-var))) ; or old stuff
|
|
|
|
|
;; Since viper-set-destructive-command checks if we are inside
|
|
|
|
|
;; viper-repeat, we don't check whether this-command-keys is a `.'. The
|
|
|
|
|
;; cmd viper-repeat makes a call to the current function only if `.' is
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; executing a command from the command history. It doesn't call the
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; push-onto-ring function if `.' is simply repeating the last
|
|
|
|
|
;; destructive command. We only check for ESC (which happens when we do
|
|
|
|
|
;; insert with a prefix argument, or if this-command-keys doesn't give
|
|
|
|
|
;; anything meaningful (in that case we don't know what to show to the
|
|
|
|
|
;; user).
|
|
|
|
|
(and (eq ring-var 'viper-command-ring)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(string-match "\\([0-9]*\e\\|^[ \t]*$\\|escape\\)"
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-array-to-string (this-command-keys))))
|
|
|
|
|
(viper-ring-insert (eval ring-var) item))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; removing elts from ring seems to break it
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-cleanup-ring (ring)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(or (< (ring-length ring) 2)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(null (viper-current-ring-item ring))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; last and previous equal
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (equal (viper-current-ring-item ring)
|
|
|
|
|
(viper-current-ring-item ring 1))
|
|
|
|
|
(viper-ring-pop ring))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; ring-remove seems to be buggy, so we concocted this for our purposes.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-ring-pop (ring)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let* ((ln (ring-length ring))
|
|
|
|
|
(vec (cdr (cdr ring)))
|
|
|
|
|
(veclen (length vec))
|
|
|
|
|
(hd (car ring))
|
|
|
|
|
(idx (max 0 (ring-minus1 hd ln)))
|
|
|
|
|
(top-elt (aref vec idx)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; shift elements
|
|
|
|
|
(while (< (1+ idx) veclen)
|
|
|
|
|
(aset vec idx (aref vec (1+ idx)))
|
|
|
|
|
(setq idx (1+ idx)))
|
|
|
|
|
(aset vec idx nil)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(setq hd (max 0 (ring-minus1 hd ln)))
|
|
|
|
|
(if (= hd (1- ln)) (setq hd 0))
|
|
|
|
|
(setcar ring hd) ; move head
|
|
|
|
|
(setcar (cdr ring) (max 0 (1- ln))) ; adjust length
|
|
|
|
|
top-elt
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-ring-insert (ring item)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let* ((ln (ring-length ring))
|
|
|
|
|
(vec (cdr (cdr ring)))
|
|
|
|
|
(veclen (length vec))
|
|
|
|
|
(hd (car ring))
|
|
|
|
|
(vecpos-after-hd (if (= hd 0) ln hd))
|
|
|
|
|
(idx ln))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(if (= ln veclen)
|
|
|
|
|
(progn
|
|
|
|
|
(aset vec hd item) ; hd is always 1+ the actual head index in vec
|
|
|
|
|
(setcar ring (ring-plus1 hd ln)))
|
|
|
|
|
(setcar (cdr ring) (1+ ln))
|
|
|
|
|
(setcar ring (ring-plus1 vecpos-after-hd (1+ ln)))
|
|
|
|
|
(while (and (>= idx vecpos-after-hd) (> ln 0))
|
|
|
|
|
(aset vec idx (aref vec (1- idx)))
|
|
|
|
|
(setq idx (1- idx)))
|
|
|
|
|
(aset vec vecpos-after-hd item))
|
|
|
|
|
item))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; String utilities
|
|
|
|
|
|
|
|
|
|
;; If STRING is longer than MAX-LEN, truncate it and print ...... instead
|
|
|
|
|
;; PRE-STRING is a string to prepend to the abbrev string.
|
|
|
|
|
;; POST-STRING is a string to append to the abbrev string.
|
|
|
|
|
;; ABBREV_SIGN is a string to be inserted before POST-STRING
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; if the orig string was truncated.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-abbreviate-string (string max-len
|
1995-02-20 23:15:10 +00:00
|
|
|
|
pre-string post-string abbrev-sign)
|
|
|
|
|
(let (truncated-str)
|
|
|
|
|
(setq truncated-str
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(if (stringp string)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(substring string 0 (min max-len (length string)))))
|
|
|
|
|
(cond ((null truncated-str) "")
|
|
|
|
|
((> (length string) max-len)
|
|
|
|
|
(format "%s%s%s%s"
|
|
|
|
|
pre-string truncated-str abbrev-sign post-string))
|
|
|
|
|
(t (format "%s%s%s" pre-string truncated-str post-string)))))
|
1995-06-13 21:20:59 +00:00
|
|
|
|
|
|
|
|
|
;; tells if we are over a whitespace-only line
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-over-whitespace-line ()
|
1995-06-13 21:20:59 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(looking-at "^[ \t]*$")))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; Saving settings in custom file
|
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Save the current setting of VAR in CUSTOM-FILE.
|
|
|
|
|
;; If given, MESSAGE is a message to be displayed after that.
|
|
|
|
|
;; This message is erased after 2 secs, if erase-msg is non-nil.
|
|
|
|
|
;; Arguments: var message custom-file &optional erase-message
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-save-setting (var message custom-file &optional erase-msg)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let* ((var-name (symbol-name var))
|
|
|
|
|
(var-val (if (boundp var) (eval var)))
|
|
|
|
|
(regexp (format "^[^;]*%s[ \t\n]*[a-zA-Z---_']*[ \t\n)]" var-name))
|
|
|
|
|
(buf (find-file-noselect (substitute-in-file-name custom-file)))
|
|
|
|
|
)
|
1996-01-26 23:34:09 +00:00
|
|
|
|
(message message)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (re-search-forward regexp nil t)
|
|
|
|
|
(let ((reg-end (1- (match-end 0))))
|
|
|
|
|
(search-backward var-name)
|
|
|
|
|
(delete-region (match-beginning 0) reg-end)
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(insert (format "%s '%S" var-name var-val)))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if (not (bolp)) (insert "\n"))
|
|
|
|
|
(insert (format "(setq %s '%S)\n" var-name var-val)))
|
|
|
|
|
(save-buffer))
|
|
|
|
|
(kill-buffer buf)
|
|
|
|
|
(if erase-msg
|
|
|
|
|
(progn
|
|
|
|
|
(sit-for 2)
|
|
|
|
|
(message "")))
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; Save STRING in CUSTOM-FILE. If PATTERN is non-nil, remove strings that
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; match this pattern.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-save-string-in-file (string custom-file &optional pattern)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((buf (find-file-noselect (substitute-in-file-name custom-file))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buf)
|
1998-05-04 22:42:59 +00:00
|
|
|
|
(let (buffer-read-only)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if pattern (delete-matching-lines pattern))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if string (insert string))
|
|
|
|
|
(save-buffer)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(kill-buffer buf)
|
|
|
|
|
))
|
1998-05-04 22:42:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; define remote file test
|
2005-02-19 19:32:47 +00:00
|
|
|
|
(defun viper-file-remote-p (file-name)
|
|
|
|
|
(file-remote-p file-name))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1998-05-04 22:42:59 +00:00
|
|
|
|
|
|
|
|
|
;; This is a simple-minded check for whether a file is under version control.
|
|
|
|
|
;; If file,v exists but file doesn't, this file is considered to be not checked
|
|
|
|
|
;; in and not checked out for the purpose of patching (since patch won't be
|
|
|
|
|
;; able to read such a file anyway).
|
|
|
|
|
;; FILE is a string representing file name
|
|
|
|
|
;;(defun viper-file-under-version-control (file)
|
|
|
|
|
;; (let* ((filedir (file-name-directory file))
|
|
|
|
|
;; (file-nondir (file-name-nondirectory file))
|
|
|
|
|
;; (trial (concat file-nondir ",v"))
|
|
|
|
|
;; (full-trial (concat filedir trial))
|
|
|
|
|
;; (full-rcs-trial (concat filedir "RCS/" trial)))
|
|
|
|
|
;; (and (stringp file)
|
|
|
|
|
;; (file-exists-p file)
|
|
|
|
|
;; (or
|
|
|
|
|
;; (and
|
|
|
|
|
;; (file-exists-p full-trial)
|
|
|
|
|
;; ;; in FAT FS, `file,v' and `file' may turn out to be the same!
|
|
|
|
|
;; ;; don't be fooled by this!
|
|
|
|
|
;; (not (equal (file-attributes file)
|
|
|
|
|
;; (file-attributes full-trial))))
|
|
|
|
|
;; ;; check if a version is in RCS/ directory
|
|
|
|
|
;; (file-exists-p full-rcs-trial)))
|
|
|
|
|
;; ))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defsubst viper-file-checked-in-p (file)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(and (featurep 'vc-hooks)
|
|
|
|
|
;; CVS files are considered not checked in
|
|
|
|
|
(not (memq (vc-backend file) '(nil CVS)))
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
(if (fboundp 'vc-state)
|
2001-08-07 14:41:37 +00:00
|
|
|
|
(and
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
(not (memq (vc-state file) '(edited needs-merge)))
|
|
|
|
|
(not (stringp (vc-state file))))
|
|
|
|
|
;; XEmacs has no vc-state
|
|
|
|
|
(not (vc-locking-user file)))
|
|
|
|
|
))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
|
1998-05-04 22:42:59 +00:00
|
|
|
|
;; checkout if visited file is checked in
|
|
|
|
|
(defun viper-maybe-checkout (buf)
|
|
|
|
|
(let ((file (expand-file-name (buffer-file-name buf)))
|
|
|
|
|
(checkout-function (key-binding "\C-x\C-q")))
|
|
|
|
|
(if (and (viper-file-checked-in-p file)
|
|
|
|
|
(or (beep 1) t)
|
|
|
|
|
(y-or-n-p
|
|
|
|
|
(format
|
1999-11-01 07:16:15 +00:00
|
|
|
|
"File %s is checked in. Check it out? "
|
1998-05-04 22:42:59 +00:00
|
|
|
|
(viper-abbreviate-file-name file))))
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
(command-execute checkout-function)))))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;;; Overlays
|
2000-04-07 16:10:04 +00:00
|
|
|
|
(defun viper-put-on-search-overlay (beg end)
|
|
|
|
|
(if (viper-overlay-p viper-search-overlay)
|
|
|
|
|
(viper-move-overlay viper-search-overlay beg end)
|
|
|
|
|
(setq viper-search-overlay (viper-make-overlay beg end (current-buffer)))
|
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-search-overlay 'priority viper-search-overlay-priority))
|
|
|
|
|
(viper-overlay-put viper-search-overlay 'face viper-search-face))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; Search
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-flash-search-pattern ()
|
2000-04-07 16:10:04 +00:00
|
|
|
|
(if (not (viper-has-face-support-p))
|
|
|
|
|
nil
|
|
|
|
|
(viper-put-on-search-overlay (match-beginning 0) (match-end 0))
|
|
|
|
|
(sit-for 2)
|
|
|
|
|
(viper-overlay-put viper-search-overlay 'face nil)))
|
|
|
|
|
|
|
|
|
|
(defun viper-hide-search-overlay ()
|
|
|
|
|
(if (not (viper-overlay-p viper-search-overlay))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(progn
|
2000-04-07 16:10:04 +00:00
|
|
|
|
(setq viper-search-overlay
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(viper-make-overlay (point-min) (point-min) (current-buffer)))
|
2000-04-07 16:10:04 +00:00
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-search-overlay 'priority viper-search-overlay-priority)))
|
|
|
|
|
(viper-overlay-put viper-search-overlay 'face nil))
|
1996-09-06 02:13:39 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Replace state
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-move-replace-overlay (beg end)
|
|
|
|
|
(viper-move-overlay viper-replace-overlay beg end))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-set-replace-overlay (beg end)
|
2000-02-28 06:16:44 +00:00
|
|
|
|
(if (viper-overlay-live-p viper-replace-overlay)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-move-replace-overlay beg end)
|
|
|
|
|
(setq viper-replace-overlay (viper-make-overlay beg end (current-buffer)))
|
1996-03-29 01:02:28 +00:00
|
|
|
|
;; never detach
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-replace-overlay (if viper-emacs-p 'evaporate 'detachable) nil)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(viper-overlay-put
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-replace-overlay 'priority viper-replace-overlay-priority)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; If Emacs will start supporting overlay maps, as it currently supports
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;; text-property maps, we could do away with viper-replace-minor-mode and
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; just have keymap attached to replace overlay.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;;(viper-overlay-put
|
|
|
|
|
;; viper-replace-overlay
|
|
|
|
|
;; (if viper-xemacs-p 'keymap 'local-map)
|
|
|
|
|
;; viper-replace-map)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (viper-has-face-support-p)
|
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-replace-overlay 'face viper-replace-overlay-face))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(viper-save-cursor-color 'before-replace-mode)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-change-cursor-color viper-replace-overlay-cursor-color)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-set-replace-overlay-glyphs (before-glyph after-glyph)
|
2000-02-28 06:16:44 +00:00
|
|
|
|
(or (viper-overlay-live-p viper-replace-overlay)
|
|
|
|
|
(viper-set-replace-overlay (point-min) (point-min)))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (or (not (viper-has-face-support-p))
|
|
|
|
|
viper-use-replace-region-delimiters)
|
|
|
|
|
(let ((before-name (if viper-xemacs-p 'begin-glyph 'before-string))
|
|
|
|
|
(after-name (if viper-xemacs-p 'end-glyph 'after-string)))
|
|
|
|
|
(viper-overlay-put viper-replace-overlay before-name before-glyph)
|
|
|
|
|
(viper-overlay-put viper-replace-overlay after-name after-glyph))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-hide-replace-overlay ()
|
|
|
|
|
(viper-set-replace-overlay-glyphs nil nil)
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(viper-restore-cursor-color 'after-replace-mode)
|
|
|
|
|
(viper-restore-cursor-color 'after-insert-mode)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (viper-has-face-support-p)
|
|
|
|
|
(viper-overlay-put viper-replace-overlay 'face nil)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-replace-start ()
|
|
|
|
|
(viper-overlay-start viper-replace-overlay))
|
|
|
|
|
(defsubst viper-replace-end ()
|
|
|
|
|
(viper-overlay-end viper-replace-overlay))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
;; Minibuffer
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-set-minibuffer-overlay ()
|
|
|
|
|
(viper-check-minibuffer-overlay)
|
|
|
|
|
(if (viper-has-face-support-p)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(progn
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-minibuffer-overlay 'face viper-minibuffer-current-face)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(viper-overlay-put
|
1997-08-02 07:40:22 +00:00
|
|
|
|
viper-minibuffer-overlay 'priority viper-minibuffer-overlay-priority)
|
1996-03-29 01:02:28 +00:00
|
|
|
|
;; never detach
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-overlay-put
|
|
|
|
|
viper-minibuffer-overlay
|
|
|
|
|
(if viper-emacs-p 'evaporate 'detachable)
|
|
|
|
|
nil)
|
|
|
|
|
;; make viper-minibuffer-overlay open-ended
|
1996-01-20 03:19:26 +00:00
|
|
|
|
;; In emacs, it is made open ended at creation time
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if viper-xemacs-p
|
1996-03-29 01:02:28 +00:00
|
|
|
|
(progn
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-overlay-put viper-minibuffer-overlay 'start-open nil)
|
|
|
|
|
(viper-overlay-put viper-minibuffer-overlay 'end-open nil)))
|
1996-01-20 03:19:26 +00:00
|
|
|
|
)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-check-minibuffer-overlay ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(if (viper-overlay-live-p viper-minibuffer-overlay)
|
|
|
|
|
(viper-move-overlay
|
|
|
|
|
viper-minibuffer-overlay
|
|
|
|
|
(if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1)
|
|
|
|
|
(1+ (buffer-size)))
|
|
|
|
|
(setq viper-minibuffer-overlay
|
|
|
|
|
(if viper-xemacs-p
|
|
|
|
|
(viper-make-overlay 1 (1+ (buffer-size)) (current-buffer))
|
|
|
|
|
;; make overlay open-ended
|
|
|
|
|
(viper-make-overlay
|
|
|
|
|
(if (fboundp 'minibuffer-prompt-end) (minibuffer-prompt-end) 1)
|
|
|
|
|
(1+ (buffer-size))
|
|
|
|
|
(current-buffer) nil 'rear-advance)))
|
|
|
|
|
))
|
1996-01-20 03:19:26 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-is-in-minibuffer ()
|
1998-05-04 22:42:59 +00:00
|
|
|
|
(save-match-data
|
|
|
|
|
(string-match "\*Minibuf-" (buffer-name))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; XEmacs compatibility
|
1996-02-16 05:25:08 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-abbreviate-file-name (file)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
;; XEmacs requires addl argument
|
|
|
|
|
(abbreviate-file-name file t)
|
|
|
|
|
;; emacs
|
|
|
|
|
(abbreviate-file-name file)
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
;; Sit for VAL milliseconds. XEmacs doesn't support the millisecond arg
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; in sit-for, so this function smoothes out the differences.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-sit-for-short (val &optional nodisp)
|
|
|
|
|
(if viper-xemacs-p
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(sit-for (/ val 1000.0) nodisp)
|
|
|
|
|
(sit-for 0 val nodisp)))
|
|
|
|
|
|
|
|
|
|
;; EVENT may be a single event of a sequence of events
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-ESC-event-p (event)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let ((ESC-keys '(?\e (control \[) escape))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(key (viper-event-key event)))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(member key ESC-keys)))
|
1997-05-31 00:02:53 +00:00
|
|
|
|
|
|
|
|
|
;; checks if object is a marker, has a buffer, and points to within that buffer
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-valid-marker (marker)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(if (and (markerp marker) (marker-buffer marker))
|
|
|
|
|
(let ((buf (marker-buffer marker))
|
|
|
|
|
(pos (marker-position marker)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(and (<= pos (point-max)) (<= (point-min) pos))))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-mark-marker ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(mark-marker t) ; xemacs
|
|
|
|
|
(mark-marker) ; emacs
|
|
|
|
|
))
|
1996-03-29 01:02:28 +00:00
|
|
|
|
|
|
|
|
|
;; like (set-mark-command nil) but doesn't push twice, if (car mark-ring)
|
|
|
|
|
;; is the same as (mark t).
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-set-mark-if-necessary ()
|
|
|
|
|
(setq mark-ring (delete (viper-mark-marker) mark-ring))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
(set-mark-command nil)
|
|
|
|
|
(setq viper-saved-mark (point)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; In transient mark mode (zmacs mode), it is annoying when regions become
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; highlighted due to Viper's pushing marks. So, we deactivate marks, unless
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; the user explicitly wants highlighting, e.g., by hitting '' or ``
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-deactivate-mark ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(zmacs-deactivate-region)
|
|
|
|
|
(deactivate-mark)
|
|
|
|
|
))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-leave-region-active ()
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(setq zmacs-region-stays t)
|
|
|
|
|
nil
|
|
|
|
|
))
|
1995-08-20 04:31:46 +00:00
|
|
|
|
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; Check if arg is a valid character for register
|
|
|
|
|
;; TYPE is a list that can contain `letter', `Letter', and `digit'.
|
|
|
|
|
;; Letter means lowercase letters, Letter means uppercase letters, and
|
|
|
|
|
;; digit means digits from 1 to 9.
|
|
|
|
|
;; If TYPE is nil, then down/uppercase letters and digits are allowed.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-valid-register (reg &optional type)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(or type (setq type '(letter Letter digit)))
|
|
|
|
|
(or (if (memq 'letter type)
|
|
|
|
|
(and (<= ?a reg) (<= reg ?z)))
|
|
|
|
|
(if (memq 'digit type)
|
|
|
|
|
(and (<= ?1 reg) (<= reg ?9)))
|
|
|
|
|
(if (memq 'Letter type)
|
|
|
|
|
(and (<= ?A reg) (<= reg ?Z)))
|
|
|
|
|
))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1997-05-31 00:02:53 +00:00
|
|
|
|
;; it is suggested that an event must be copied before it is assigned to
|
|
|
|
|
;; last-command-event in XEmacs
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-copy-event (event)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(copy-event event) ; xemacs
|
|
|
|
|
event ; emacs
|
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
;; Uses different timeouts for ESC-sequences and others
|
|
|
|
|
(defsubst viper-fast-keysequence-p ()
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(not (viper-sit-for-short
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(if (viper-ESC-event-p last-input-event)
|
|
|
|
|
viper-ESC-keyseq-timeout
|
|
|
|
|
viper-fast-keyseq-timeout)
|
|
|
|
|
t)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; like read-event, but in XEmacs also try to convert to char, if possible
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-read-event-convert-to-char ()
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let (event)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(progn
|
|
|
|
|
(setq event (next-command-event))
|
|
|
|
|
(or (event-to-character event)
|
|
|
|
|
event))
|
|
|
|
|
(read-event)
|
|
|
|
|
)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
))
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
;; Viperized read-key-sequence
|
|
|
|
|
(defun viper-read-key-sequence (prompt &optional continue-echo)
|
|
|
|
|
(let (inhibit-quit event keyseq)
|
|
|
|
|
(setq keyseq (read-key-sequence prompt continue-echo))
|
|
|
|
|
(setq event (if viper-xemacs-p
|
|
|
|
|
(elt keyseq 0) ; XEmacs returns vector of events
|
|
|
|
|
(elt (listify-key-sequence keyseq) 0)))
|
|
|
|
|
(if (viper-ESC-event-p event)
|
|
|
|
|
(let (unread-command-events)
|
|
|
|
|
(if (viper-fast-keysequence-p)
|
|
|
|
|
(let ((viper-vi-global-user-minor-mode nil)
|
|
|
|
|
(viper-vi-local-user-minor-mode nil)
|
2002-02-10 06:46:12 +00:00
|
|
|
|
(viper-vi-intercept-minor-mode nil)
|
|
|
|
|
(viper-insert-intercept-minor-mode nil)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-replace-minor-mode nil) ; actually unnecessary
|
|
|
|
|
(viper-insert-global-user-minor-mode nil)
|
|
|
|
|
(viper-insert-local-user-minor-mode nil))
|
2002-02-10 06:46:12 +00:00
|
|
|
|
;; Note: set unread-command-events only after testing for fast
|
|
|
|
|
;; keysequence. Otherwise, viper-fast-keysequence-p will be
|
|
|
|
|
;; always t -- whether there is anything after ESC or not
|
|
|
|
|
(viper-set-unread-command-events keyseq)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq keyseq (read-key-sequence nil)))
|
2002-02-10 06:46:12 +00:00
|
|
|
|
(viper-set-unread-command-events keyseq)
|
|
|
|
|
(setq keyseq (read-key-sequence nil)))))
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
keyseq))
|
|
|
|
|
|
|
|
|
|
|
1995-07-27 19:40:33 +00:00
|
|
|
|
;; This function lets function-key-map convert key sequences into logical
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; keys. This does a better job than viper-read-event when it comes to kbd
|
1996-07-01 02:34:51 +00:00
|
|
|
|
;; macros, since it enables certain macros to be shared between X and TTY modes
|
|
|
|
|
;; by correctly mapping key sequences for Left/Right/... (one an ascii
|
|
|
|
|
;; terminal) into logical keys left, right, etc.
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(defun viper-read-key ()
|
|
|
|
|
(let ((overriding-local-map viper-overriding-map)
|
1996-07-01 02:34:51 +00:00
|
|
|
|
(inhibit-quit t)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
help-char key)
|
|
|
|
|
(use-global-map viper-overriding-map)
|
1997-08-07 04:48:48 +00:00
|
|
|
|
(unwind-protect
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq key (elt (viper-read-key-sequence nil) 0))
|
1997-08-07 04:48:48 +00:00
|
|
|
|
(use-global-map global-map))
|
1996-07-01 02:34:51 +00:00
|
|
|
|
key))
|
1995-07-27 19:40:33 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
1995-06-09 00:11:53 +00:00
|
|
|
|
;; Emacs has a bug in eventp, which causes (eventp nil) to return (nil)
|
1996-02-16 19:01:53 +00:00
|
|
|
|
;; instead of nil, if '(nil) was previously inadvertently assigned to
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; unread-command-events
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-event-key (event)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(or (and event (eventp event))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(error "viper-event-key: Wrong type argument, eventp, %S" event))
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(when (viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(or (key-press-event-p event) (mouse-event-p event)) ; xemacs
|
|
|
|
|
t ; emacs
|
|
|
|
|
)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(let ((mod (event-modifiers event))
|
|
|
|
|
basis)
|
|
|
|
|
(setq basis
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
;; XEmacs
|
|
|
|
|
(cond ((key-press-event-p event)
|
|
|
|
|
(event-key event))
|
|
|
|
|
((button-event-p event)
|
|
|
|
|
(concat "mouse-" (prin1-to-string (event-button event))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(t
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(error "viper-event-key: Unknown event, %S" event)))
|
|
|
|
|
;; Emacs doesn't handle capital letters correctly, since
|
|
|
|
|
;; \S-a isn't considered the same as A (it behaves as
|
|
|
|
|
;; plain `a' instead). So we take care of this here
|
|
|
|
|
(cond ((and (viper-characterp event) (<= ?A event) (<= event ?Z))
|
|
|
|
|
(setq mod nil
|
|
|
|
|
event event))
|
|
|
|
|
;; Emacs has the oddity whereby characters 128+char
|
|
|
|
|
;; represent M-char *if* this appears inside a string.
|
|
|
|
|
;; So, we convert them manually to (meta char).
|
|
|
|
|
((and (viper-characterp event)
|
|
|
|
|
(< ?\C-? event) (<= event 255))
|
|
|
|
|
(setq mod '(meta)
|
|
|
|
|
event (- event ?\C-? 1)))
|
|
|
|
|
((and (null mod) (eq event 'return))
|
|
|
|
|
(setq event ?\C-m))
|
|
|
|
|
((and (null mod) (eq event 'space))
|
|
|
|
|
(setq event ?\ ))
|
|
|
|
|
((and (null mod) (eq event 'delete))
|
|
|
|
|
(setq event ?\C-?))
|
|
|
|
|
((and (null mod) (eq event 'backspace))
|
|
|
|
|
(setq event ?\C-h))
|
|
|
|
|
(t (event-basic-type event)))
|
|
|
|
|
) ; viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (viper-characterp basis)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(setq basis
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(if (viper= basis ?\C-?)
|
1997-05-31 00:02:53 +00:00
|
|
|
|
(list 'control '\?) ; taking care of an emacs bug
|
|
|
|
|
(intern (char-to-string basis)))))
|
|
|
|
|
(if mod
|
|
|
|
|
(append mod (list basis))
|
|
|
|
|
basis))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-key-to-emacs-key (key)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let (key-name char-p modifiers mod-char-list base-key base-key-name)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond (viper-xemacs-p key)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
((symbolp key)
|
|
|
|
|
(setq key-name (symbol-name key))
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(cond ((= (length key-name) 1) ; character event
|
|
|
|
|
(string-to-char key-name))
|
|
|
|
|
;; Emacs doesn't recognize `return' and `escape' as events on
|
|
|
|
|
;; dumb terminals, so we translate them into characters
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((and viper-emacs-p (not (viper-window-display-p))
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(string= key-name "return"))
|
|
|
|
|
?\C-m)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((and viper-emacs-p (not (viper-window-display-p))
|
1997-07-17 19:37:07 +00:00
|
|
|
|
(string= key-name "escape"))
|
|
|
|
|
?\e)
|
|
|
|
|
;; pass symbol-event as is
|
|
|
|
|
(t key)))
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
((listp key)
|
2005-07-10 18:46:24 +00:00
|
|
|
|
(setq modifiers (viper-subseq key 0 (1- (length key)))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
base-key (viper-seq-last-elt key)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
base-key-name (symbol-name base-key)
|
|
|
|
|
char-p (= (length base-key-name) 1))
|
|
|
|
|
(setq mod-char-list
|
|
|
|
|
(mapcar
|
|
|
|
|
'(lambda (elt) (upcase (substring (symbol-name elt) 0 1)))
|
|
|
|
|
modifiers))
|
|
|
|
|
(if char-p
|
|
|
|
|
(setq key-name
|
|
|
|
|
(car (read-from-string
|
|
|
|
|
(concat
|
|
|
|
|
"?\\"
|
|
|
|
|
(mapconcat 'identity mod-char-list "-\\")
|
|
|
|
|
"-"
|
|
|
|
|
base-key-name))))
|
|
|
|
|
(setq key-name
|
|
|
|
|
(intern
|
|
|
|
|
(concat
|
|
|
|
|
(mapconcat 'identity mod-char-list "-")
|
|
|
|
|
"-"
|
|
|
|
|
base-key-name))))))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
;; LIS is assumed to be a list of events of characters
|
|
|
|
|
(defun viper-eventify-list-xemacs (lis)
|
|
|
|
|
(mapcar
|
|
|
|
|
(lambda (elt)
|
|
|
|
|
(cond ((viper-characterp elt) (character-to-event elt))
|
|
|
|
|
((eventp elt) elt)
|
|
|
|
|
(t (error
|
|
|
|
|
"viper-eventify-list-xemacs: can't convert to event, %S"
|
|
|
|
|
elt))))
|
|
|
|
|
lis))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
|
|
|
|
|
;; Smoothes out the difference between Emacs' unread-command-events
|
|
|
|
|
;; and XEmacs unread-command-event. Arg is a character, an event, a list of
|
|
|
|
|
;; events or a sequence of keys.
|
|
|
|
|
;;
|
|
|
|
|
;; Due to the way unread-command-events in Emacs (not XEmacs), a non-event
|
|
|
|
|
;; symbol in unread-command-events list may cause Emacs to turn this symbol
|
|
|
|
|
;; into an event. Below, we delete nil from event lists, since nil is the most
|
|
|
|
|
;; common symbol that might appear in this wrong context.
|
|
|
|
|
(defun viper-set-unread-command-events (arg)
|
|
|
|
|
(if viper-emacs-p
|
|
|
|
|
(setq
|
|
|
|
|
unread-command-events
|
|
|
|
|
(let ((new-events
|
|
|
|
|
(cond ((eventp arg) (list arg))
|
|
|
|
|
((listp arg) arg)
|
|
|
|
|
((sequencep arg)
|
|
|
|
|
(listify-key-sequence arg))
|
|
|
|
|
(t (error
|
|
|
|
|
"viper-set-unread-command-events: Invalid argument, %S"
|
|
|
|
|
arg)))))
|
|
|
|
|
(if (not (eventp nil))
|
|
|
|
|
(setq new-events (delq nil new-events)))
|
|
|
|
|
(append new-events unread-command-events)))
|
|
|
|
|
;; XEmacs
|
|
|
|
|
(setq
|
|
|
|
|
unread-command-events
|
|
|
|
|
(append
|
|
|
|
|
(cond ((viper-characterp arg) (list (character-to-event arg)))
|
|
|
|
|
((eventp arg) (list arg))
|
|
|
|
|
((stringp arg) (mapcar 'character-to-event arg))
|
|
|
|
|
((vectorp arg) (append arg nil)) ; turn into list
|
|
|
|
|
((listp arg) (viper-eventify-list-xemacs arg))
|
|
|
|
|
(t (error
|
|
|
|
|
"viper-set-unread-command-events: Invalid argument, %S" arg)))
|
|
|
|
|
unread-command-events))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Check if vec is a vector of key-press events representing characters
|
|
|
|
|
;; XEmacs only
|
|
|
|
|
(defun viper-event-vector-p (vec)
|
|
|
|
|
(and (vectorp vec)
|
|
|
|
|
(eval (cons 'and (mapcar '(lambda (elt) (if (eventp elt) t)) vec)))))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
;; check if vec is a vector of character symbols
|
|
|
|
|
(defun viper-char-symbol-sequence-p (vec)
|
|
|
|
|
(and
|
|
|
|
|
(sequencep vec)
|
|
|
|
|
(eval
|
|
|
|
|
(cons 'and
|
|
|
|
|
(mapcar (lambda (elt)
|
|
|
|
|
(and (symbolp elt) (= (length (symbol-name elt)) 1)))
|
|
|
|
|
vec)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(defun viper-char-array-p (array)
|
|
|
|
|
(eval (cons 'and (mapcar 'viper-characterp array))))
|
|
|
|
|
|
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; Args can be a sequence of events, a string, or a Viper macro. Will try to
|
|
|
|
|
;; convert events to keys and, if all keys are regular printable
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; characters, will return a string. Otherwise, will return a string
|
|
|
|
|
;; representing a vector of converted events. If the input was a Viper macro,
|
1995-02-20 23:15:10 +00:00
|
|
|
|
;; will return a string that represents this macro as a vector.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-array-to-string (event-seq)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(let (temp temp2)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(cond ((stringp event-seq) event-seq)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((viper-event-vector-p event-seq)
|
|
|
|
|
(setq temp (mapcar 'viper-event-key event-seq))
|
|
|
|
|
(cond ((viper-char-symbol-sequence-p temp)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(mapconcat 'symbol-name temp ""))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((and (viper-char-array-p
|
|
|
|
|
(setq temp2 (mapcar 'viper-key-to-character temp))))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(mapconcat 'char-to-string temp2 ""))
|
|
|
|
|
(t (prin1-to-string (vconcat temp)))))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((viper-char-symbol-sequence-p event-seq)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(mapconcat 'symbol-name event-seq ""))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
((and (vectorp event-seq)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-char-array-p
|
|
|
|
|
(setq temp (mapcar 'viper-key-to-character event-seq))))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(mapconcat 'char-to-string temp ""))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(t (prin1-to-string event-seq)))))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-key-press-events-to-chars (events)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
(mapconcat (viper-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(lambda (elt) (char-to-string (event-to-character elt))) ; xemacs
|
|
|
|
|
'char-to-string ; emacs
|
|
|
|
|
)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
events
|
|
|
|
|
""))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-read-char-exclusive ()
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(let (char
|
|
|
|
|
(echo-keystrokes 1))
|
|
|
|
|
(while (null char)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(setq char (read-char))
|
|
|
|
|
(error
|
|
|
|
|
;; skip event if not char
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-read-event))))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
char))
|
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
|
;; key is supposed to be in viper's representation, e.g., (control l), a
|
|
|
|
|
;; character, etc.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-key-to-character (key)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
(cond ((eq key 'space) ?\ )
|
|
|
|
|
((eq key 'delete) ?\C-?)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
((eq key 'return) ?\C-m)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
((eq key 'backspace) ?\C-h)
|
|
|
|
|
((and (symbolp key)
|
|
|
|
|
(= 1 (length (symbol-name key))))
|
|
|
|
|
(string-to-char (symbol-name key)))
|
|
|
|
|
((and (listp key)
|
|
|
|
|
(eq (car key) 'control)
|
|
|
|
|
(symbol-name (nth 1 key))
|
|
|
|
|
(= 1 (length (symbol-name (nth 1 key)))))
|
|
|
|
|
(read (format "?\\C-%s" (symbol-name (nth 1 key)))))
|
|
|
|
|
(t key)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-setup-master-buffer (&rest other-files-or-buffers)
|
1995-02-20 23:15:10 +00:00
|
|
|
|
"Set up the current buffer as a master buffer.
|
1999-11-01 07:16:15 +00:00
|
|
|
|
Arguments become related buffers. This function should normally be used in
|
1995-02-20 23:15:10 +00:00
|
|
|
|
the `Local variables' section of a file."
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq viper-related-files-and-buffers-ring
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(make-ring (1+ (length other-files-or-buffers))))
|
|
|
|
|
(mapcar '(lambda (elt)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-ring-insert viper-related-files-and-buffers-ring elt))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
other-files-or-buffers)
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-ring-insert viper-related-files-and-buffers-ring (buffer-name))
|
1995-02-20 23:15:10 +00:00
|
|
|
|
)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
|
|
|
|
;;; Movement utilities
|
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
;; Characters that should not be considered as part of the word, in reformed-vi
|
|
|
|
|
;; syntax mode.
|
|
|
|
|
(defconst viper-non-word-characters-reformed-vi
|
|
|
|
|
"!@#$%^&*()-+=|\\~`{}[];:'\",<.>/?")
|
|
|
|
|
;; These are characters that are not to be considered as parts of a word in
|
|
|
|
|
;; Viper.
|
|
|
|
|
;; Set each time state changes and at loading time
|
|
|
|
|
(viper-deflocalvar viper-non-word-characters nil)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
;; must be buffer-local
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-deflocalvar viper-ALPHA-char-class "w"
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"String of syntax classes characterizing Viper's alphanumeric symbols.
|
|
|
|
|
In addition, the symbol `_' may be considered alphanumeric if
|
1997-08-22 03:15:57 +00:00
|
|
|
|
`viper-syntax-preference' is `strict-vi' or `reformed-vi'.")
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defconst viper-strict-ALPHA-chars "a-zA-Z0-9_"
|
|
|
|
|
"Regexp matching the set of alphanumeric characters acceptable to strict
|
|
|
|
|
Vi.")
|
|
|
|
|
(defconst viper-strict-SEP-chars " \t\n"
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"Regexp matching the set of alphanumeric characters acceptable to strict
|
|
|
|
|
Vi.")
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defconst viper-strict-SEP-chars-sans-newline " \t"
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"Regexp matching the set of alphanumeric characters acceptable to strict
|
|
|
|
|
Vi.")
|
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defconst viper-SEP-char-class " -"
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"String of syntax classes for Vi separators.
|
|
|
|
|
Usually contains ` ', linefeed, TAB or formfeed.")
|
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
|
|
|
|
|
;; Set Viper syntax classes and related variables according to
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; `viper-syntax-preference'.
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defun viper-update-syntax-classes (&optional set-default)
|
|
|
|
|
(let ((preference (cond ((eq viper-syntax-preference 'emacs)
|
|
|
|
|
"w") ; Viper words have only Emacs word chars
|
|
|
|
|
((eq viper-syntax-preference 'extended)
|
|
|
|
|
"w_") ; Viper words have Emacs word & symbol chars
|
|
|
|
|
(t "w"))) ; Viper words are Emacs words plus `_'
|
|
|
|
|
(non-word-chars (cond ((eq viper-syntax-preference 'reformed-vi)
|
|
|
|
|
(viper-string-to-list
|
|
|
|
|
viper-non-word-characters-reformed-vi))
|
|
|
|
|
(t nil))))
|
|
|
|
|
(if set-default
|
|
|
|
|
(setq-default viper-ALPHA-char-class preference
|
|
|
|
|
viper-non-word-characters non-word-chars)
|
|
|
|
|
(setq viper-ALPHA-char-class preference
|
|
|
|
|
viper-non-word-characters non-word-chars))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
;; SYMBOL is used because customize requires it, but it is ignored, unless it
|
1999-11-01 07:16:15 +00:00
|
|
|
|
;; is `nil'. If nil, use setq.
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(defun viper-set-syntax-preference (&optional symbol value)
|
|
|
|
|
"Set Viper syntax preference.
|
|
|
|
|
If called interactively or if SYMBOL is nil, sets syntax preference in current
|
1999-11-01 07:16:15 +00:00
|
|
|
|
buffer. If called non-interactively, preferably via the customization widget,
|
1997-08-22 03:15:57 +00:00
|
|
|
|
sets the default value."
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(interactive)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(or value
|
|
|
|
|
(setq value
|
|
|
|
|
(completing-read
|
|
|
|
|
"Viper syntax preference: "
|
|
|
|
|
'(("strict-vi") ("reformed-vi") ("extended") ("emacs"))
|
|
|
|
|
nil 'require-match)))
|
|
|
|
|
(if (stringp value) (setq value (intern value)))
|
|
|
|
|
(or (memq value '(strict-vi reformed-vi extended emacs))
|
|
|
|
|
(error "Invalid Viper syntax preference, %S" value))
|
|
|
|
|
(if symbol
|
|
|
|
|
(setq-default viper-syntax-preference value)
|
|
|
|
|
(setq viper-syntax-preference value))
|
|
|
|
|
(viper-update-syntax-classes))
|
|
|
|
|
|
|
|
|
|
(defcustom viper-syntax-preference 'reformed-vi
|
|
|
|
|
"*Syntax type characterizing Viper's alphanumeric symbols.
|
|
|
|
|
Affects movement and change commands that deal with Vi-style words.
|
|
|
|
|
Works best when set in the hooks to various major modes.
|
|
|
|
|
|
|
|
|
|
`strict-vi' means Viper words are (hopefully) exactly as in Vi.
|
|
|
|
|
|
|
|
|
|
`reformed-vi' means Viper words are like Emacs words \(as determined using
|
|
|
|
|
Emacs syntax tables, which are different for different major modes\) with two
|
|
|
|
|
exceptions: the symbol `_' is always part of a word and typical Vi non-word
|
|
|
|
|
symbols, such as `,',:,\",),{, etc., are excluded.
|
|
|
|
|
This behaves very close to `strict-vi', but also works well with non-ASCII
|
|
|
|
|
characters from various alphabets.
|
|
|
|
|
|
|
|
|
|
`extended' means Viper word constituents are symbols that are marked as being
|
|
|
|
|
parts of words OR symbols in Emacs syntax tables.
|
|
|
|
|
This is most appropriate for major modes intended for editing programs.
|
|
|
|
|
|
|
|
|
|
`emacs' means Viper words are the same as Emacs words as specified by Emacs
|
|
|
|
|
syntax tables.
|
|
|
|
|
This option is appropriate if you like Emacs-style words."
|
2003-02-04 13:24:35 +00:00
|
|
|
|
:type '(radio (const strict-vi) (const reformed-vi)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(const extended) (const emacs))
|
|
|
|
|
:set 'viper-set-syntax-preference
|
|
|
|
|
:group 'viper)
|
|
|
|
|
(make-variable-buffer-local 'viper-syntax-preference)
|
|
|
|
|
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
|
|
|
|
;; addl-chars are characters to be temporarily considered as alphanumerical
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-looking-at-alpha (&optional addl-chars)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(or (stringp addl-chars) (setq addl-chars ""))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (eq viper-syntax-preference 'reformed-vi)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(setq addl-chars (concat addl-chars "_")))
|
|
|
|
|
(let ((char (char-after (point))))
|
|
|
|
|
(if char
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
|
|
|
|
(looking-at (concat "[" viper-strict-ALPHA-chars addl-chars "]"))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(or
|
|
|
|
|
;; or one of the additional chars being asked to include
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(viper-memq-char char (viper-string-to-list addl-chars))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(and
|
2000-10-29 04:56:45 +00:00
|
|
|
|
;; not one of the excluded word chars (note:
|
|
|
|
|
;; viper-non-word-characters is a list)
|
|
|
|
|
(not (viper-memq-char char viper-non-word-characters))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
;; char of the Viper-word syntax class
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(viper-memq-char (char-syntax char)
|
|
|
|
|
(viper-string-to-list viper-ALPHA-char-class))))))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
))
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-looking-at-separator ()
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(let ((char (char-after (point))))
|
|
|
|
|
(if char
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(viper-memq-char char (viper-string-to-list viper-strict-SEP-chars))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(or (eq char ?\n) ; RET is always a separator in Vi
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(viper-memq-char (char-syntax char)
|
|
|
|
|
(viper-string-to-list viper-SEP-char-class)))))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-looking-at-alphasep (&optional addl-chars)
|
|
|
|
|
(or (viper-looking-at-separator) (viper-looking-at-alpha addl-chars)))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-alpha-forward (&optional addl-chars)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(or (stringp addl-chars) (setq addl-chars ""))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-skip-syntax
|
2003-02-04 13:24:35 +00:00
|
|
|
|
'forward
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq viper-syntax-preference 'strict-vi)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
(t viper-ALPHA-char-class))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq viper-syntax-preference 'strict-vi)
|
|
|
|
|
(concat viper-strict-ALPHA-chars addl-chars))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(t addl-chars))))
|
|
|
|
|
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-alpha-backward (&optional addl-chars)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(or (stringp addl-chars) (setq addl-chars ""))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-skip-syntax
|
2003-02-04 13:24:35 +00:00
|
|
|
|
'backward
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq viper-syntax-preference 'strict-vi)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
"")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
(t viper-ALPHA-char-class))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(cond ((eq viper-syntax-preference 'strict-vi)
|
|
|
|
|
(concat viper-strict-ALPHA-chars addl-chars))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(t addl-chars))))
|
|
|
|
|
|
|
|
|
|
;; weird syntax tables may confuse strict-vi style
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-skip-all-separators-forward (&optional within-line)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(if within-line
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(skip-chars-forward viper-strict-SEP-chars-sans-newline)
|
|
|
|
|
(skip-chars-forward viper-strict-SEP-chars))
|
|
|
|
|
(viper-skip-syntax 'forward
|
|
|
|
|
viper-SEP-char-class
|
|
|
|
|
(or within-line "\n")
|
|
|
|
|
(if within-line (viper-line-pos 'end)))))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defsubst viper-skip-all-separators-backward (&optional within-line)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(if within-line
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(skip-chars-backward viper-strict-SEP-chars-sans-newline)
|
|
|
|
|
(skip-chars-backward viper-strict-SEP-chars))
|
|
|
|
|
(viper-skip-syntax 'backward
|
|
|
|
|
viper-SEP-char-class
|
|
|
|
|
(or within-line "\n")
|
|
|
|
|
(if within-line (viper-line-pos 'start)))))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-nonseparators (direction)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(viper-skip-syntax
|
|
|
|
|
direction
|
|
|
|
|
(concat "^" viper-SEP-char-class)
|
|
|
|
|
nil
|
|
|
|
|
(viper-line-pos (if (eq direction 'forward) 'end 'start))))
|
|
|
|
|
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
1997-08-22 03:15:57 +00:00
|
|
|
|
;; skip over non-word constituents and non-separators
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-nonalphasep-forward ()
|
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(skip-chars-forward
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(concat "^" viper-strict-SEP-chars viper-strict-ALPHA-chars))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(viper-skip-syntax
|
|
|
|
|
'forward
|
|
|
|
|
(concat "^" viper-ALPHA-char-class viper-SEP-char-class)
|
|
|
|
|
;; Emacs may consider some of these as words, but we don't want them
|
2003-02-04 13:24:35 +00:00
|
|
|
|
viper-non-word-characters
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(viper-line-pos 'end))))
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-nonalphasep-backward ()
|
|
|
|
|
(if (eq viper-syntax-preference 'strict-vi)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(skip-chars-backward
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(concat "^" viper-strict-SEP-chars viper-strict-ALPHA-chars))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(viper-skip-syntax
|
|
|
|
|
'backward
|
|
|
|
|
(concat "^" viper-ALPHA-char-class viper-SEP-char-class)
|
|
|
|
|
;; Emacs may consider some of these as words, but we don't want them
|
|
|
|
|
viper-non-word-characters
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(viper-line-pos 'start))))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
|
|
|
|
|
;; Skip SYNTAX like skip-syntax-* and ADDL-CHARS like skip-chars-*
|
|
|
|
|
;; Return the number of chars traveled.
|
1997-08-22 03:15:57 +00:00
|
|
|
|
;; Both SYNTAX or ADDL-CHARS can be strings or lists of characters.
|
|
|
|
|
;; When SYNTAX is "w", then viper-non-word-characters are not considered to be
|
|
|
|
|
;; words, even if Emacs syntax table says they are.
|
1997-08-02 07:40:22 +00:00
|
|
|
|
(defun viper-skip-syntax (direction syntax addl-chars &optional limit)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(let ((total 0)
|
|
|
|
|
(local 1)
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(skip-chars-func
|
|
|
|
|
(if (eq direction 'forward)
|
|
|
|
|
'skip-chars-forward 'skip-chars-backward))
|
|
|
|
|
(skip-syntax-func
|
|
|
|
|
(if (eq direction 'forward)
|
|
|
|
|
'viper-forward-char-carefully 'viper-backward-char-carefully))
|
|
|
|
|
char-looked-at syntax-of-char-looked-at negated-syntax)
|
|
|
|
|
(setq addl-chars
|
|
|
|
|
(cond ((listp addl-chars) (viper-charlist-to-string addl-chars))
|
|
|
|
|
((stringp addl-chars) addl-chars)
|
|
|
|
|
(t "")))
|
|
|
|
|
(setq syntax
|
|
|
|
|
(cond ((listp syntax) syntax)
|
|
|
|
|
((stringp syntax) (viper-string-to-list syntax))
|
|
|
|
|
(t nil)))
|
|
|
|
|
(if (memq ?^ syntax) (setq negated-syntax t))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(while (and (not (= local 0))
|
|
|
|
|
(cond ((eq direction 'forward)
|
1998-05-30 14:29:25 +00:00
|
|
|
|
(not (eobp)))
|
|
|
|
|
(t (not (bobp)))))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(setq char-looked-at (viper-char-at-pos direction)
|
|
|
|
|
;; if outside the range, set to nil
|
|
|
|
|
syntax-of-char-looked-at (if char-looked-at
|
|
|
|
|
(char-syntax char-looked-at)))
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(setq local
|
1997-08-22 03:15:57 +00:00
|
|
|
|
(+ (if (and
|
|
|
|
|
(cond ((and limit (eq direction 'forward))
|
|
|
|
|
(< (point) limit))
|
|
|
|
|
(limit ; backward & limit
|
|
|
|
|
(> (point) limit))
|
|
|
|
|
(t t)) ; no limit
|
|
|
|
|
;; char under/before cursor has appropriate syntax
|
|
|
|
|
(if negated-syntax
|
|
|
|
|
(not (memq syntax-of-char-looked-at syntax))
|
|
|
|
|
(memq syntax-of-char-looked-at syntax))
|
|
|
|
|
;; if char-syntax class is "word", make sure it is not one
|
|
|
|
|
;; of the excluded characters
|
|
|
|
|
(if (and (eq syntax-of-char-looked-at ?w)
|
|
|
|
|
(not negated-syntax))
|
2000-10-29 04:56:45 +00:00
|
|
|
|
(not (viper-memq-char
|
|
|
|
|
char-looked-at viper-non-word-characters))
|
1997-08-22 03:15:57 +00:00
|
|
|
|
t))
|
|
|
|
|
(funcall skip-syntax-func 1)
|
|
|
|
|
0)
|
1995-10-14 02:27:42 +00:00
|
|
|
|
(funcall skip-chars-func addl-chars limit)))
|
|
|
|
|
(setq total (+ total local)))
|
|
|
|
|
total
|
|
|
|
|
))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2005-07-10 18:46:24 +00:00
|
|
|
|
;; this is copied from cl-extra.el
|
|
|
|
|
;; Return the subsequence of SEQ from START to END.
|
|
|
|
|
;; If END is omitted, it defaults to the length of the sequence.
|
|
|
|
|
;; If START or END is negative, it counts from the end.
|
|
|
|
|
(defun viper-subseq (seq start &optional end)
|
|
|
|
|
(if (stringp seq) (substring seq start end)
|
|
|
|
|
(let (len)
|
|
|
|
|
(and end (< end 0) (setq end (+ end (setq len (length seq)))))
|
|
|
|
|
(if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
|
|
|
|
|
(cond ((listp seq)
|
|
|
|
|
(if (> start 0) (setq seq (nthcdr start seq)))
|
|
|
|
|
(if end
|
|
|
|
|
(let ((res nil))
|
|
|
|
|
(while (>= (setq end (1- end)) start)
|
|
|
|
|
(push (pop seq) res))
|
|
|
|
|
(nreverse res))
|
|
|
|
|
(copy-sequence seq)))
|
|
|
|
|
(t
|
|
|
|
|
(or end (setq end (or len (length seq))))
|
|
|
|
|
(let ((res (make-vector (max (- end start) 0) nil))
|
|
|
|
|
(i 0))
|
|
|
|
|
(while (< start end)
|
|
|
|
|
(aset res i (aref seq start))
|
|
|
|
|
(setq i (1+ i) start (1+ start)))
|
|
|
|
|
res))))))
|
|
|
|
|
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1995-02-20 23:15:10 +00:00
|
|
|
|
(provide 'viper-util)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
|
|
|
|
|
|
;;; Local Variables:
|
1997-08-02 07:40:22 +00:00
|
|
|
|
;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
;;; End:
|
1995-02-20 23:15:10 +00:00
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
|
;;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; viper-util.el ends here
|