1992-07-14 19:42:01 +00:00
|
|
|
|
;;; vip.el --- a VI Package for GNU Emacs
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2019 Free Software
|
2015-01-01 22:26:41 +00:00
|
|
|
|
;; Foundation, Inc.
|
1998-05-07 22:28:23 +00:00
|
|
|
|
|
1992-07-14 19:42:01 +00:00
|
|
|
|
;; Author: Masahiko Sato <ms@sail.stanford.edu>
|
1992-07-17 18:53:44 +00:00
|
|
|
|
;; Keywords: emulations
|
2014-06-02 01:02:21 +00:00
|
|
|
|
;; Obsolete-since: 24.5
|
1992-07-14 19:42:01 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 03:28:01 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:28:01 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
|
|
|
|
;; 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
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
1992-07-14 19:42:01 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2014-06-02 01:02:21 +00:00
|
|
|
|
;; This file is obsolete. Consider using viper instead.
|
|
|
|
|
|
1993-03-22 22:44:33 +00:00
|
|
|
|
;; A full-featured vi(1) emulator.
|
|
|
|
|
;;
|
1992-07-14 19:42:01 +00:00
|
|
|
|
;; In Japan, the author's address is: masahiko@sato.riec.tohoku.junet
|
|
|
|
|
;;
|
1988-02-11 06:40:33 +00:00
|
|
|
|
;; Send suggestions and bug reports to one of the above addresses.
|
|
|
|
|
;; When you report a bug, be sure to include the version number of VIP and
|
|
|
|
|
;; Emacs you are using.
|
|
|
|
|
|
|
|
|
|
;; Execute info command by typing "M-x info" to get information on VIP.
|
|
|
|
|
|
1992-07-14 19:42:01 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defgroup vip nil
|
|
|
|
|
"A VI Package for GNU Emacs."
|
|
|
|
|
:prefix "vip-"
|
|
|
|
|
:group 'emulations)
|
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
;; external variables
|
|
|
|
|
|
|
|
|
|
(defvar vip-emacs-local-map nil
|
2006-11-06 02:33:15 +00:00
|
|
|
|
"Local map used in Emacs mode. (Buffer-specific.)")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-insert-local-map nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Local map used in insert command mode. (Buffer-specific.)")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(make-variable-buffer-local 'vip-emacs-local-map)
|
|
|
|
|
(make-variable-buffer-local 'vip-insert-local-map)
|
|
|
|
|
|
|
|
|
|
(defvar vip-insert-point nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Remember insert point as a marker. (Buffer-specific.)")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(set-default 'vip-insert-point (make-marker))
|
|
|
|
|
(make-variable-buffer-local 'vip-insert-point)
|
|
|
|
|
|
|
|
|
|
(defvar vip-com-point nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Remember com point as a marker. (Buffer-specific.)")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(set-default 'vip-com-point (make-marker))
|
|
|
|
|
(make-variable-buffer-local 'vip-com-point)
|
|
|
|
|
|
|
|
|
|
(defvar vip-current-mode nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Current mode. One of `emacs-mode', `vi-mode', `insert-mode'.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(make-variable-buffer-local 'vip-current-mode)
|
|
|
|
|
(setq-default vip-current-mode 'emacs-mode)
|
|
|
|
|
|
|
|
|
|
(defvar vip-emacs-mode-line-buffer-identification nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Value of mode-line-buffer-identification in Emacs mode within vip.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(make-variable-buffer-local 'vip-emacs-mode-line-buffer-identification)
|
|
|
|
|
(setq-default vip-emacs-mode-line-buffer-identification
|
|
|
|
|
'("Emacs: %17b"))
|
|
|
|
|
|
|
|
|
|
(defvar vip-current-major-mode nil
|
|
|
|
|
"vip-current-major-mode is the major-mode vi considers it is now.
|
|
|
|
|
\(buffer specific\)")
|
|
|
|
|
|
|
|
|
|
(make-variable-buffer-local 'vip-current-major-mode)
|
|
|
|
|
|
|
|
|
|
(defvar vip-last-shell-com nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Last shell command executed by ! command.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-use-register nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Name of register to store deleted or yanked strings.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-d-com nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"How to reexecute last destructive command. Value is list (M-COM VAL COM).")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-shift-width 8
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"The number of columns shifted by > and < command."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-re-replace nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t then do regexp replace, if nil then do string replace."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-d-char nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"The character remembered by the vi \"r\" command.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-f-char nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"For use by \";\" command.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-F-char nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"For use by \".\" command.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-f-forward nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"For use by \";\" command.")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defvar vip-f-offset nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"For use by \";\" command.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-search-wrap-around t
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t, search wraps around."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-re-search nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t, search is reg-exp search, otherwise vanilla search."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-s-string nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Last vip search string.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-s-forward nil
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"If t, search is forward.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-case-fold-search nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t, search ignores cases."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-re-query-replace nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t then do regexp replace, if nil then do string replace."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-open-with-indent nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t, indent when open a new line."
|
1998-04-17 17:24:17 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1998-04-17 17:24:17 +00:00
|
|
|
|
(defcustom vip-help-in-insert-mode nil
|
Remove leading `*' from docs of some defcustoms etc.
* emulation/crisp.el, emulation/cua-base.el, emulation/edt.el:
* emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el:
* international/kkc.el, international/ogonek.el, mail/feedmail.el:
* net/browse-url.el, net/eudc-vars.el, net/net-utils.el:
* net/rcompile.el, net/rlogin.el, textmodes/enriched.el:
* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el:
* textmodes/refer.el, textmodes/spell.el, textmodes/table.el:
* textmodes/tex-mode.el, textmodes/two-column.el:
Remove leading `*' from docs of defcustoms etc.
2010-09-23 06:42:45 +00:00
|
|
|
|
"If t then C-h is bound to help-command in insert mode.
|
1998-04-17 17:24:17 +00:00
|
|
|
|
If nil then it is bound to `delete-backward-char'."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'vip)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-quote-string "> "
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"String inserted at the beginning of region.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar vip-tags-file-name "TAGS")
|
|
|
|
|
|
|
|
|
|
(defvar vip-inhibit-startup-message nil)
|
1996-01-01 23:40:10 +00:00
|
|
|
|
|
2013-03-12 02:08:21 +00:00
|
|
|
|
(defvar vip-startup-file (locate-user-emacs-file "vip" ".vip")
|
1996-10-12 02:39:33 +00:00
|
|
|
|
"Filename used as startup file for vip.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1997-06-23 19:18:36 +00:00
|
|
|
|
;; key bindings
|
|
|
|
|
|
Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.
2011-02-10 16:56:00 +00:00
|
|
|
|
(defvar vip-mode-map
|
|
|
|
|
(let ((map (make-keymap)))
|
|
|
|
|
(define-key map "\C-a" 'beginning-of-line)
|
|
|
|
|
(define-key map "\C-b" 'vip-scroll-back)
|
|
|
|
|
(define-key map "\C-c" 'vip-ctl-c)
|
|
|
|
|
(define-key map "\C-d" 'vip-scroll-up)
|
|
|
|
|
(define-key map "\C-e" 'vip-scroll-up-one)
|
|
|
|
|
(define-key map "\C-f" 'vip-scroll)
|
|
|
|
|
(define-key map "\C-g" 'vip-keyboard-quit)
|
|
|
|
|
(define-key map "\C-h" 'help-command)
|
|
|
|
|
(define-key map "\C-m" 'vip-scroll-back)
|
|
|
|
|
(define-key map "\C-n" 'vip-other-window)
|
|
|
|
|
(define-key map "\C-o" 'vip-open-line-at-point)
|
|
|
|
|
(define-key map "\C-u" 'vip-scroll-down)
|
|
|
|
|
(define-key map "\C-x" 'vip-ctl-x)
|
|
|
|
|
(define-key map "\C-y" 'vip-scroll-down-one)
|
|
|
|
|
(define-key map "\C-z" 'vip-change-mode-to-emacs)
|
|
|
|
|
(define-key map "\e" 'vip-ESC)
|
|
|
|
|
|
2013-02-12 04:46:18 +00:00
|
|
|
|
(define-key map [?\S-\ ] 'vip-scroll-back)
|
Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.
2011-02-10 16:56:00 +00:00
|
|
|
|
(define-key map " " 'vip-scroll)
|
|
|
|
|
(define-key map "!" 'vip-command-argument)
|
|
|
|
|
(define-key map "\"" 'vip-command-argument)
|
|
|
|
|
(define-key map "#" 'vip-command-argument)
|
|
|
|
|
(define-key map "$" 'vip-goto-eol)
|
|
|
|
|
(define-key map "%" 'vip-paren-match)
|
|
|
|
|
(define-key map "&" 'vip-nil)
|
|
|
|
|
(define-key map "'" 'vip-goto-mark-and-skip-white)
|
|
|
|
|
(define-key map "(" 'vip-backward-sentence)
|
|
|
|
|
(define-key map ")" 'vip-forward-sentence)
|
|
|
|
|
(define-key map "*" 'call-last-kbd-macro)
|
|
|
|
|
(define-key map "+" 'vip-next-line-at-bol)
|
|
|
|
|
(define-key map "," 'vip-repeat-find-opposite)
|
|
|
|
|
(define-key map "-" 'vip-previous-line-at-bol)
|
|
|
|
|
(define-key map "." 'vip-repeat)
|
|
|
|
|
(define-key map "/" 'vip-search-forward)
|
|
|
|
|
|
|
|
|
|
(define-key map "0" 'vip-beginning-of-line)
|
|
|
|
|
(define-key map "1" 'vip-digit-argument)
|
|
|
|
|
(define-key map "2" 'vip-digit-argument)
|
|
|
|
|
(define-key map "3" 'vip-digit-argument)
|
|
|
|
|
(define-key map "4" 'vip-digit-argument)
|
|
|
|
|
(define-key map "5" 'vip-digit-argument)
|
|
|
|
|
(define-key map "6" 'vip-digit-argument)
|
|
|
|
|
(define-key map "7" 'vip-digit-argument)
|
|
|
|
|
(define-key map "8" 'vip-digit-argument)
|
|
|
|
|
(define-key map "9" 'vip-digit-argument)
|
|
|
|
|
|
|
|
|
|
(define-key map ":" 'vip-ex)
|
|
|
|
|
(define-key map ";" 'vip-repeat-find)
|
|
|
|
|
(define-key map "<" 'vip-command-argument)
|
|
|
|
|
(define-key map "=" 'vip-command-argument)
|
|
|
|
|
(define-key map ">" 'vip-command-argument)
|
|
|
|
|
(define-key map "?" 'vip-search-backward)
|
|
|
|
|
(define-key map "@" 'vip-nil)
|
|
|
|
|
|
|
|
|
|
(define-key map "A" 'vip-Append)
|
|
|
|
|
(define-key map "B" 'vip-backward-Word)
|
|
|
|
|
(define-key map "C" 'vip-ctl-c-equivalent)
|
|
|
|
|
(define-key map "D" 'vip-kill-line)
|
|
|
|
|
(define-key map "E" 'vip-end-of-Word)
|
|
|
|
|
(define-key map "F" 'vip-find-char-backward)
|
|
|
|
|
(define-key map "G" 'vip-goto-line)
|
|
|
|
|
(define-key map "H" 'vip-window-top)
|
|
|
|
|
(define-key map "I" 'vip-Insert)
|
|
|
|
|
(define-key map "J" 'vip-join-lines)
|
|
|
|
|
(define-key map "K" 'vip-kill-buffer)
|
|
|
|
|
(define-key map "L" 'vip-window-bottom)
|
|
|
|
|
(define-key map "M" 'vip-window-middle)
|
|
|
|
|
(define-key map "N" 'vip-search-Next)
|
|
|
|
|
(define-key map "O" 'vip-Open-line)
|
|
|
|
|
(define-key map "P" 'vip-Put-back)
|
|
|
|
|
(define-key map "Q" 'vip-query-replace)
|
|
|
|
|
(define-key map "R" 'vip-replace-string)
|
|
|
|
|
(define-key map "S" 'vip-switch-to-buffer-other-window)
|
|
|
|
|
(define-key map "T" 'vip-goto-char-backward)
|
|
|
|
|
(define-key map "U" 'vip-nil)
|
|
|
|
|
(define-key map "V" 'vip-find-file-other-window)
|
|
|
|
|
(define-key map "W" 'vip-forward-Word)
|
|
|
|
|
(define-key map "X" 'vip-ctl-x-equivalent)
|
|
|
|
|
(define-key map "Y" 'vip-yank-line)
|
|
|
|
|
(define-key map "ZZ" 'save-buffers-kill-emacs)
|
|
|
|
|
|
|
|
|
|
(define-key map "[" 'vip-nil)
|
|
|
|
|
(define-key map "\\" 'vip-escape-to-emacs)
|
|
|
|
|
(define-key map "]" 'vip-nil)
|
|
|
|
|
(define-key map "^" 'vip-bol-and-skip-white)
|
|
|
|
|
(define-key map "_" 'vip-nil)
|
|
|
|
|
(define-key map "`" 'vip-goto-mark)
|
|
|
|
|
|
|
|
|
|
(define-key map "a" 'vip-append)
|
|
|
|
|
(define-key map "b" 'vip-backward-word)
|
|
|
|
|
(define-key map "c" 'vip-command-argument)
|
|
|
|
|
(define-key map "d" 'vip-command-argument)
|
|
|
|
|
(define-key map "e" 'vip-end-of-word)
|
|
|
|
|
(define-key map "f" 'vip-find-char-forward)
|
|
|
|
|
(define-key map "g" 'vip-info-on-file)
|
|
|
|
|
(define-key map "h" 'vip-backward-char)
|
|
|
|
|
(define-key map "i" 'vip-insert)
|
|
|
|
|
(define-key map "j" 'vip-next-line)
|
|
|
|
|
(define-key map "k" 'vip-previous-line)
|
|
|
|
|
(define-key map "l" 'vip-forward-char)
|
|
|
|
|
(define-key map "m" 'vip-mark-point)
|
|
|
|
|
(define-key map "n" 'vip-search-next)
|
|
|
|
|
(define-key map "o" 'vip-open-line)
|
|
|
|
|
(define-key map "p" 'vip-put-back)
|
|
|
|
|
(define-key map "q" 'vip-nil)
|
|
|
|
|
(define-key map "r" 'vip-replace-char)
|
|
|
|
|
(define-key map "s" 'vip-switch-to-buffer)
|
|
|
|
|
(define-key map "t" 'vip-goto-char-forward)
|
|
|
|
|
(define-key map "u" 'vip-undo)
|
|
|
|
|
(define-key map "v" 'vip-find-file)
|
|
|
|
|
(define-key map "w" 'vip-forward-word)
|
|
|
|
|
(define-key map "x" 'vip-delete-char)
|
|
|
|
|
(define-key map "y" 'vip-command-argument)
|
|
|
|
|
(define-key map "zH" 'vip-line-to-top)
|
|
|
|
|
(define-key map "zM" 'vip-line-to-middle)
|
|
|
|
|
(define-key map "zL" 'vip-line-to-bottom)
|
|
|
|
|
(define-key map "z\C-m" 'vip-line-to-top)
|
|
|
|
|
(define-key map "z." 'vip-line-to-middle)
|
|
|
|
|
(define-key map "z-" 'vip-line-to-bottom)
|
|
|
|
|
|
|
|
|
|
(define-key map "{" 'vip-backward-paragraph)
|
|
|
|
|
(define-key map "|" 'vip-goto-col)
|
|
|
|
|
(define-key map "}" 'vip-forward-paragraph)
|
|
|
|
|
(define-key map "~" 'vip-nil)
|
|
|
|
|
(define-key map "\177" 'vip-delete-backward-char)
|
|
|
|
|
map))
|
1997-06-23 19:18:36 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-version ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(message "VIP version 3.5 of September 15, 1987"))
|
|
|
|
|
|
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
;; basic set up
|
|
|
|
|
|
2003-05-28 11:29:25 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun vip-setup ()
|
|
|
|
|
"Set up bindings for C-x 7 and C-z that are useful for VIP users."
|
|
|
|
|
(define-key ctl-x-map "7" 'vip-buffer-in-two-windows)
|
|
|
|
|
(global-set-key "\C-z" 'vip-change-mode-to-vi))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defmacro vip-loop (count body)
|
|
|
|
|
"(COUNT BODY) Execute BODY COUNT times."
|
2012-08-07 16:12:20 +00:00
|
|
|
|
`(let ((count ,count))
|
|
|
|
|
(while (> count 0)
|
|
|
|
|
,body
|
|
|
|
|
(setq count (1- count)))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-push-mark-silent (&optional location)
|
|
|
|
|
"Set mark at LOCATION (point, by default) and push old mark on mark ring.
|
|
|
|
|
No message."
|
1995-06-22 05:11:36 +00:00
|
|
|
|
(if (null (mark t))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
nil
|
|
|
|
|
(setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
|
|
|
|
|
(if (> (length mark-ring) mark-ring-max)
|
|
|
|
|
(progn
|
|
|
|
|
(move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
|
|
|
|
|
(setcdr (nthcdr (1- mark-ring-max) mark-ring) nil))))
|
|
|
|
|
(set-mark (or location (point))))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-col (arg)
|
|
|
|
|
"Go to ARG's column."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (> val (1+ (current-column))) (error "")))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(forward-char (1- val))
|
|
|
|
|
(if com (vip-execute-com 'vip-goto-col val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-copy-keymap (map)
|
|
|
|
|
(if (null map) (make-sparse-keymap) (copy-keymap map)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; changing mode
|
|
|
|
|
|
|
|
|
|
(defun vip-change-mode (new-mode)
|
1993-06-06 07:16:19 +00:00
|
|
|
|
"Change mode to NEW-MODE---either emacs-mode, vi-mode, or insert-mode."
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(or (eq new-mode vip-current-mode)
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((eq new-mode 'vi-mode)
|
|
|
|
|
(if (eq vip-current-mode 'insert-mode)
|
|
|
|
|
(progn
|
|
|
|
|
(vip-copy-region-as-kill (point) vip-insert-point)
|
|
|
|
|
(vip-repeat-insert-command))
|
|
|
|
|
(setq vip-emacs-local-map (current-local-map)
|
|
|
|
|
vip-emacs-mode-line-buffer-identification
|
|
|
|
|
mode-line-buffer-identification
|
|
|
|
|
vip-insert-local-map (vip-copy-keymap
|
|
|
|
|
(current-local-map))))
|
|
|
|
|
(vip-change-mode-line "Vi: ")
|
|
|
|
|
(use-local-map vip-mode-map))
|
|
|
|
|
((eq new-mode 'insert-mode)
|
|
|
|
|
(move-marker vip-insert-point (point))
|
|
|
|
|
(if (eq vip-current-mode 'emacs-mode)
|
|
|
|
|
(setq vip-emacs-local-map (current-local-map)
|
|
|
|
|
vip-emacs-mode-line-buffer-identification
|
|
|
|
|
mode-line-buffer-identification
|
|
|
|
|
vip-insert-local-map (vip-copy-keymap
|
|
|
|
|
(current-local-map)))
|
|
|
|
|
(setq vip-insert-local-map (vip-copy-keymap
|
|
|
|
|
vip-emacs-local-map)))
|
|
|
|
|
(vip-change-mode-line "Insert")
|
|
|
|
|
(use-local-map vip-insert-local-map)
|
|
|
|
|
(define-key vip-insert-local-map "\e" 'vip-change-mode-to-vi)
|
|
|
|
|
(define-key vip-insert-local-map "\C-z" 'vip-ESC)
|
|
|
|
|
(define-key vip-insert-local-map "\C-h"
|
|
|
|
|
(if vip-help-in-insert-mode 'help-command
|
|
|
|
|
'delete-backward-char))
|
|
|
|
|
(define-key vip-insert-local-map "\C-w"
|
|
|
|
|
'vip-delete-backward-word))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
((eq new-mode 'emacs-mode)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-change-mode-line "Emacs:")
|
|
|
|
|
(use-local-map vip-emacs-local-map)))
|
|
|
|
|
(setq vip-current-mode new-mode)
|
1995-04-25 22:23:48 +00:00
|
|
|
|
(force-mode-line-update))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-copy-region-as-kill (beg end)
|
|
|
|
|
"If BEG and END do not belong to the same buffer, it copies empty region."
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(copy-region-as-kill beg end)
|
|
|
|
|
(error (copy-region-as-kill beg beg))))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-mode-line (string)
|
|
|
|
|
"Assuming that the mode line format contains the string \"Emacs:\", this
|
|
|
|
|
function replaces the string by \"Vi: \" etc."
|
|
|
|
|
(setq mode-line-buffer-identification
|
|
|
|
|
(if (string= string "Emacs:")
|
|
|
|
|
vip-emacs-mode-line-buffer-identification
|
|
|
|
|
(list (concat string " %17b")))))
|
|
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
|
;;;###autoload
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-mode ()
|
|
|
|
|
"Turn on VIP emulation of VI."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not vip-inhibit-startup-message)
|
|
|
|
|
(progn
|
|
|
|
|
(switch-to-buffer "VIP Startup Message")
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert
|
|
|
|
|
"VIP is a Vi emulation package for GNU Emacs. VIP provides most Vi commands
|
|
|
|
|
including Ex commands. VIP is however different from Vi in several points.
|
|
|
|
|
You can get more information on VIP by:
|
|
|
|
|
1. Typing `M-x info' and selecting menu item \"vip\".
|
|
|
|
|
2. Typing `C-h k' followed by a key whose description you want.
|
|
|
|
|
3. Printing VIP manual which can be found as GNU/man/vip.texinfo
|
|
|
|
|
4. Printing VIP Reference Card which can be found as GNU/etc/vipcard.tex
|
|
|
|
|
|
|
|
|
|
This startup message appears whenever you load VIP unless you type `y' now.
|
|
|
|
|
Type `n' to quit this window for now.\n")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (y-or-n-p "Inhibit VIP startup message? ")
|
|
|
|
|
(progn
|
2011-12-04 08:02:42 +00:00
|
|
|
|
(with-current-buffer
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(find-file-noselect
|
|
|
|
|
(substitute-in-file-name vip-startup-file))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert "\n(setq vip-inhibit-startup-message t)\n")
|
|
|
|
|
(save-buffer)
|
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
|
(message "VIP startup message inhibited.")
|
|
|
|
|
(sit-for 2)))
|
|
|
|
|
(kill-buffer (current-buffer))
|
|
|
|
|
(message "")
|
|
|
|
|
(setq vip-inhibit-startup-message t)))
|
|
|
|
|
(vip-change-mode-to-vi))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-mode-to-vi ()
|
|
|
|
|
"Change mode to vi mode."
|
|
|
|
|
(interactive)
|
|
|
|
|
(vip-change-mode 'vi-mode))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-mode-to-insert ()
|
|
|
|
|
"Change mode to insert mode."
|
|
|
|
|
(interactive)
|
|
|
|
|
(vip-change-mode 'insert-mode))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-mode-to-emacs ()
|
2006-11-06 02:33:15 +00:00
|
|
|
|
"Change mode to Emacs mode."
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(vip-change-mode 'emacs-mode))
|
|
|
|
|
|
|
|
|
|
|
1993-03-22 22:44:33 +00:00
|
|
|
|
;; escape to emacs mode temporarily
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(defun vip-escape-to-emacs (arg &optional events)
|
|
|
|
|
"Escape to Emacs mode for one Emacs command.
|
|
|
|
|
ARG is used as the prefix value for the executed command. If
|
|
|
|
|
EVENTS is a list of events, which become the beginning of the command."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let (com key (old-map (current-local-map)))
|
2015-07-25 16:54:42 +00:00
|
|
|
|
(if events (setq unread-command-events
|
|
|
|
|
(append events unread-command-events)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq prefix-arg arg)
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(use-local-map vip-emacs-local-map)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(setq com (key-binding (setq key (read-key-sequence nil))))
|
|
|
|
|
(use-local-map old-map))
|
|
|
|
|
(command-execute com prefix-arg)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq prefix-arg nil) ;; reset prefix arg
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defun vip-message-conditions (conditions)
|
|
|
|
|
"Print CONDITIONS as a message."
|
|
|
|
|
(let ((case (car conditions)) (msg (cdr conditions)))
|
|
|
|
|
(if (null msg)
|
|
|
|
|
(message "%s" case)
|
|
|
|
|
(message "%s %s" case (prin1-to-string msg)))
|
|
|
|
|
(ding)))
|
|
|
|
|
|
|
|
|
|
(defun vip-ESC (arg)
|
|
|
|
|
"Emulate ESC key in Emacs mode."
|
|
|
|
|
(interactive "P")
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(vip-escape-to-emacs arg '(?\e)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-ctl-c (arg)
|
|
|
|
|
"Emulate C-c key in Emacs mode."
|
|
|
|
|
(interactive "P")
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(vip-escape-to-emacs arg '(?\C-c)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-ctl-x (arg)
|
|
|
|
|
"Emulate C-x key in Emacs mode."
|
|
|
|
|
(interactive "P")
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(vip-escape-to-emacs arg '(?\C-x)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-ctl-h (arg)
|
|
|
|
|
"Emulate C-h key in Emacs mode."
|
|
|
|
|
(interactive "P")
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(vip-escape-to-emacs arg '(?\C-h)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; prefix argument for vi mode
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
;; In vi mode, prefix argument is a dotted pair (NUM . COM) where NUM
|
|
|
|
|
;; represents the numeric value of the prefix argument and COM represents
|
|
|
|
|
;; command prefix such as "c", "d", "m" and "y".
|
|
|
|
|
|
|
|
|
|
(defun vip-prefix-arg-value (char value com)
|
|
|
|
|
"Compute numeric prefix arg value. Invoked by CHAR. VALUE is the value
|
|
|
|
|
obtained so far, and COM is the command part obtained so far."
|
|
|
|
|
(while (and (>= char ?0) (<= char ?9))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(setq value (+ (* (if (numberp value) value 0) 10) (- char ?0)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq char (read-char)))
|
|
|
|
|
(setq prefix-arg value)
|
|
|
|
|
(if com (setq prefix-arg (cons prefix-arg com)))
|
|
|
|
|
(while (= char ?U)
|
|
|
|
|
(vip-describe-arg prefix-arg)
|
|
|
|
|
(setq char (read-char)))
|
2015-07-25 16:54:42 +00:00
|
|
|
|
(push char unread-command-events))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-prefix-arg-com (char value com)
|
|
|
|
|
"Vi operator as prefix argument."
|
|
|
|
|
(let ((cont t))
|
|
|
|
|
(while (and cont
|
|
|
|
|
(or (= char ?c) (= char ?d) (= char ?y)
|
|
|
|
|
(= char ?!) (= char ?<) (= char ?>) (= char ?=)
|
|
|
|
|
(= char ?#) (= char ?r) (= char ?R) (= char ?\")))
|
|
|
|
|
(if com
|
|
|
|
|
;; this means that we already have a command character, so we
|
|
|
|
|
;; construct a com list and exit while. however, if char is "
|
|
|
|
|
;; it is an error.
|
|
|
|
|
(progn
|
|
|
|
|
;; new com is (CHAR . OLDCOM)
|
|
|
|
|
(if (or (= char ?#) (= char ?\")) (error ""))
|
|
|
|
|
(setq com (cons char com))
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
;; if com is nil we set com as char, and read more. again, if char
|
|
|
|
|
;; is ", we read the name of register and store it in vip-use-register.
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; if char is !, =, or #, a complete com is formed so we exit while.
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(cond ((or (= char ?!) (= char ?=))
|
|
|
|
|
(setq com char)
|
|
|
|
|
(setq char (read-char))
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
((= char ?#)
|
|
|
|
|
;; read a char and encode it as com
|
|
|
|
|
(setq com (+ 128 (read-char)))
|
|
|
|
|
(setq char (read-char))
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
((or (= char ?<) (= char ?>))
|
|
|
|
|
(setq com char)
|
|
|
|
|
(setq char (read-char))
|
|
|
|
|
(if (= com char) (setq com (cons char com)))
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
((= char ?\")
|
|
|
|
|
(let ((reg (read-char)))
|
|
|
|
|
(if (or (and (<= ?A reg) (<= reg ?z))
|
|
|
|
|
(and (<= ?1 reg) (<= reg ?9)))
|
|
|
|
|
(setq vip-use-register reg)
|
|
|
|
|
(error ""))
|
|
|
|
|
(setq char (read-char))))
|
|
|
|
|
(t
|
|
|
|
|
(setq com char)
|
|
|
|
|
(setq char (read-char)))))))
|
|
|
|
|
(if (atom com)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
;; com is a single char, so we construct prefix-arg
|
1988-02-11 06:40:33 +00:00
|
|
|
|
;; and if char is ?, describe prefix arg, otherwise exit by
|
|
|
|
|
;; pushing the char back
|
|
|
|
|
(progn
|
|
|
|
|
(setq prefix-arg (cons value com))
|
|
|
|
|
(while (= char ?U)
|
|
|
|
|
(vip-describe-arg prefix-arg)
|
|
|
|
|
(setq char (read-char)))
|
2015-07-25 16:54:42 +00:00
|
|
|
|
(push char unread-command-events))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
;; as com is non-nil, this means that we have a command to execute
|
|
|
|
|
(if (or (= (car com) ?r) (= (car com) ?R))
|
1996-01-04 23:51:47 +00:00
|
|
|
|
;; execute appropriate region command.
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(let ((char (car com)) (com (cdr com)))
|
|
|
|
|
(setq prefix-arg (cons value com))
|
|
|
|
|
(if (= char ?r) (vip-region prefix-arg)
|
|
|
|
|
(vip-Region prefix-arg))
|
|
|
|
|
;; reset prefix-arg
|
|
|
|
|
(setq prefix-arg nil))
|
|
|
|
|
;; otherwise, reset prefix arg and call appropriate command
|
|
|
|
|
(setq value (if (null value) 1 value))
|
|
|
|
|
(setq prefix-arg nil)
|
|
|
|
|
(cond ((equal com '(?c . ?c)) (vip-line (cons value ?C)))
|
|
|
|
|
((equal com '(?d . ?d)) (vip-line (cons value ?D)))
|
|
|
|
|
((equal com '(?d . ?y)) (vip-yank-defun))
|
|
|
|
|
((equal com '(?y . ?y)) (vip-line (cons value ?Y)))
|
|
|
|
|
((equal com '(?< . ?<)) (vip-line (cons value ?<)))
|
|
|
|
|
((equal com '(?> . ?>)) (vip-line (cons value ?>)))
|
|
|
|
|
((equal com '(?! . ?!)) (vip-line (cons value ?!)))
|
|
|
|
|
((equal com '(?= . ?=)) (vip-line (cons value ?=)))
|
|
|
|
|
(t (error ""))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-describe-arg (arg)
|
|
|
|
|
(let (val com)
|
|
|
|
|
(setq val (vip-P-val arg)
|
|
|
|
|
com (vip-getcom arg))
|
|
|
|
|
(if (null val)
|
|
|
|
|
(if (null com)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
(message "Value is nil, and command is nil.")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(message "Value is nil, and command is %c." com))
|
|
|
|
|
(if (null com)
|
|
|
|
|
(message "Value is %d, and command is nil." val)
|
|
|
|
|
(message "Value is %d, and command is %c." val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-digit-argument (arg)
|
|
|
|
|
"Begin numeric argument for the next command."
|
|
|
|
|
(interactive "P")
|
2009-01-09 04:36:00 +00:00
|
|
|
|
(vip-prefix-arg-value last-command-event nil
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (consp arg) (cdr arg) nil)))
|
|
|
|
|
|
|
|
|
|
(defun vip-command-argument (arg)
|
|
|
|
|
"Accept a motion command as an argument."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(vip-prefix-arg-com
|
2009-01-09 04:36:00 +00:00
|
|
|
|
last-command-event
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(cond ((null arg) nil)
|
|
|
|
|
((consp arg) (car arg))
|
|
|
|
|
((numberp arg) arg)
|
|
|
|
|
(t (error "strange arg")))
|
|
|
|
|
(cond ((null arg) nil)
|
|
|
|
|
((consp arg) (cdr arg))
|
|
|
|
|
((numberp arg) nil)
|
|
|
|
|
(t (error "strange arg"))))
|
|
|
|
|
(quit
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(signal 'quit nil))))
|
|
|
|
|
|
|
|
|
|
(defun vip-p-val (arg)
|
|
|
|
|
"Get value part of prefix-argument ARG."
|
|
|
|
|
(cond ((null arg) 1)
|
|
|
|
|
((consp arg) (if (null (car arg)) 1 (car arg)))
|
|
|
|
|
(t arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-P-val (arg)
|
|
|
|
|
"Get value part of prefix-argument ARG."
|
|
|
|
|
(cond ((consp arg) (car arg))
|
|
|
|
|
(t arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-getcom (arg)
|
|
|
|
|
"Get com part of prefix-argument ARG."
|
|
|
|
|
(cond ((null arg) nil)
|
|
|
|
|
((consp arg) (cdr arg))
|
|
|
|
|
(t nil)))
|
|
|
|
|
|
|
|
|
|
(defun vip-getCom (arg)
|
|
|
|
|
"Get com part of prefix-argument ARG and modify it."
|
|
|
|
|
(let ((com (vip-getcom arg)))
|
|
|
|
|
(cond ((equal com ?c) ?C)
|
|
|
|
|
((equal com ?d) ?D)
|
|
|
|
|
((equal com ?y) ?Y)
|
|
|
|
|
(t com))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; repeat last destructive command
|
|
|
|
|
|
|
|
|
|
(defun vip-append-to-register (reg start end)
|
|
|
|
|
"Append region to text in register REG.
|
|
|
|
|
START and END are buffer positions indicating what to append."
|
|
|
|
|
(set-register reg (concat (or (get-register reg) "")
|
|
|
|
|
(buffer-substring start end))))
|
|
|
|
|
|
|
|
|
|
(defun vip-execute-com (m-com val com)
|
|
|
|
|
"(M-COM VAL COM) Execute command COM. The list (M-COM VAL COM) is set
|
|
|
|
|
to vip-d-com for later use by vip-repeat"
|
|
|
|
|
(let ((reg vip-use-register))
|
|
|
|
|
(if com
|
|
|
|
|
(cond ((= com ?c) (vip-change vip-com-point (point)))
|
|
|
|
|
((= com (- ?c)) (vip-change-subr vip-com-point (point)))
|
|
|
|
|
((or (= com ?C) (= com (- ?C)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((and (<= ?a vip-use-register)
|
|
|
|
|
(<= vip-use-register ?z))
|
|
|
|
|
(copy-to-register
|
|
|
|
|
vip-use-register (mark) (point) nil))
|
|
|
|
|
((and (<= ?A vip-use-register)
|
|
|
|
|
(<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
|
|
|
|
(+ vip-use-register 32) (mark) (point)))
|
|
|
|
|
(t (setq vip-use-register nil)
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(delete-region (mark) (point)))
|
|
|
|
|
(open-line 1)
|
|
|
|
|
(if (= com ?C) (vip-change-mode-to-insert) (yank)))
|
|
|
|
|
((= com ?d)
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((and (<= ?a vip-use-register)
|
|
|
|
|
(<= vip-use-register ?z))
|
|
|
|
|
(copy-to-register
|
|
|
|
|
vip-use-register vip-com-point (point) nil))
|
|
|
|
|
((and (<= ?A vip-use-register)
|
|
|
|
|
(<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
|
|
|
|
(+ vip-use-register 32) vip-com-point (point)))
|
|
|
|
|
(t (setq vip-use-register nil)
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(setq last-command
|
|
|
|
|
(if (eq last-command 'd-command) 'kill-region nil))
|
|
|
|
|
(kill-region vip-com-point (point))
|
|
|
|
|
(setq this-command 'd-command))
|
|
|
|
|
((= com ?D)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((and (<= ?a vip-use-register)
|
|
|
|
|
(<= vip-use-register ?z))
|
|
|
|
|
(copy-to-register
|
|
|
|
|
vip-use-register (mark) (point) nil))
|
|
|
|
|
((and (<= ?A vip-use-register)
|
|
|
|
|
(<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
|
|
|
|
(+ vip-use-register 32) (mark) (point)))
|
|
|
|
|
(t (setq vip-use-register nil)
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(setq last-command
|
|
|
|
|
(if (eq last-command 'D-command) 'kill-region nil))
|
|
|
|
|
(kill-region (mark) (point))
|
|
|
|
|
(if (eq m-com 'vip-line) (setq this-command 'D-command)))
|
|
|
|
|
(back-to-indentation))
|
|
|
|
|
((= com ?y)
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((and (<= ?a vip-use-register)
|
|
|
|
|
(<= vip-use-register ?z))
|
|
|
|
|
(copy-to-register
|
|
|
|
|
vip-use-register vip-com-point (point) nil))
|
|
|
|
|
((and (<= ?A vip-use-register)
|
|
|
|
|
(<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
|
|
|
|
(+ vip-use-register 32) vip-com-point (point)))
|
|
|
|
|
(t (setq vip-use-register nil)
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(setq last-command nil)
|
|
|
|
|
(copy-region-as-kill vip-com-point (point))
|
|
|
|
|
(goto-char vip-com-point))
|
|
|
|
|
((= com ?Y)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(cond ((and (<= ?a vip-use-register)
|
|
|
|
|
(<= vip-use-register ?z))
|
|
|
|
|
(copy-to-register
|
|
|
|
|
vip-use-register (mark) (point) nil))
|
|
|
|
|
((and (<= ?A vip-use-register)
|
|
|
|
|
(<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
|
|
|
|
(+ vip-use-register 32) (mark) (point)))
|
|
|
|
|
(t (setq vip-use-register nil)
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(setq last-command nil)
|
|
|
|
|
(copy-region-as-kill (mark) (point)))
|
|
|
|
|
(goto-char vip-com-point))
|
|
|
|
|
((or (= com ?!) (= com (- ?!)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(shell-command-on-region
|
|
|
|
|
(mark) (point)
|
|
|
|
|
(if (= com ?!)
|
|
|
|
|
(setq vip-last-shell-com (vip-read-string "!"))
|
|
|
|
|
vip-last-shell-com)
|
2013-06-18 20:24:44 +00:00
|
|
|
|
t t)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
((= com ?=)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(if (> (mark) (point)) (exchange-point-and-mark))
|
|
|
|
|
(indent-region (mark) (point) nil)))
|
|
|
|
|
((= com ?<)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(indent-rigidly (mark) (point) (- vip-shift-width)))
|
|
|
|
|
(goto-char vip-com-point))
|
|
|
|
|
((= com ?>)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(indent-rigidly (mark) (point) vip-shift-width))
|
|
|
|
|
(goto-char vip-com-point))
|
|
|
|
|
((>= com 128)
|
|
|
|
|
;; this is special command #
|
|
|
|
|
(vip-special-prefix-com (- com 128)))))
|
|
|
|
|
(setq vip-d-com (list m-com val (if (or (= com ?c) (= com ?C) (= com ?!))
|
|
|
|
|
(- com) com)
|
|
|
|
|
reg))))
|
|
|
|
|
|
|
|
|
|
(defun vip-repeat (arg)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
"(ARG) Re-execute last destructive command. vip-d-com has the form
|
1994-05-22 22:14:17 +00:00
|
|
|
|
\(COM ARG CH REG), where COM is the command to be re-executed, ARG is the
|
1988-02-11 06:40:33 +00:00
|
|
|
|
argument for COM, CH is a flag for repeat, and REG is optional and if exists
|
|
|
|
|
is the name of the register for COM."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if (eq last-command 'vip-undo)
|
|
|
|
|
;; if the last command was vip-undo, then undo-more
|
|
|
|
|
(vip-undo-more)
|
|
|
|
|
;; otherwise execute the command stored in vip-d-com. if arg is non-nil
|
|
|
|
|
;; its prefix value is used as new prefix value for the command.
|
|
|
|
|
(let ((m-com (car vip-d-com))
|
|
|
|
|
(val (vip-P-val arg))
|
|
|
|
|
(com (car (cdr (cdr vip-d-com))))
|
|
|
|
|
(reg (nth 3 vip-d-com)))
|
|
|
|
|
(if (null val) (setq val (car (cdr vip-d-com))))
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(if (null m-com) (error "No previous command to repeat"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq vip-use-register reg)
|
|
|
|
|
(funcall m-com (cons val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-special-prefix-com (char)
|
|
|
|
|
"This command is invoked interactively by the key sequence #<char>"
|
|
|
|
|
(cond ((= char ?c)
|
|
|
|
|
(downcase-region (min vip-com-point (point))
|
|
|
|
|
(max vip-com-point (point))))
|
|
|
|
|
((= char ?C)
|
|
|
|
|
(upcase-region (min vip-com-point (point))
|
|
|
|
|
(max vip-com-point (point))))
|
|
|
|
|
((= char ?g)
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-global-execute))
|
|
|
|
|
((= char ?q)
|
|
|
|
|
(set-mark vip-com-point)
|
|
|
|
|
(vip-quote-region))
|
2008-02-22 03:54:52 +00:00
|
|
|
|
((= char ?s) (ispell-region vip-com-point (point)))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; undoing
|
|
|
|
|
|
|
|
|
|
(defun vip-undo ()
|
|
|
|
|
"Undo previous change."
|
|
|
|
|
(interactive)
|
|
|
|
|
(message "undo!")
|
|
|
|
|
(undo-start)
|
|
|
|
|
(undo-more 2)
|
|
|
|
|
(setq this-command 'vip-undo))
|
|
|
|
|
|
|
|
|
|
(defun vip-undo-more ()
|
|
|
|
|
"Continue undoing previous changes."
|
|
|
|
|
(message "undo more!")
|
|
|
|
|
(undo-more 1)
|
|
|
|
|
(setq this-command 'vip-undo))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; utilities
|
|
|
|
|
|
|
|
|
|
(defun vip-string-tail (str)
|
|
|
|
|
(if (or (null str) (string= str "")) nil
|
|
|
|
|
(substring str 1)))
|
|
|
|
|
|
|
|
|
|
(defun vip-yank-defun ()
|
|
|
|
|
(mark-defun)
|
|
|
|
|
(copy-region-as-kill (point) (mark)))
|
|
|
|
|
|
|
|
|
|
(defun vip-enlarge-region (beg end)
|
|
|
|
|
"Enlarge region between BEG and END."
|
|
|
|
|
(if (< beg end)
|
|
|
|
|
(progn (goto-char beg) (set-mark end))
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(set-mark beg))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(exchange-point-and-mark)
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(if (or (not (eobp)) (not (bolp))) (with-no-warnings (next-line 1)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if (> beg end) (exchange-point-and-mark)))
|
|
|
|
|
|
|
|
|
|
(defun vip-global-execute ()
|
2011-12-04 08:02:42 +00:00
|
|
|
|
"Call last keyboard macro for each line in the region."
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (> (point) (mark)) (exchange-point-and-mark))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(call-last-kbd-macro)
|
|
|
|
|
(while (< (point) (mark))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(call-last-kbd-macro)))
|
|
|
|
|
|
|
|
|
|
(defun vip-quote-region ()
|
|
|
|
|
"Quote region by inserting the user supplied string at the beginning of
|
|
|
|
|
each line in the region."
|
|
|
|
|
(setq vip-quote-string
|
|
|
|
|
(let ((str
|
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
* woman.el (woman-file-name):
* wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* w32-fns.el (set-w32-system-coding-system):
* vc.el (vc-version-diff, vc-annotate):
* textmodes/reftex-auc.el (reftex-arg-cite)
(reftex-arg-index-tag):
* textmodes/refer.el (refer-get-bib-files):
* textmodes/artist.el (artist-figlet-choose-font):
* terminal.el (terminal-emulator):
* replace.el (occur-read-primary-args):
* rect.el (string-rectangle, string-insert-rectangle):
* ps-print.el (ps-print-preprint):
* progmodes/pascal.el (pascal-goto-defun):
* progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
* progmodes/compile.el (compilation-find-file):
* printing.el (pr-interactive-n-up):
* play/animate.el (animate-birthday-present):
* net/rcompile.el (remote-compile):
* man.el (man, Man-goto-section, Man-follow-manual-reference):
* mail/rmailsum.el (rmail-summary-search-backward)
(rmail-summary-search):
* mail/rmailout.el (rmail-output-read-rmail-file-name)
(rmail-output-read-file-name):
* mail/rmail.el (rmail-search, rmail-search-backwards):
* mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
* locate.el (locate):
* international/quail.el (quail-show-keyboard-layout):
* international/mule.el (set-buffer-file-coding-system)
(revert-buffer-with-coding-system, set-file-name-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system):
* international/mule-diag.el (describe-coding-system)
(describe-font, describe-fontset):
* international/mule-cmds.el (universal-coding-system-argument)
(search-unencodable-char, describe-input-method)
(set-language-environment, describe-language-environment):
* international/codepage.el (codepage-setup):
* international/code-pages.el (codepage-setup):
* info.el (Info-search, Info-follow-reference)
(Info-search-backward):
* emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-clear-cache, ad-activate)
(ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
(ad-enable-advice, ad-disable-advice, ad-remove-advice)
(ad-read-regexp):
* ediff-util.el (ediff-toggle-regexp-match):
* ediff-ptch.el (ediff-prompt-for-patch-file):
* dired-aux.el (dired-diff):
* diff.el (diff):
* cus-edit.el (custom-variable-prompt):
* calendar/timeclock.el (timeclock-ask-for-project):
* calc/calcalg3.el (calc-get-fit-variables):
* calc/calc-store.el (calc-edit-variable)
(calc-permanent-variable):
* vc-mcvs.el (vc-mcvs-register):
* shadowfile.el (shadow-define-literal-group):
* woman.el (woman-file-name):
* vc.el (vc-version-diff, vc-merge):
* textmodes/reftex-index.el (reftex-index-complete-tag):
* format.el (format-decode-buffer, format-decode-region):
* emulation/viper-cmd.el (viper-read-string-with-history):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor, ediff-revision):
* completion.el (interactive-completion-string-reader):
* calc/calc-prog.el (calc-user-define-formula):
Follow convention for reading with the minibuffer.
2005-09-24 13:44:02 +00:00
|
|
|
|
(vip-read-string (format "quote string (default %s): "
|
1988-02-11 06:40:33 +00:00
|
|
|
|
vip-quote-string))))
|
|
|
|
|
(if (string= str "") vip-quote-string str)))
|
|
|
|
|
(vip-enlarge-region (point) (mark))
|
|
|
|
|
(if (> (point) (mark)) (exchange-point-and-mark))
|
|
|
|
|
(insert vip-quote-string)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(while (and (< (point) (mark)) (bolp))
|
|
|
|
|
(insert vip-quote-string)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(forward-line 1)))
|
|
|
|
|
|
|
|
|
|
(defun vip-end-with-a-newline-p (string)
|
|
|
|
|
"Check if the string ends with a newline."
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(or (string= string "")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(= (aref string (1- (length string))) ?\n)))
|
|
|
|
|
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(defvar vip-save-minibuffer-local-map)
|
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-read-string (prompt &optional init)
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(setq vip-save-minibuffer-local-map (copy-keymap minibuffer-local-map))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(define-key minibuffer-local-map "\C-h" 'backward-char)
|
|
|
|
|
(define-key minibuffer-local-map "\C-w" 'backward-word)
|
|
|
|
|
(define-key minibuffer-local-map "\e" 'exit-minibuffer)
|
|
|
|
|
(let (str)
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(setq str (read-string prompt init))
|
|
|
|
|
(quit
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(setq minibuffer-local-map vip-save-minibuffer-local-map)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(signal 'quit nil)))
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(setq minibuffer-local-map vip-save-minibuffer-local-map)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
str))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; insertion commands
|
|
|
|
|
|
|
|
|
|
(defun vip-repeat-insert-command ()
|
|
|
|
|
"This function is called when mode changes from insertion mode to
|
|
|
|
|
vi command mode. It will repeat the insertion command if original insertion
|
|
|
|
|
command was invoked with argument > 1."
|
|
|
|
|
(let ((i-com (car vip-d-com)) (val (car (cdr vip-d-com))))
|
|
|
|
|
(if (and val (> val 1)) ;; first check that val is non-nil
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(progn
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq vip-d-com (list i-com (1- val) ?r))
|
|
|
|
|
(vip-repeat nil)
|
|
|
|
|
(setq vip-d-com (list i-com val ?r))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-insert (arg) ""
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-insert val ?r))
|
|
|
|
|
(if com (vip-loop val (yank))
|
|
|
|
|
(vip-change-mode-to-insert))))
|
|
|
|
|
|
|
|
|
|
(defun vip-append (arg)
|
|
|
|
|
"Append after point."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-append val ?r))
|
|
|
|
|
(if (not (eolp)) (forward-char))
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val (yank))
|
|
|
|
|
(vip-change-mode-to-insert))))
|
|
|
|
|
|
|
|
|
|
(defun vip-Append (arg)
|
|
|
|
|
"Append at end of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-Append val ?r))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val (yank))
|
|
|
|
|
(vip-change-mode-to-insert))))
|
|
|
|
|
|
|
|
|
|
(defun vip-Insert (arg)
|
|
|
|
|
"Insert before first non-white."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-Insert val ?r))
|
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val (yank))
|
|
|
|
|
(vip-change-mode-to-insert))))
|
|
|
|
|
|
|
|
|
|
(defun vip-open-line (arg)
|
|
|
|
|
"Open line below."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-open-line val ?r))
|
|
|
|
|
(let ((col (current-indentation)))
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val
|
|
|
|
|
(progn
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(newline 1)
|
|
|
|
|
(if vip-open-with-indent (indent-to col))
|
|
|
|
|
(yank)))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(newline 1)
|
|
|
|
|
(if vip-open-with-indent (indent-to col))
|
|
|
|
|
(vip-change-mode-to-insert)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-Open-line (arg)
|
|
|
|
|
"Open line above."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-Open-line val ?r))
|
|
|
|
|
(let ((col (current-indentation)))
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val
|
|
|
|
|
(progn
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(open-line 1)
|
|
|
|
|
(if vip-open-with-indent (indent-to col))
|
|
|
|
|
(yank)))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(open-line 1)
|
|
|
|
|
(if vip-open-with-indent (indent-to col))
|
|
|
|
|
(vip-change-mode-to-insert)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-open-line-at-point (arg)
|
|
|
|
|
"Open line at point."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-open-line-at-point val ?r))
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-loop val
|
|
|
|
|
(progn
|
|
|
|
|
(open-line 1)
|
|
|
|
|
(yank)))
|
|
|
|
|
(open-line 1)
|
|
|
|
|
(vip-change-mode-to-insert))))
|
|
|
|
|
|
|
|
|
|
(defun vip-substitute (arg)
|
|
|
|
|
"Substitute characters."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(forward-char val)
|
|
|
|
|
(if (equal com ?r)
|
|
|
|
|
(vip-change-subr (mark) (point))
|
|
|
|
|
(vip-change (mark) (point))))
|
|
|
|
|
(setq vip-d-com (list 'vip-substitute val ?r))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-substitute-line (arg)
|
|
|
|
|
"Substitute lines."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(vip-line (cons arg ?C)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; line command
|
|
|
|
|
|
|
|
|
|
(defun vip-line (arg)
|
|
|
|
|
(let ((val (car arg)) (com (cdr arg)))
|
|
|
|
|
(move-marker vip-com-point (point))
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(with-no-warnings (next-line (1- val)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-execute-com 'vip-line val com)))
|
|
|
|
|
|
|
|
|
|
(defun vip-yank-line (arg)
|
|
|
|
|
"Yank ARG lines (in vi's sense)"
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)))
|
|
|
|
|
(vip-line (cons val ?Y))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
;; region command
|
|
|
|
|
|
|
|
|
|
(defun vip-region (arg)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-P-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(move-marker vip-com-point (point))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(vip-execute-com 'vip-region val com)))
|
|
|
|
|
|
|
|
|
|
(defun vip-Region (arg)
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-P-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(move-marker vip-com-point (point))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(vip-execute-com 'vip-Region val com)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-replace-char (arg)
|
|
|
|
|
"Replace the following ARG chars by the character read."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-replace-char val ?r))
|
|
|
|
|
(vip-replace-char-subr (if (equal com ?r) vip-d-char (read-char)) val)))
|
|
|
|
|
|
|
|
|
|
(defun vip-replace-char-subr (char arg)
|
|
|
|
|
(delete-char arg t)
|
|
|
|
|
(setq vip-d-char char)
|
|
|
|
|
(vip-loop (if (> arg 0) arg (- arg)) (insert char))
|
|
|
|
|
(backward-char arg))
|
|
|
|
|
|
|
|
|
|
(defun vip-replace-string ()
|
|
|
|
|
"Replace string. If you supply null string as the string to be replaced,
|
|
|
|
|
the query replace mode will toggle between string replace and regexp replace."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (str)
|
|
|
|
|
(setq str (vip-read-string
|
|
|
|
|
(if vip-re-replace "Replace regexp: " "Replace string: ")))
|
|
|
|
|
(if (string= str "")
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-re-replace (not vip-re-replace))
|
1996-01-25 01:13:01 +00:00
|
|
|
|
(message "Replace mode changed to %s."
|
|
|
|
|
(if vip-re-replace "regexp replace"
|
|
|
|
|
"string replace")))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if vip-re-replace
|
1993-12-23 04:53:48 +00:00
|
|
|
|
;; (replace-regexp
|
|
|
|
|
;; str
|
|
|
|
|
;; (vip-read-string (format "Replace regexp \"%s\" with: " str)))
|
|
|
|
|
(while (re-search-forward str nil t)
|
|
|
|
|
(replace-match (vip-read-string
|
|
|
|
|
(format "Replace regexp \"%s\" with: " str))
|
|
|
|
|
nil nil))
|
2005-07-03 16:26:56 +00:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
(replace-string
|
|
|
|
|
str
|
|
|
|
|
(vip-read-string (format "Replace \"%s\" with: " str))))))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; basic cursor movement. j, k, l, m commands.
|
|
|
|
|
|
|
|
|
|
(defun vip-forward-char (arg)
|
|
|
|
|
"Move point right ARG characters (left if ARG negative).On reaching end
|
|
|
|
|
of buffer, stop and signal error."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-char val)
|
|
|
|
|
(if com (vip-execute-com 'vip-forward-char val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-backward-char (arg)
|
|
|
|
|
"Move point left ARG characters (right if ARG negative). On reaching
|
|
|
|
|
beginning of buffer, stop and signal error."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(backward-char val)
|
|
|
|
|
(if com (vip-execute-com 'vip-backward-char val com))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; word command
|
|
|
|
|
|
|
|
|
|
(defun vip-forward-word (arg)
|
|
|
|
|
"Forward word."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-word val)
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(if (or (= com ?c) (= com (- ?c)))
|
|
|
|
|
(progn (backward-word 1) (forward-word 1)))
|
|
|
|
|
(if (or (= com ?d) (= com ?y))
|
|
|
|
|
(progn
|
|
|
|
|
(backward-word 1)
|
|
|
|
|
(forward-word 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(vip-execute-com 'vip-forward-word val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-end-of-word (arg)
|
|
|
|
|
"Move point to end of current word."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-char)
|
|
|
|
|
(forward-word val)
|
|
|
|
|
(backward-char)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char)
|
|
|
|
|
(vip-execute-com 'vip-end-of-word val com)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-backward-word (arg)
|
|
|
|
|
"Backward word."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(backward-word val)
|
|
|
|
|
(if com (vip-execute-com 'vip-backward-word val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-forward-Word (arg)
|
|
|
|
|
"Forward word delimited by white character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(re-search-forward "[^ \t\n]*[ \t\n]+" nil t val)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(if (or (= com ?c) (= com (- ?c)))
|
|
|
|
|
(progn (backward-word 1) (forward-word 1)))
|
|
|
|
|
(if (or (= com ?d) (= com ?y))
|
|
|
|
|
(progn
|
|
|
|
|
(backward-word 1)
|
|
|
|
|
(forward-word 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(vip-execute-com 'vip-forward-Word val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-end-of-Word (arg)
|
|
|
|
|
"Move forward to end of word delimited by white character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-char)
|
|
|
|
|
(if (re-search-forward "[^ \t\n]+" nil t val) (backward-char))
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char)
|
|
|
|
|
(vip-execute-com 'vip-end-of-Word val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-backward-Word (arg)
|
|
|
|
|
"Backward word delimited by white character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(if (re-search-backward "[ \t\n]+[^ \t\n]+" nil t val)
|
|
|
|
|
(forward-char)
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
(if com (vip-execute-com 'vip-backward-Word val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-beginning-of-line (arg)
|
|
|
|
|
"Go to beginning of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(beginning-of-line val)
|
|
|
|
|
(if com (vip-execute-com 'vip-beginning-of-line val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-bol-and-skip-white (arg)
|
|
|
|
|
"Beginning of line at first non-white character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if com (vip-execute-com 'vip-bol-and-skip-white val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-eol (arg)
|
|
|
|
|
"Go to end of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(end-of-line val)
|
|
|
|
|
(if com (vip-execute-com 'vip-goto-eol val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-next-line (arg)
|
|
|
|
|
"Go to next line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(line-move val)
|
|
|
|
|
(setq this-command 'next-line)
|
|
|
|
|
(if com (vip-execute-com 'vip-next-line val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-next-line-at-bol (arg)
|
|
|
|
|
"Next line at beginning of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(with-no-warnings (next-line val))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if com (vip-execute-com 'vip-next-line-at-bol val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-previous-line (arg)
|
|
|
|
|
"Go to previous line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(with-no-warnings (next-line (- val)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq this-command 'previous-line)
|
|
|
|
|
(if com (vip-execute-com 'vip-previous-line val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-previous-line-at-bol (arg)
|
|
|
|
|
"Previous line at beginning of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(with-no-warnings (next-line (- val)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if com (vip-execute-com 'vip-previous-line val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-to-eol (arg)
|
|
|
|
|
"Change to end of line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vip-goto-eol (cons arg ?c)))
|
|
|
|
|
|
|
|
|
|
(defun vip-kill-line (arg)
|
|
|
|
|
"Delete line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vip-goto-eol (cons arg ?d)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; moving around
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-line (arg)
|
|
|
|
|
"Go to ARG's line. Without ARG go to end of buffer."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-P-val arg)) (com (vip-getCom arg)))
|
|
|
|
|
(move-marker vip-com-point (point))
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(if (null val)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line (1- val)))
|
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if com (vip-execute-com 'vip-goto-line val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-find-char (arg char forward offset)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
"Find ARG's occurrence of CHAR on the current line. If FORWARD then
|
1988-02-11 06:40:33 +00:00
|
|
|
|
search is forward, otherwise backward. OFFSET is used to adjust point
|
|
|
|
|
after search."
|
|
|
|
|
(let ((arg (if forward arg (- arg))) point)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(if (> arg 0)
|
|
|
|
|
(narrow-to-region
|
|
|
|
|
;; forward search begins here
|
|
|
|
|
(if (eolp) (error "") (point))
|
|
|
|
|
;; forward search ends here
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(progn (with-no-warnings (next-line 1)) (beginning-of-line) (point)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(narrow-to-region
|
|
|
|
|
;; backward search begins from here
|
|
|
|
|
(if (bolp) (error "") (point))
|
|
|
|
|
;; backward search ends here
|
|
|
|
|
(progn (beginning-of-line) (point))))
|
|
|
|
|
;; if arg > 0, point is forwarded before search.
|
|
|
|
|
(if (> arg 0) (goto-char (1+ (point-min)))
|
|
|
|
|
(goto-char (point-max)))
|
|
|
|
|
(let ((case-fold-search nil))
|
|
|
|
|
(search-forward (char-to-string char) nil 0 arg))
|
|
|
|
|
(setq point (point))
|
|
|
|
|
(if (or (and (> arg 0) (= point (point-max)))
|
|
|
|
|
(and (< arg 0) (= point (point-min))))
|
|
|
|
|
(error ""))))
|
|
|
|
|
(goto-char (+ point (if (> arg 0) (if offset -2 -1) (if offset 1 0))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-find-char-forward (arg)
|
|
|
|
|
"Find char on the line. If called interactively read the char to find
|
|
|
|
|
from the terminal, and if called from vip-repeat, the char last used is
|
2005-06-10 14:11:18 +00:00
|
|
|
|
used. This behavior is controlled by the sign of prefix numeric value."
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if (> val 0)
|
|
|
|
|
;; this means that the function was called interactively
|
|
|
|
|
(setq vip-f-char (read-char)
|
|
|
|
|
vip-f-forward t
|
|
|
|
|
vip-f-offset nil)
|
|
|
|
|
(setq val (- val)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t nil)
|
|
|
|
|
(setq val (- val))
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-F-char vip-f-char);; set new vip-F-char
|
|
|
|
|
(forward-char)
|
|
|
|
|
(vip-execute-com 'vip-find-char-forward val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-char-forward (arg)
|
|
|
|
|
"Go up to char ARG forward on line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if (> val 0)
|
|
|
|
|
;; this means that the function was called interactively
|
|
|
|
|
(setq vip-f-char (read-char)
|
|
|
|
|
vip-f-forward t
|
|
|
|
|
vip-f-offset t)
|
|
|
|
|
(setq val (- val)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) t t)
|
|
|
|
|
(setq val (- val))
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-F-char vip-f-char);; set new vip-F-char
|
|
|
|
|
(forward-char)
|
|
|
|
|
(vip-execute-com 'vip-goto-char-forward val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-find-char-backward (arg)
|
|
|
|
|
"Find char ARG on line backward."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if (> val 0)
|
|
|
|
|
;; this means that the function was called interactively
|
|
|
|
|
(setq vip-f-char (read-char)
|
|
|
|
|
vip-f-forward nil
|
|
|
|
|
vip-f-offset nil)
|
|
|
|
|
(setq val (- val)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char
|
|
|
|
|
val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil nil)
|
|
|
|
|
(setq val (- val))
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-F-char vip-f-char);; set new vip-F-char
|
|
|
|
|
(vip-execute-com 'vip-find-char-backward val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-char-backward (arg)
|
|
|
|
|
"Go up to char ARG backward on line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if (> val 0)
|
|
|
|
|
;; this means that the function was called interactively
|
|
|
|
|
(setq vip-f-char (read-char)
|
|
|
|
|
vip-f-forward nil
|
|
|
|
|
vip-f-offset t)
|
|
|
|
|
(setq val (- val)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char val (if (> (vip-p-val arg) 0) vip-f-char vip-F-char) nil t)
|
|
|
|
|
(setq val (- val))
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-F-char vip-f-char);; set new vip-F-char
|
|
|
|
|
(vip-execute-com 'vip-goto-char-backward val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-repeat-find (arg)
|
|
|
|
|
"Repeat previous find command."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char val vip-f-char vip-f-forward vip-f-offset)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(if vip-f-forward (forward-char))
|
|
|
|
|
(vip-execute-com 'vip-repeat-find val com)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-repeat-find-opposite (arg)
|
|
|
|
|
"Repeat previous find command in the opposite direction."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(vip-find-char val vip-f-char (not vip-f-forward) vip-f-offset)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(if vip-f-forward (forward-char))
|
|
|
|
|
(vip-execute-com 'vip-repeat-find-opposite val com)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; window scrolling etc.
|
|
|
|
|
|
|
|
|
|
(defun vip-other-window (arg)
|
|
|
|
|
"Switch to other window."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(other-window arg)
|
|
|
|
|
(or (not (eq vip-current-mode 'emacs-mode))
|
|
|
|
|
(string= (buffer-name (current-buffer)) " *Minibuf-1*")
|
|
|
|
|
(vip-change-mode-to-vi)))
|
|
|
|
|
|
|
|
|
|
(defun vip-window-top (arg)
|
|
|
|
|
"Go to home window line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(move-to-window-line (1- val))
|
|
|
|
|
(if com (vip-execute-com 'vip-window-top val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-window-middle (arg)
|
|
|
|
|
"Go to middle window line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(move-to-window-line (+ (/ (1- (window-height)) 2) (1- val)))
|
|
|
|
|
(if com (vip-execute-com 'vip-window-middle val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-window-bottom (arg)
|
|
|
|
|
"Go to last window line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(move-to-window-line (- val))
|
|
|
|
|
(if com (vip-execute-com 'vip-window-bottom val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-line-to-top (arg)
|
|
|
|
|
"Put current line on the home line."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(recenter (1- arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-line-to-middle (arg)
|
|
|
|
|
"Put current line on the middle line."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(recenter (+ (1- arg) (/ (1- (window-height)) 2))))
|
|
|
|
|
|
|
|
|
|
(defun vip-line-to-bottom (arg)
|
|
|
|
|
"Put current line on the last line."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(recenter (- (window-height) (1+ arg))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; paren match
|
|
|
|
|
|
|
|
|
|
(defun vip-paren-match (arg)
|
|
|
|
|
"Go to the matching parenthesis."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((com (vip-getcom arg)))
|
|
|
|
|
(if (numberp arg)
|
|
|
|
|
(if (or (> arg 99) (< arg 1))
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(error "Prefix must be between 1 and 99")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(goto-char
|
|
|
|
|
(if (> (point-max) 80000)
|
|
|
|
|
(* (/ (point-max) 100) arg)
|
|
|
|
|
(/ (* (point-max) arg) 100)))
|
|
|
|
|
(back-to-indentation))
|
|
|
|
|
(cond ((looking-at "[\(\[{]")
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
(if com
|
|
|
|
|
(vip-execute-com 'vip-paren-match nil com)
|
|
|
|
|
(backward-char)))
|
|
|
|
|
((looking-at "[])}]")
|
|
|
|
|
(forward-char)
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(backward-sexp 1)
|
|
|
|
|
(if com (vip-execute-com 'vip-paren-match nil com)))
|
|
|
|
|
(t (error ""))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; sentence and paragraph
|
|
|
|
|
|
|
|
|
|
(defun vip-forward-sentence (arg)
|
|
|
|
|
"Forward sentence."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-sentence val)
|
|
|
|
|
(if com (vip-execute-com 'vip-forward-sentence nil com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-backward-sentence (arg)
|
|
|
|
|
"Backward sentence."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getcom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(backward-sentence val)
|
|
|
|
|
(if com (vip-execute-com 'vip-backward-sentence nil com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-forward-paragraph (arg)
|
|
|
|
|
"Forward paragraph."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(forward-paragraph val)
|
|
|
|
|
(if com (vip-execute-com 'vip-forward-paragraph nil com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-backward-paragraph (arg)
|
|
|
|
|
"Backward paragraph."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(com (vip-getCom arg)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(backward-paragraph val)
|
|
|
|
|
(if com (vip-execute-com 'vip-backward-paragraph nil com))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; scrolling
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll (arg)
|
|
|
|
|
"Scroll to next screen."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(if (> arg 0)
|
|
|
|
|
(while (> arg 0)
|
|
|
|
|
(scroll-up)
|
|
|
|
|
(setq arg (1- arg)))
|
|
|
|
|
(while (> 0 arg)
|
|
|
|
|
(scroll-down)
|
|
|
|
|
(setq arg (1+ arg)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll-back (arg)
|
|
|
|
|
"Scroll to previous screen."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(vip-scroll (- arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll-down (arg)
|
|
|
|
|
"Scroll up half screen."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if (null arg) (scroll-down (/ (window-height) 2))
|
|
|
|
|
(scroll-down arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll-down-one (arg)
|
|
|
|
|
"Scroll up one line."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(scroll-down arg))
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll-up (arg)
|
|
|
|
|
"Scroll down half screen."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if (null arg) (scroll-up (/ (window-height) 2))
|
|
|
|
|
(scroll-up arg)))
|
|
|
|
|
|
|
|
|
|
(defun vip-scroll-up-one (arg)
|
|
|
|
|
"Scroll down one line."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(scroll-up arg))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; splitting window
|
|
|
|
|
|
|
|
|
|
(defun vip-buffer-in-two-windows ()
|
|
|
|
|
"Show current buffer in two windows."
|
|
|
|
|
(interactive)
|
|
|
|
|
(delete-other-windows)
|
2011-10-30 01:56:03 +00:00
|
|
|
|
(split-window-below))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; searching
|
|
|
|
|
|
|
|
|
|
(defun vip-search-forward (arg)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
"Search a string forward. ARG is used to find the ARG's occurrence
|
1988-02-11 06:40:33 +00:00
|
|
|
|
of the string. Default is vanilla search. Search mode can be toggled by
|
|
|
|
|
giving null search string."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-P-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-s-forward t
|
|
|
|
|
vip-s-string (vip-read-string (if vip-re-search "RE-/" "/")))
|
|
|
|
|
(if (string= vip-s-string "")
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-re-search (not vip-re-search))
|
1996-01-25 01:13:01 +00:00
|
|
|
|
(message "Search mode changed to %s search."
|
|
|
|
|
(if vip-re-search "regular expression"
|
|
|
|
|
"vanilla")))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-search vip-s-string t val)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(move-marker vip-com-point (mark))
|
|
|
|
|
(vip-execute-com 'vip-search-next val com))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-search-backward (arg)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
"Search a string backward. ARG is used to find the ARG's occurrence
|
1988-02-11 06:40:33 +00:00
|
|
|
|
of the string. Default is vanilla search. Search mode can be toggled by
|
|
|
|
|
giving null search string."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-P-val arg)) (com (vip-getcom arg)))
|
|
|
|
|
(setq vip-s-forward nil
|
|
|
|
|
vip-s-string (vip-read-string (if vip-re-search "RE-?" "?")))
|
|
|
|
|
(if (string= vip-s-string "")
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-re-search (not vip-re-search))
|
1996-01-25 01:13:01 +00:00
|
|
|
|
(message "Search mode changed to %s search."
|
|
|
|
|
(if vip-re-search "regular expression"
|
|
|
|
|
"vanilla")))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-search vip-s-string nil val)
|
|
|
|
|
(if com
|
|
|
|
|
(progn
|
|
|
|
|
(move-marker vip-com-point (mark))
|
|
|
|
|
(vip-execute-com 'vip-search-next val com))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-search (string forward arg &optional no-offset init-point)
|
|
|
|
|
"(STRING FORWARD COUNT &optional NO-OFFSET) Search COUNT's occurrence of
|
|
|
|
|
STRING. Search will be forward if FORWARD, otherwise backward."
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg))
|
|
|
|
|
(null-arg (null (vip-P-val arg))) (offset (not no-offset))
|
|
|
|
|
(case-fold-search vip-case-fold-search)
|
|
|
|
|
(start-point (or init-point (point))))
|
|
|
|
|
(if forward
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(progn
|
|
|
|
|
(if (and offset (not (eobp))) (forward-char))
|
|
|
|
|
(if vip-re-search
|
|
|
|
|
(progn
|
|
|
|
|
(re-search-forward string nil nil val)
|
|
|
|
|
(re-search-backward string))
|
|
|
|
|
(search-forward string nil nil val)
|
|
|
|
|
(search-backward string))
|
|
|
|
|
(push-mark start-point))
|
|
|
|
|
(search-failed
|
|
|
|
|
(if (and null-arg vip-search-wrap-around)
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(vip-search string forward (cons 1 com) t start-point))
|
|
|
|
|
(goto-char start-point)
|
|
|
|
|
(signal 'search-failed (cdr conditions)))))
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(progn
|
|
|
|
|
(if vip-re-search
|
|
|
|
|
(re-search-backward string nil nil val)
|
|
|
|
|
(search-backward string nil nil val))
|
|
|
|
|
(push-mark start-point))
|
|
|
|
|
(search-failed
|
|
|
|
|
(if (and null-arg vip-search-wrap-around)
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(vip-search string forward (cons 1 com) t start-point))
|
|
|
|
|
(goto-char start-point)
|
|
|
|
|
(signal 'search-failed (cdr conditions))))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-search-next (arg)
|
|
|
|
|
"Repeat previous search."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(if (null vip-s-string) (error "No previous search string"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-search vip-s-string vip-s-forward arg)
|
|
|
|
|
(if com (vip-execute-com 'vip-search-next val com))))
|
|
|
|
|
|
|
|
|
|
(defun vip-search-Next (arg)
|
|
|
|
|
"Repeat previous search in the reverse direction."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(if (null vip-s-string) (error "No previous search string"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-search vip-s-string (not vip-s-forward) arg)
|
|
|
|
|
(if com (vip-execute-com 'vip-search-Next val com))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; visiting and killing files, buffers
|
|
|
|
|
|
|
|
|
|
(defun vip-switch-to-buffer ()
|
|
|
|
|
"Switch to buffer in the current window."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (buffer)
|
|
|
|
|
(setq buffer
|
|
|
|
|
(read-buffer
|
|
|
|
|
(format "switch to buffer \(%s\): "
|
|
|
|
|
(buffer-name (other-buffer (current-buffer))))))
|
|
|
|
|
(switch-to-buffer buffer)
|
|
|
|
|
(vip-change-mode-to-vi)))
|
|
|
|
|
|
|
|
|
|
(defun vip-switch-to-buffer-other-window ()
|
|
|
|
|
"Switch to buffer in another window."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (buffer)
|
|
|
|
|
(setq buffer
|
|
|
|
|
(read-buffer
|
|
|
|
|
(format "Switch to buffer \(%s\): "
|
|
|
|
|
(buffer-name (other-buffer (current-buffer))))))
|
|
|
|
|
(switch-to-buffer-other-window buffer)
|
|
|
|
|
(vip-change-mode-to-vi)))
|
|
|
|
|
|
|
|
|
|
(defun vip-kill-buffer ()
|
|
|
|
|
"Kill a buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (buffer buffer-name)
|
|
|
|
|
(setq buffer-name
|
|
|
|
|
(read-buffer
|
|
|
|
|
(format "Kill buffer \(%s\): "
|
|
|
|
|
(buffer-name (current-buffer)))))
|
|
|
|
|
(setq buffer
|
|
|
|
|
(if (null buffer-name)
|
|
|
|
|
(current-buffer)
|
|
|
|
|
(get-buffer buffer-name)))
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(if (null buffer) (error "Buffer %s nonexistent" buffer-name))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (or (not (buffer-modified-p buffer))
|
|
|
|
|
(y-or-n-p "Buffer is modified, are you sure? "))
|
|
|
|
|
(kill-buffer buffer)
|
2001-07-16 12:23:00 +00:00
|
|
|
|
(error "Buffer not killed"))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-find-file ()
|
|
|
|
|
"Visit file in the current window."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (file)
|
|
|
|
|
(setq file (read-file-name "visit file: "))
|
|
|
|
|
(switch-to-buffer (find-file-noselect file))
|
|
|
|
|
(vip-change-mode-to-vi)))
|
|
|
|
|
|
|
|
|
|
(defun vip-find-file-other-window ()
|
|
|
|
|
"Visit file in another window."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (file)
|
|
|
|
|
(setq file (read-file-name "Visit file: "))
|
|
|
|
|
(switch-to-buffer-other-window (find-file-noselect file))
|
|
|
|
|
(vip-change-mode-to-vi)))
|
|
|
|
|
|
|
|
|
|
(defun vip-info-on-file ()
|
|
|
|
|
"Give information of the file associated to the current buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(message "\"%s\" line %d of %d"
|
|
|
|
|
(if (buffer-file-name) (buffer-file-name) "")
|
|
|
|
|
(1+ (count-lines (point-min) (point)))
|
|
|
|
|
(1+ (count-lines (point-min) (point-max)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; yank and pop
|
|
|
|
|
|
|
|
|
|
(defun vip-yank (text)
|
|
|
|
|
"yank TEXT silently."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-push-mark-silent (point))
|
|
|
|
|
(insert text)
|
|
|
|
|
(exchange-point-and-mark))
|
|
|
|
|
(skip-chars-forward " \t"))
|
|
|
|
|
|
|
|
|
|
(defun vip-put-back (arg)
|
|
|
|
|
"Put back after point/below line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(text (if vip-use-register
|
|
|
|
|
(if (and (<= ?1 vip-use-register) (<= vip-use-register ?9))
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(current-kill (- vip-use-register ?1) 'do-not-rotate)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(get-register vip-use-register))
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(current-kill 0))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (null text)
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(let ((reg vip-use-register))
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(error "Nothing in register %c" reg))
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(if (vip-end-with-a-newline-p text)
|
|
|
|
|
(progn
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(with-no-warnings (next-line 1))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(beginning-of-line))
|
|
|
|
|
(if (and (not (eolp)) (not (eobp))) (forward-char)))
|
|
|
|
|
(setq vip-d-com (list 'vip-put-back val nil vip-use-register))
|
|
|
|
|
(vip-loop val (vip-yank text))))
|
|
|
|
|
|
|
|
|
|
(defun vip-Put-back (arg)
|
|
|
|
|
"Put back at point/above line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg))
|
|
|
|
|
(text (if vip-use-register
|
|
|
|
|
(if (and (<= ?1 vip-use-register) (<= vip-use-register ?9))
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(current-kill (- vip-use-register ?1) 'do-not-rotate)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(get-register vip-use-register))
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(current-kill 0))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (null text)
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(let ((reg vip-use-register))
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(error "Nothing in register %c" reg))
|
|
|
|
|
(error "")))
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(if (vip-end-with-a-newline-p text) (beginning-of-line))
|
|
|
|
|
(setq vip-d-com (list 'vip-Put-back val nil vip-use-register))
|
|
|
|
|
(vip-loop val (vip-yank text))))
|
|
|
|
|
|
|
|
|
|
(defun vip-delete-char (arg)
|
|
|
|
|
"Delete character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-delete-char val nil))
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(if (and (<= ?A vip-use-register) (<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
1992-11-16 01:44:33 +00:00
|
|
|
|
(+ vip-use-register 32) (point) (- (point) val))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(copy-to-register vip-use-register (point) (- (point) val) nil))
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(delete-char val t)))
|
|
|
|
|
|
|
|
|
|
(defun vip-delete-backward-char (arg)
|
|
|
|
|
"Delete previous character."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((val (vip-p-val arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-delete-backward-char val nil))
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(if (and (<= ?A vip-use-register) (<= vip-use-register ?Z))
|
|
|
|
|
(vip-append-to-register
|
1992-11-16 01:44:33 +00:00
|
|
|
|
(+ vip-use-register 32) (point) (+ (point) val))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(copy-to-register vip-use-register (point) (+ (point) val) nil))
|
|
|
|
|
(setq vip-use-register nil)))
|
2018-03-23 21:05:01 +00:00
|
|
|
|
(with-no-warnings (delete-backward-char val t))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; join lines.
|
|
|
|
|
|
|
|
|
|
(defun vip-join-lines (arg)
|
|
|
|
|
"Join this line to next, if ARG is nil. Otherwise, join ARG lines"
|
|
|
|
|
(interactive "*P")
|
|
|
|
|
(let ((val (vip-P-val arg)))
|
|
|
|
|
(setq vip-d-com (list 'vip-join-lines val nil))
|
|
|
|
|
(vip-loop (if (null val) 1 (1- val))
|
|
|
|
|
(progn
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (not (eobp))
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point) (1- (point)))
|
|
|
|
|
(fixup-whitespace)))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; making small changes
|
|
|
|
|
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(defvar vip-c-string)
|
|
|
|
|
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(defun vip-change (beg end)
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(setq vip-c-string
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-read-string (format "%s => " (buffer-substring beg end))))
|
|
|
|
|
(vip-change-subr beg end))
|
|
|
|
|
|
|
|
|
|
(defun vip-change-subr (beg end)
|
|
|
|
|
(if vip-use-register
|
|
|
|
|
(progn
|
|
|
|
|
(copy-to-register vip-use-register beg end nil)
|
|
|
|
|
(setq vip-use-register nil)))
|
|
|
|
|
(kill-region beg end)
|
|
|
|
|
(setq this-command 'vip-change)
|
1997-06-23 19:18:36 +00:00
|
|
|
|
(insert vip-c-string))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; query replace
|
|
|
|
|
|
|
|
|
|
(defun vip-query-replace ()
|
|
|
|
|
"Query replace. If you supply null string as the string to be replaced,
|
|
|
|
|
the query replace mode will toggle between string replace and regexp replace."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (str)
|
|
|
|
|
(setq str (vip-read-string
|
|
|
|
|
(if vip-re-query-replace "Query replace regexp: "
|
|
|
|
|
"Query replace: ")))
|
|
|
|
|
(if (string= str "")
|
|
|
|
|
(progn
|
|
|
|
|
(setq vip-re-query-replace (not vip-re-query-replace))
|
|
|
|
|
(message "Query replace mode changed to %s."
|
|
|
|
|
(if vip-re-query-replace "regexp replace"
|
|
|
|
|
"string replace")))
|
|
|
|
|
(if vip-re-query-replace
|
|
|
|
|
(query-replace-regexp
|
|
|
|
|
str
|
|
|
|
|
(vip-read-string (format "Query replace regexp \"%s\" with: " str)))
|
|
|
|
|
(query-replace
|
|
|
|
|
str
|
|
|
|
|
(vip-read-string (format "Query replace \"%s\" with: " str)))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; marking
|
|
|
|
|
|
|
|
|
|
(defun vip-mark-beginning-of-buffer ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(message "mark set at the beginning of buffer"))
|
|
|
|
|
|
|
|
|
|
(defun vip-mark-end-of-buffer ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(message "mark set at the end of buffer"))
|
|
|
|
|
|
|
|
|
|
(defun vip-mark-point (char)
|
|
|
|
|
(interactive "c")
|
|
|
|
|
(cond ((and (<= ?a char) (<= char ?z))
|
1992-11-16 01:44:33 +00:00
|
|
|
|
(point-to-register (- char (- ?a ?\C-a)) nil))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
((= char ?<) (vip-mark-beginning-of-buffer))
|
|
|
|
|
((= char ?>) (vip-mark-end-of-buffer))
|
|
|
|
|
((= char ?.) (push-mark))
|
|
|
|
|
((= char ?,) (set-mark-command 1))
|
|
|
|
|
((= char ?D) (mark-defun))
|
|
|
|
|
(t (error ""))))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-mark (arg)
|
|
|
|
|
"Go to mark."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((char (read-char)) (com (vip-getcom arg)))
|
|
|
|
|
(vip-goto-mark-subr char com nil)))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-mark-and-skip-white (arg)
|
|
|
|
|
"Go to mark and skip to first non-white on line."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((char (read-char)) (com (vip-getCom arg)))
|
|
|
|
|
(vip-goto-mark-subr char com t)))
|
|
|
|
|
|
|
|
|
|
(defun vip-goto-mark-subr (char com skip-white)
|
|
|
|
|
(cond ((and (<= ?a char) (<= char ?z))
|
|
|
|
|
(let ((buff (current-buffer)))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(goto-char (register-to-point (- char (- ?a ?\C-a))))
|
|
|
|
|
(if skip-white (back-to-indentation))
|
|
|
|
|
(vip-change-mode-to-vi)
|
|
|
|
|
(if com
|
|
|
|
|
(if (equal buff (current-buffer))
|
|
|
|
|
(vip-execute-com (if skip-white
|
|
|
|
|
'vip-goto-mark-and-skip-white
|
|
|
|
|
'vip-goto-mark)
|
|
|
|
|
nil com)
|
|
|
|
|
(switch-to-buffer buff)
|
|
|
|
|
(goto-char vip-com-point)
|
|
|
|
|
(vip-change-mode-to-vi)
|
|
|
|
|
(error "")))))
|
|
|
|
|
((and (not skip-white) (= char ?`))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(if com (vip-execute-com 'vip-goto-mark nil com)))
|
|
|
|
|
((and skip-white (= char ?'))
|
|
|
|
|
(if com (move-marker vip-com-point (point)))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(back-to-indentation)
|
|
|
|
|
(if com (vip-execute-com 'vip-goto-mark-and-skip-white nil com)))
|
|
|
|
|
(t (error ""))))
|
|
|
|
|
|
|
|
|
|
(defun vip-exchange-point-and-mark ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(back-to-indentation))
|
|
|
|
|
|
|
|
|
|
(defun vip-keyboard-quit ()
|
|
|
|
|
"Abort partially formed or running command."
|
|
|
|
|
(interactive)
|
|
|
|
|
(setq vip-use-register nil)
|
|
|
|
|
(keyboard-quit))
|
|
|
|
|
|
|
|
|
|
(defun vip-ctl-c-equivalent (arg)
|
|
|
|
|
"Emulate C-c in Emacs mode."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vip-ctl-key-equivalent "\C-c" arg))
|
|
|
|
|
|
|
|
|
|
(defun vip-ctl-x-equivalent (arg)
|
|
|
|
|
"Emulate C-x in Emacs mode."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(vip-ctl-key-equivalent "\C-x" arg))
|
|
|
|
|
|
|
|
|
|
(defun vip-ctl-key-equivalent (key arg)
|
|
|
|
|
(let ((char (read-char)))
|
|
|
|
|
(if (and (<= ?A char) (<= char ?Z))
|
|
|
|
|
(setq char (- char (- ?A ?\C-a))))
|
1993-06-06 07:16:19 +00:00
|
|
|
|
(vip-escape-to-emacs arg (list (aref key 0) char))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
;; commands in insertion mode
|
|
|
|
|
|
|
|
|
|
(defun vip-delete-backward-word (arg)
|
|
|
|
|
"Delete previous word."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(backward-word arg)
|
|
|
|
|
(delete-region (point) (mark))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; implement ex commands
|
|
|
|
|
|
|
|
|
|
(defvar ex-token-type nil
|
|
|
|
|
"type of token. if non-nil, gives type of address. if nil, it
|
|
|
|
|
is a command.")
|
|
|
|
|
|
|
|
|
|
(defvar ex-token nil
|
|
|
|
|
"value of token.")
|
|
|
|
|
|
|
|
|
|
(defvar ex-addresses nil
|
|
|
|
|
"list of ex addresses")
|
|
|
|
|
|
|
|
|
|
(defvar ex-flag nil
|
|
|
|
|
"flag for ex flag")
|
|
|
|
|
|
|
|
|
|
(defvar ex-buffer nil
|
|
|
|
|
"name of ex buffer")
|
|
|
|
|
|
|
|
|
|
(defvar ex-count nil
|
|
|
|
|
"value of ex count")
|
|
|
|
|
|
|
|
|
|
(defvar ex-g-flag nil
|
|
|
|
|
"flag for global command")
|
|
|
|
|
|
|
|
|
|
(defvar ex-g-variant nil
|
|
|
|
|
"if t global command is executed on lines not matching ex-g-pat")
|
|
|
|
|
|
|
|
|
|
(defvar ex-reg-exp nil
|
|
|
|
|
"save reg-exp used in substitute")
|
|
|
|
|
|
|
|
|
|
(defvar ex-repl nil
|
|
|
|
|
"replace pattern for substitute")
|
|
|
|
|
|
|
|
|
|
(defvar ex-g-pat nil
|
|
|
|
|
"pattern for global command")
|
|
|
|
|
|
|
|
|
|
(defvar ex-map (make-sparse-keymap)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
"save commands for mapped keys")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defvar ex-tag nil
|
|
|
|
|
"save ex tag")
|
|
|
|
|
|
|
|
|
|
(defvar ex-file nil)
|
|
|
|
|
|
|
|
|
|
(defvar ex-variant nil)
|
|
|
|
|
|
|
|
|
|
(defvar ex-offset nil)
|
|
|
|
|
|
|
|
|
|
(defvar ex-append nil)
|
|
|
|
|
|
|
|
|
|
(defun vip-nil ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(error ""))
|
|
|
|
|
|
|
|
|
|
(defun vip-looking-back (str)
|
|
|
|
|
"returns t if looking back reg-exp STR before point."
|
|
|
|
|
(and (save-excursion (re-search-backward str nil t))
|
|
|
|
|
(= (point) (match-end 0))))
|
|
|
|
|
|
|
|
|
|
(defun vip-check-sub (str)
|
|
|
|
|
"check if ex-token is an initial segment of STR"
|
|
|
|
|
(let ((length (length ex-token)))
|
|
|
|
|
(if (and (<= length (length str))
|
|
|
|
|
(string= ex-token (substring str 0 length)))
|
|
|
|
|
(setq ex-token str)
|
|
|
|
|
(setq ex-token-type "non-command"))))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-com-subr ()
|
|
|
|
|
"get a complete ex command"
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[a-z][a-z]*")
|
|
|
|
|
(setq ex-token-type "command")
|
|
|
|
|
(setq ex-token (buffer-substring (point) (mark)))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(cond ((looking-at "a")
|
|
|
|
|
(cond ((looking-at "ab") (vip-check-sub "abbreviate"))
|
|
|
|
|
((looking-at "ar") (vip-check-sub "args"))
|
|
|
|
|
(t (vip-check-sub "append"))))
|
|
|
|
|
((looking-at "[bh]") (setq ex-token-type "non-command"))
|
|
|
|
|
((looking-at "c")
|
|
|
|
|
(if (looking-at "co") (vip-check-sub "copy")
|
|
|
|
|
(vip-check-sub "change")))
|
|
|
|
|
((looking-at "d") (vip-check-sub "delete"))
|
|
|
|
|
((looking-at "e")
|
|
|
|
|
(if (looking-at "ex") (vip-check-sub "ex")
|
|
|
|
|
(vip-check-sub "edit")))
|
|
|
|
|
((looking-at "f") (vip-check-sub "file"))
|
|
|
|
|
((looking-at "g") (vip-check-sub "global"))
|
|
|
|
|
((looking-at "i") (vip-check-sub "insert"))
|
|
|
|
|
((looking-at "j") (vip-check-sub "join"))
|
|
|
|
|
((looking-at "l") (vip-check-sub "list"))
|
|
|
|
|
((looking-at "m")
|
|
|
|
|
(cond ((looking-at "map") (vip-check-sub "map"))
|
|
|
|
|
((looking-at "mar") (vip-check-sub "mark"))
|
|
|
|
|
(t (vip-check-sub "move"))))
|
|
|
|
|
((looking-at "n")
|
|
|
|
|
(if (looking-at "nu") (vip-check-sub "number")
|
|
|
|
|
(vip-check-sub "next")))
|
|
|
|
|
((looking-at "o") (vip-check-sub "open"))
|
|
|
|
|
((looking-at "p")
|
|
|
|
|
(cond ((looking-at "pre") (vip-check-sub "preserve"))
|
|
|
|
|
((looking-at "pu") (vip-check-sub "put"))
|
|
|
|
|
(t (vip-check-sub "print"))))
|
|
|
|
|
((looking-at "q") (vip-check-sub "quit"))
|
|
|
|
|
((looking-at "r")
|
|
|
|
|
(cond ((looking-at "rec") (vip-check-sub "recover"))
|
|
|
|
|
((looking-at "rew") (vip-check-sub "rewind"))
|
|
|
|
|
(t (vip-check-sub "read"))))
|
|
|
|
|
((looking-at "s")
|
|
|
|
|
(cond ((looking-at "se") (vip-check-sub "set"))
|
|
|
|
|
((looking-at "sh") (vip-check-sub "shell"))
|
|
|
|
|
((looking-at "so") (vip-check-sub "source"))
|
|
|
|
|
((looking-at "st") (vip-check-sub "stop"))
|
|
|
|
|
(t (vip-check-sub "substitute"))))
|
|
|
|
|
((looking-at "t")
|
|
|
|
|
(if (looking-at "ta") (vip-check-sub "tag")
|
|
|
|
|
(vip-check-sub "t")))
|
|
|
|
|
((looking-at "u")
|
|
|
|
|
(cond ((looking-at "una") (vip-check-sub "unabbreviate"))
|
|
|
|
|
((looking-at "unm") (vip-check-sub "unmap"))
|
|
|
|
|
(t (vip-check-sub "undo"))))
|
|
|
|
|
((looking-at "v")
|
|
|
|
|
(cond ((looking-at "ve") (vip-check-sub "version"))
|
|
|
|
|
((looking-at "vi") (vip-check-sub "visual"))
|
|
|
|
|
(t (vip-check-sub "v"))))
|
|
|
|
|
((looking-at "w")
|
|
|
|
|
(if (looking-at "wq") (vip-check-sub "wq")
|
|
|
|
|
(vip-check-sub "write")))
|
|
|
|
|
((looking-at "x") (vip-check-sub "xit"))
|
|
|
|
|
((looking-at "y") (vip-check-sub "yank"))
|
|
|
|
|
((looking-at "z") (vip-check-sub "z")))
|
|
|
|
|
(exchange-point-and-mark))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-token ()
|
|
|
|
|
"get an ex-token which is either an address or a command.
|
|
|
|
|
a token has type \(command, address, end-mark\) and value."
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(cond ((looking-at "[k#]")
|
|
|
|
|
(setq ex-token-type "command")
|
|
|
|
|
(setq ex-token (char-to-string (following-char)))
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
((looking-at "[a-z]") (vip-get-ex-com-subr))
|
|
|
|
|
((looking-at "\\.")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "dot"))
|
|
|
|
|
((looking-at "[0-9]")
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[0-9]*")
|
|
|
|
|
(setq ex-token-type
|
|
|
|
|
(cond ((string= ex-token-type "plus") "add-number")
|
|
|
|
|
((string= ex-token-type "minus") "sub-number")
|
|
|
|
|
(t "abs-number")))
|
2005-05-16 11:34:49 +00:00
|
|
|
|
(setq ex-token (string-to-number (buffer-substring (point) (mark)))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
((looking-at "\\$")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "end"))
|
|
|
|
|
((looking-at "%")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "whole"))
|
Fix regular-expression glitches and typos
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html
* admin/admin.el (set-version):
* lisp/allout.el (allout-latexify-one-item):
* lisp/arc-mode.el (archive-arc-rename-entry)
(archive-rar-summarize):
* lisp/calc/calc-graph.el (calc-graph-set-styles)
(calc-graph-hide):
* lisp/calc/calc-help.el (calc-describe-key):
* lisp/calc/calc-lang.el (math-compose-tex-func, eqn):
* lisp/calc/calc.el (calcDigit-key):
* lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list):
* lisp/cedet/ede/speedbar.el (ede-tag-expand):
* lisp/cedet/semantic/sb.el (semantic-sb-show-extra)
(semantic-sb-expand-group):
* lisp/comint.el (comint-substitute-in-file-name):
* lisp/dired.el (dired-actual-switches):
* lisp/emacs-lisp/chart.el (chart-rmail-from):
* lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand):
* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand):
* lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p):
* lisp/emulation/viper-ex.el (viper-get-ex-token)
(viper-get-ex-pat, ex-set-read-variable):
* lisp/epg.el (epg--status-SIG_CREATED):
* lisp/erc/erc-speedbar.el (erc-speedbar-expand-user):
(erc-speedbar-expand-channel, erc-speedbar-expand-server)
* lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p)
(erc-banlist-update):
* lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd):
* lisp/find-dired.el (find-dired):
* lisp/frame.el (frame-set-background-mode):
* lisp/generic-x.el (apache-log-generic-mode):
* lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/ibuffer.el (ibuffer-fontification-alist):
* lisp/ido.el (ido-set-matches-1):
* lisp/info-xref.el (info-xref-lock-file-p):
* lisp/info.el (Info-dir-remove-duplicates)
(Info-unescape-quotes, Info-split-parameter-string)
(Info-speedbar-expand-node):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer):
* lisp/mail/rmail.el (rmail-collect-deleted):
* lisp/mh-e/mh-alias.el (mh-alias-suggest-alias):
* lisp/mh-e/mh-comp.el (mh-forward):
* lisp/mh-e/mh-search.el (mh-index-next-folder)
(mh-index-create-imenu-index):
* lisp/mh-e/mh-xface.el (mh-picon-get-image):
* lisp/minibuffer.el (completion--embedded-envvar-re):
* lisp/net/ange-ftp.el (ange-ftp-ls-parser):
* lisp/net/goto-addr.el (goto-address-mail-regexp)
(goto-address-find-address-at-point):
* lisp/net/pop3.el (pop3-read-response, pop3-user)
(pop3-pass, pop3-apop):
* lisp/net/tramp.el (tramp-ipv6-regexp)
(tramp-replace-environment-variables):
* lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* lisp/nxml/rng-uri.el (rng-uri-escape-multibyte):
* lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri):
* lisp/obsolete/pgg.el (pgg-fetch-key):
* lisp/obsolete/vip.el (vip-get-ex-token):
* lisp/org/ob-core.el (org-babel-string-read):
* lisp/org/org-agenda.el:
(org-agenda-add-entry-to-org-agenda-diary-file):
* lisp/org/org-element.el (org-element-keyword-parser):
* lisp/org/org-list.el (org-list-indent-item-generic):
* lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/org/org-mouse.el (org-mouse-context-menu):
* lisp/org/org-plot.el (org-plot/gnuplot):
* lisp/org/org-protocol.el (org-protocol-flatten-greedy):
* lisp/org/org-table.el (org-table-copy-down)
(org-table-formula-make-cmp-string)
(org-table-get-stored-formulas, org-table-recalculate)
(org-table-edit-formulas):
* lisp/org/org.el (org-translate-link-from-planner)
(org-fill-line-break-nobreak-p):
* lisp/org/ox-ascii.el (org-ascii-item):
* lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks):
* lisp/org/ox.el (org-export-expand-include-keyword):
* lisp/progmodes/ada-xref.el (ada-treat-cmd-string):
* lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords):
* lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-have-help-regexp, cperl-word-at-point-hard)
(cperl-make-regexp-x):
* lisp/progmodes/dcl-mode.el (dcl-option-value-offset):
* lisp/progmodes/etags.el (tag-implicit-name-match-p):
* lisp/progmodes/fortran.el (fortran-fill):
* lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node)
(gdb-locals-handler-custom):
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
* lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath):
* lisp/progmodes/js.el (js--continued-expression-p):
* lisp/progmodes/m4-mode.el (m4-font-lock-keywords):
* lisp/progmodes/meta-mode.el (meta-indent-level-count):
* lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords):
* lisp/progmodes/opascal.el (opascal-find-unit-in-directory):
* lisp/progmodes/pascal.el (pascal-progbeg-re):
* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re)
(ruby-expr-beg, ruby-parse-partial)
(ruby-toggle-string-quotes, ruby-font-lock-keywords):
* lisp/progmodes/sql.el (sql--make-help-docstring):
* lisp/progmodes/verilog-mode.el (verilog-coverpoint-re)
(verilog-skip-forward-comment-p)
(verilog-read-sub-decls-gate)
(verilog-read-auto-template-middle):
* lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable)
(vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity)
(vhdl-speedbar-expand-architecture)
(vhdl-speedbar-expand-config, vhdl-speedbar-expand-package)
(vhdl-speedbar-dired):
* lisp/speedbar.el (speedbar-dired, speedbar-tag-file)
(speedbar-tag-expand):
* lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords):
* lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked):
* lisp/textmodes/ispell.el (ispell-process-line):
* lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry):
* lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes):
* lisp/url/url-parse.el (url-generic-parse-url):
* lisp/url/url-util.el (url-truncate-url-for-viewing):
* lisp/vc/diff-mode.el (diff-unified->context):
* lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist):
* lisp/vc/vc-cvs.el (vc-cvs-parse-status):
* lisp/woman.el (woman0-el, woman-if-ignore)
(woman-change-fonts):
* lisp/xdg.el (xdg--substitute-home-env):
Fix regular-expression infelicities and typos.
Fix regular expression typos
Fix typos reported by Mattias Engdegård in:
that occurred in preloaded modules.
* lisp/frame.el (frame-set-background-mode):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/minibuffer.el (completion--embedded-envvar-re):
2019-03-05 02:00:00 +00:00
|
|
|
|
((looking-at "\\+")
|
|
|
|
|
(cond ((looking-at "\\+[-+\n|]")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(forward-char 1)
|
|
|
|
|
(insert "1")
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq ex-token-type "plus"))
|
Fix regular-expression glitches and typos
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html
* admin/admin.el (set-version):
* lisp/allout.el (allout-latexify-one-item):
* lisp/arc-mode.el (archive-arc-rename-entry)
(archive-rar-summarize):
* lisp/calc/calc-graph.el (calc-graph-set-styles)
(calc-graph-hide):
* lisp/calc/calc-help.el (calc-describe-key):
* lisp/calc/calc-lang.el (math-compose-tex-func, eqn):
* lisp/calc/calc.el (calcDigit-key):
* lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list):
* lisp/cedet/ede/speedbar.el (ede-tag-expand):
* lisp/cedet/semantic/sb.el (semantic-sb-show-extra)
(semantic-sb-expand-group):
* lisp/comint.el (comint-substitute-in-file-name):
* lisp/dired.el (dired-actual-switches):
* lisp/emacs-lisp/chart.el (chart-rmail-from):
* lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand):
* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand):
* lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p):
* lisp/emulation/viper-ex.el (viper-get-ex-token)
(viper-get-ex-pat, ex-set-read-variable):
* lisp/epg.el (epg--status-SIG_CREATED):
* lisp/erc/erc-speedbar.el (erc-speedbar-expand-user):
(erc-speedbar-expand-channel, erc-speedbar-expand-server)
* lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p)
(erc-banlist-update):
* lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd):
* lisp/find-dired.el (find-dired):
* lisp/frame.el (frame-set-background-mode):
* lisp/generic-x.el (apache-log-generic-mode):
* lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/ibuffer.el (ibuffer-fontification-alist):
* lisp/ido.el (ido-set-matches-1):
* lisp/info-xref.el (info-xref-lock-file-p):
* lisp/info.el (Info-dir-remove-duplicates)
(Info-unescape-quotes, Info-split-parameter-string)
(Info-speedbar-expand-node):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer):
* lisp/mail/rmail.el (rmail-collect-deleted):
* lisp/mh-e/mh-alias.el (mh-alias-suggest-alias):
* lisp/mh-e/mh-comp.el (mh-forward):
* lisp/mh-e/mh-search.el (mh-index-next-folder)
(mh-index-create-imenu-index):
* lisp/mh-e/mh-xface.el (mh-picon-get-image):
* lisp/minibuffer.el (completion--embedded-envvar-re):
* lisp/net/ange-ftp.el (ange-ftp-ls-parser):
* lisp/net/goto-addr.el (goto-address-mail-regexp)
(goto-address-find-address-at-point):
* lisp/net/pop3.el (pop3-read-response, pop3-user)
(pop3-pass, pop3-apop):
* lisp/net/tramp.el (tramp-ipv6-regexp)
(tramp-replace-environment-variables):
* lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* lisp/nxml/rng-uri.el (rng-uri-escape-multibyte):
* lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri):
* lisp/obsolete/pgg.el (pgg-fetch-key):
* lisp/obsolete/vip.el (vip-get-ex-token):
* lisp/org/ob-core.el (org-babel-string-read):
* lisp/org/org-agenda.el:
(org-agenda-add-entry-to-org-agenda-diary-file):
* lisp/org/org-element.el (org-element-keyword-parser):
* lisp/org/org-list.el (org-list-indent-item-generic):
* lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/org/org-mouse.el (org-mouse-context-menu):
* lisp/org/org-plot.el (org-plot/gnuplot):
* lisp/org/org-protocol.el (org-protocol-flatten-greedy):
* lisp/org/org-table.el (org-table-copy-down)
(org-table-formula-make-cmp-string)
(org-table-get-stored-formulas, org-table-recalculate)
(org-table-edit-formulas):
* lisp/org/org.el (org-translate-link-from-planner)
(org-fill-line-break-nobreak-p):
* lisp/org/ox-ascii.el (org-ascii-item):
* lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks):
* lisp/org/ox.el (org-export-expand-include-keyword):
* lisp/progmodes/ada-xref.el (ada-treat-cmd-string):
* lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords):
* lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-have-help-regexp, cperl-word-at-point-hard)
(cperl-make-regexp-x):
* lisp/progmodes/dcl-mode.el (dcl-option-value-offset):
* lisp/progmodes/etags.el (tag-implicit-name-match-p):
* lisp/progmodes/fortran.el (fortran-fill):
* lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node)
(gdb-locals-handler-custom):
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
* lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath):
* lisp/progmodes/js.el (js--continued-expression-p):
* lisp/progmodes/m4-mode.el (m4-font-lock-keywords):
* lisp/progmodes/meta-mode.el (meta-indent-level-count):
* lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords):
* lisp/progmodes/opascal.el (opascal-find-unit-in-directory):
* lisp/progmodes/pascal.el (pascal-progbeg-re):
* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re)
(ruby-expr-beg, ruby-parse-partial)
(ruby-toggle-string-quotes, ruby-font-lock-keywords):
* lisp/progmodes/sql.el (sql--make-help-docstring):
* lisp/progmodes/verilog-mode.el (verilog-coverpoint-re)
(verilog-skip-forward-comment-p)
(verilog-read-sub-decls-gate)
(verilog-read-auto-template-middle):
* lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable)
(vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity)
(vhdl-speedbar-expand-architecture)
(vhdl-speedbar-expand-config, vhdl-speedbar-expand-package)
(vhdl-speedbar-dired):
* lisp/speedbar.el (speedbar-dired, speedbar-tag-file)
(speedbar-tag-expand):
* lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords):
* lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked):
* lisp/textmodes/ispell.el (ispell-process-line):
* lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry):
* lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes):
* lisp/url/url-parse.el (url-generic-parse-url):
* lisp/url/url-util.el (url-truncate-url-for-viewing):
* lisp/vc/diff-mode.el (diff-unified->context):
* lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist):
* lisp/vc/vc-cvs.el (vc-cvs-parse-status):
* lisp/woman.el (woman0-el, woman-if-ignore)
(woman-change-fonts):
* lisp/xdg.el (xdg--substitute-home-env):
Fix regular-expression infelicities and typos.
Fix regular expression typos
Fix typos reported by Mattias Engdegård in:
that occurred in preloaded modules.
* lisp/frame.el (frame-set-background-mode):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/minibuffer.el (completion--embedded-envvar-re):
2019-03-05 02:00:00 +00:00
|
|
|
|
((looking-at "\\+[0-9]")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "plus"))
|
|
|
|
|
(t
|
|
|
|
|
(error "Badly formed address"))))
|
|
|
|
|
((looking-at "-")
|
Fix regular-expression glitches and typos
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html
* admin/admin.el (set-version):
* lisp/allout.el (allout-latexify-one-item):
* lisp/arc-mode.el (archive-arc-rename-entry)
(archive-rar-summarize):
* lisp/calc/calc-graph.el (calc-graph-set-styles)
(calc-graph-hide):
* lisp/calc/calc-help.el (calc-describe-key):
* lisp/calc/calc-lang.el (math-compose-tex-func, eqn):
* lisp/calc/calc.el (calcDigit-key):
* lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list):
* lisp/cedet/ede/speedbar.el (ede-tag-expand):
* lisp/cedet/semantic/sb.el (semantic-sb-show-extra)
(semantic-sb-expand-group):
* lisp/comint.el (comint-substitute-in-file-name):
* lisp/dired.el (dired-actual-switches):
* lisp/emacs-lisp/chart.el (chart-rmail-from):
* lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand):
* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand):
* lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p):
* lisp/emulation/viper-ex.el (viper-get-ex-token)
(viper-get-ex-pat, ex-set-read-variable):
* lisp/epg.el (epg--status-SIG_CREATED):
* lisp/erc/erc-speedbar.el (erc-speedbar-expand-user):
(erc-speedbar-expand-channel, erc-speedbar-expand-server)
* lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p)
(erc-banlist-update):
* lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd):
* lisp/find-dired.el (find-dired):
* lisp/frame.el (frame-set-background-mode):
* lisp/generic-x.el (apache-log-generic-mode):
* lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/ibuffer.el (ibuffer-fontification-alist):
* lisp/ido.el (ido-set-matches-1):
* lisp/info-xref.el (info-xref-lock-file-p):
* lisp/info.el (Info-dir-remove-duplicates)
(Info-unescape-quotes, Info-split-parameter-string)
(Info-speedbar-expand-node):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer):
* lisp/mail/rmail.el (rmail-collect-deleted):
* lisp/mh-e/mh-alias.el (mh-alias-suggest-alias):
* lisp/mh-e/mh-comp.el (mh-forward):
* lisp/mh-e/mh-search.el (mh-index-next-folder)
(mh-index-create-imenu-index):
* lisp/mh-e/mh-xface.el (mh-picon-get-image):
* lisp/minibuffer.el (completion--embedded-envvar-re):
* lisp/net/ange-ftp.el (ange-ftp-ls-parser):
* lisp/net/goto-addr.el (goto-address-mail-regexp)
(goto-address-find-address-at-point):
* lisp/net/pop3.el (pop3-read-response, pop3-user)
(pop3-pass, pop3-apop):
* lisp/net/tramp.el (tramp-ipv6-regexp)
(tramp-replace-environment-variables):
* lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* lisp/nxml/rng-uri.el (rng-uri-escape-multibyte):
* lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri):
* lisp/obsolete/pgg.el (pgg-fetch-key):
* lisp/obsolete/vip.el (vip-get-ex-token):
* lisp/org/ob-core.el (org-babel-string-read):
* lisp/org/org-agenda.el:
(org-agenda-add-entry-to-org-agenda-diary-file):
* lisp/org/org-element.el (org-element-keyword-parser):
* lisp/org/org-list.el (org-list-indent-item-generic):
* lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/org/org-mouse.el (org-mouse-context-menu):
* lisp/org/org-plot.el (org-plot/gnuplot):
* lisp/org/org-protocol.el (org-protocol-flatten-greedy):
* lisp/org/org-table.el (org-table-copy-down)
(org-table-formula-make-cmp-string)
(org-table-get-stored-formulas, org-table-recalculate)
(org-table-edit-formulas):
* lisp/org/org.el (org-translate-link-from-planner)
(org-fill-line-break-nobreak-p):
* lisp/org/ox-ascii.el (org-ascii-item):
* lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks):
* lisp/org/ox.el (org-export-expand-include-keyword):
* lisp/progmodes/ada-xref.el (ada-treat-cmd-string):
* lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords):
* lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-have-help-regexp, cperl-word-at-point-hard)
(cperl-make-regexp-x):
* lisp/progmodes/dcl-mode.el (dcl-option-value-offset):
* lisp/progmodes/etags.el (tag-implicit-name-match-p):
* lisp/progmodes/fortran.el (fortran-fill):
* lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node)
(gdb-locals-handler-custom):
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
* lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath):
* lisp/progmodes/js.el (js--continued-expression-p):
* lisp/progmodes/m4-mode.el (m4-font-lock-keywords):
* lisp/progmodes/meta-mode.el (meta-indent-level-count):
* lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords):
* lisp/progmodes/opascal.el (opascal-find-unit-in-directory):
* lisp/progmodes/pascal.el (pascal-progbeg-re):
* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re)
(ruby-expr-beg, ruby-parse-partial)
(ruby-toggle-string-quotes, ruby-font-lock-keywords):
* lisp/progmodes/sql.el (sql--make-help-docstring):
* lisp/progmodes/verilog-mode.el (verilog-coverpoint-re)
(verilog-skip-forward-comment-p)
(verilog-read-sub-decls-gate)
(verilog-read-auto-template-middle):
* lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable)
(vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity)
(vhdl-speedbar-expand-architecture)
(vhdl-speedbar-expand-config, vhdl-speedbar-expand-package)
(vhdl-speedbar-dired):
* lisp/speedbar.el (speedbar-dired, speedbar-tag-file)
(speedbar-tag-expand):
* lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords):
* lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked):
* lisp/textmodes/ispell.el (ispell-process-line):
* lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry):
* lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes):
* lisp/url/url-parse.el (url-generic-parse-url):
* lisp/url/url-util.el (url-truncate-url-for-viewing):
* lisp/vc/diff-mode.el (diff-unified->context):
* lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist):
* lisp/vc/vc-cvs.el (vc-cvs-parse-status):
* lisp/woman.el (woman0-el, woman-if-ignore)
(woman-change-fonts):
* lisp/xdg.el (xdg--substitute-home-env):
Fix regular-expression infelicities and typos.
Fix regular expression typos
Fix typos reported by Mattias Engdegård in:
that occurred in preloaded modules.
* lisp/frame.el (frame-set-background-mode):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/minibuffer.el (completion--embedded-envvar-re):
2019-03-05 02:00:00 +00:00
|
|
|
|
(cond ((looking-at "-[-+\n|]")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(forward-char 1)
|
|
|
|
|
(insert "1")
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq ex-token-type "minus"))
|
|
|
|
|
((looking-at "-[0-9]")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "minus"))
|
|
|
|
|
(t
|
|
|
|
|
(error "Badly formed address"))))
|
|
|
|
|
((looking-at "/")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(let ((cont t))
|
|
|
|
|
(while (and (not (eolp)) cont)
|
|
|
|
|
;;(re-search-forward "[^/]*/")
|
|
|
|
|
(re-search-forward "[^/]*\\(/\\|\n\\)")
|
2019-03-19 00:02:01 +00:00
|
|
|
|
(if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq cont nil))))
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq ex-token (buffer-substring (point) (mark)))
|
|
|
|
|
(if (looking-at "/") (forward-char 1))
|
|
|
|
|
(setq ex-token-type "search-forward"))
|
|
|
|
|
((looking-at "\\?")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(let ((cont t))
|
|
|
|
|
(while (and (not (eolp)) cont)
|
|
|
|
|
;;(re-search-forward "[^\\?]*\\?")
|
|
|
|
|
(re-search-forward "[^\\?]*\\(\\?\\|\n\\)")
|
2019-03-19 00:02:01 +00:00
|
|
|
|
(if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\\\?"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq cont nil))
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(if (not (looking-at "\n")) (forward-char 1))))
|
|
|
|
|
(setq ex-token-type "search-backward")
|
|
|
|
|
(setq ex-token (buffer-substring (1- (point)) (mark))))
|
|
|
|
|
((looking-at ",")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "comma"))
|
|
|
|
|
((looking-at ";")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq ex-token-type "semi-colon"))
|
|
|
|
|
((looking-at "[!=><&~]")
|
|
|
|
|
(setq ex-token-type "command")
|
|
|
|
|
(setq ex-token (char-to-string (following-char)))
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
((looking-at "'")
|
|
|
|
|
(setq ex-token-type "goto-mark")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(cond ((looking-at "'") (setq ex-token nil))
|
|
|
|
|
((looking-at "[a-z]") (setq ex-token (following-char)))
|
2019-11-11 18:30:13 +00:00
|
|
|
|
(t (error "%s" "Marks are ' and a-z" ?')))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(forward-char 1))
|
|
|
|
|
((looking-at "\n")
|
|
|
|
|
(setq ex-token-type "end-mark")
|
|
|
|
|
(setq ex-token "goto"))
|
|
|
|
|
(t
|
2005-03-25 08:30:01 +00:00
|
|
|
|
(error "invalid token")))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-ex (&optional string)
|
|
|
|
|
"ex commands within VIP."
|
|
|
|
|
(interactive)
|
|
|
|
|
(or string
|
|
|
|
|
(setq ex-g-flag nil
|
|
|
|
|
ex-g-variant nil))
|
|
|
|
|
(let ((com-str (or string (vip-read-string ":")))
|
|
|
|
|
(address nil) (cont t) (dot (point)))
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create " *ex-working-space*")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
|
(insert com-str "\n")
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
(setq ex-token-type "")
|
|
|
|
|
(setq ex-addresses nil)
|
|
|
|
|
(while cont
|
|
|
|
|
(vip-get-ex-token)
|
|
|
|
|
(cond ((or (string= ex-token-type "command")
|
|
|
|
|
(string= ex-token-type "end-mark"))
|
|
|
|
|
(if address (setq ex-addresses (cons address ex-addresses)))
|
|
|
|
|
(cond ((string= ex-token "global")
|
|
|
|
|
(ex-global nil)
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
((string= ex-token "v")
|
|
|
|
|
(ex-global t)
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
(t
|
|
|
|
|
(vip-execute-ex-command)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(cond ((looking-at "|")
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
((looking-at "\n")
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
(t (error "Extra character at end of a command")))))))
|
|
|
|
|
((string= ex-token-type "non-command")
|
2005-06-16 14:38:12 +00:00
|
|
|
|
(error "%s: Not an editor command" ex-token))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
((string= ex-token-type "whole")
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(cons (point-max) (cons (point-min) ex-addresses))))
|
|
|
|
|
((string= ex-token-type "comma")
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(cons (if (null address) (point) address) ex-addresses)))
|
|
|
|
|
((string= ex-token-type "semi-colon")
|
|
|
|
|
(if address (setq dot address))
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(cons (if (null address) (point) address) ex-addresses)))
|
|
|
|
|
(t (let ((ans (vip-get-ex-address-subr address dot)))
|
|
|
|
|
(if ans (setq address ans))))))))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-pat ()
|
|
|
|
|
"get a regular expression and set ex-variant if found"
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "!")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-g-variant (not ex-g-variant)
|
|
|
|
|
ex-g-flag (not ex-g-flag))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(if (looking-at "/")
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(let ((cont t))
|
|
|
|
|
(while (and (not (eolp)) cont)
|
|
|
|
|
(re-search-forward "[^/]*\\(/\\|\n\\)")
|
|
|
|
|
;;(re-search-forward "[^/]*/")
|
2019-03-19 00:02:01 +00:00
|
|
|
|
(if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(setq cont nil))))
|
|
|
|
|
(setq ex-token
|
|
|
|
|
(if (= (mark) (point)) ""
|
|
|
|
|
(buffer-substring (1- (point)) (mark))))
|
|
|
|
|
(backward-char 1))
|
|
|
|
|
(setq ex-token nil))))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-command ()
|
|
|
|
|
"get an ex command"
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (looking-at "/") (forward-char 1))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(cond ((looking-at "[a-z]")
|
|
|
|
|
(vip-get-ex-com-subr)
|
|
|
|
|
(if (string= ex-token-type "non-command")
|
|
|
|
|
(error "%s: not an editor command" ex-token)))
|
|
|
|
|
((looking-at "[!=><&~]")
|
|
|
|
|
(setq ex-token (char-to-string (following-char)))
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
(t (error "Could not find an ex command")))))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-opt-gc ()
|
|
|
|
|
"get an ex option g or c"
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if (looking-at "/") (forward-char 1))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(cond ((looking-at "g")
|
|
|
|
|
(setq ex-token "g")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
t)
|
|
|
|
|
((looking-at "c")
|
|
|
|
|
(setq ex-token "c")
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
t)
|
|
|
|
|
(t nil))))
|
|
|
|
|
|
|
|
|
|
(defun vip-default-ex-addresses (&optional whole-flag)
|
|
|
|
|
"compute default addresses. whole-flag means whole buffer."
|
|
|
|
|
(cond ((null ex-addresses)
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(if whole-flag
|
|
|
|
|
(cons (point-max) (cons (point-min) nil))
|
|
|
|
|
(cons (point) (cons (point) nil)))))
|
|
|
|
|
((null (cdr ex-addresses))
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(cons (car ex-addresses) ex-addresses)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-address ()
|
|
|
|
|
"get an ex-address as a marker and set ex-flag if a flag is found"
|
|
|
|
|
(let ((address (point-marker)) (cont t))
|
|
|
|
|
(setq ex-token "")
|
|
|
|
|
(setq ex-flag nil)
|
|
|
|
|
(while cont
|
|
|
|
|
(vip-get-ex-token)
|
|
|
|
|
(cond ((string= ex-token-type "command")
|
|
|
|
|
(if (or (string= ex-token "print") (string= ex-token "list")
|
|
|
|
|
(string= ex-token "#"))
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-flag t)
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
(error "address expected")))
|
|
|
|
|
((string= ex-token-type "end-mark")
|
|
|
|
|
(setq cont nil))
|
|
|
|
|
((string= ex-token-type "whole")
|
|
|
|
|
(error "a trailing address is expected"))
|
|
|
|
|
((string= ex-token-type "comma")
|
|
|
|
|
(error "Extra characters after an address"))
|
|
|
|
|
(t (let ((ans (vip-get-ex-address-subr address (point-marker))))
|
|
|
|
|
(if ans (setq address ans))))))
|
|
|
|
|
address))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-address-subr (old-address dot)
|
|
|
|
|
"returns an address as a point"
|
|
|
|
|
(let ((address nil))
|
|
|
|
|
(if (null old-address) (setq old-address dot))
|
|
|
|
|
(cond ((string= ex-token-type "dot")
|
|
|
|
|
(setq address dot))
|
|
|
|
|
((string= ex-token-type "add-number")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char old-address)
|
|
|
|
|
(forward-line (if (= old-address 0) (1- ex-token) ex-token))
|
|
|
|
|
(setq address (point-marker))))
|
|
|
|
|
((string= ex-token-type "sub-number")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char old-address)
|
|
|
|
|
(forward-line (- ex-token))
|
|
|
|
|
(setq address (point-marker))))
|
|
|
|
|
((string= ex-token-type "abs-number")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (= ex-token 0) (setq address 0)
|
|
|
|
|
(forward-line (1- ex-token))
|
|
|
|
|
(setq address (point-marker)))))
|
|
|
|
|
((string= ex-token-type "end")
|
|
|
|
|
(setq address (point-max-marker)))
|
|
|
|
|
((string= ex-token-type "plus") t);; do nothing
|
|
|
|
|
((string= ex-token-type "minus") t);; do nothing
|
|
|
|
|
((string= ex-token-type "search-forward")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(ex-search-address t)
|
|
|
|
|
(setq address (point-marker))))
|
|
|
|
|
((string= ex-token-type "search-backward")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(ex-search-address nil)
|
|
|
|
|
(setq address (point-marker))))
|
|
|
|
|
((string= ex-token-type "goto-mark")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (null ex-token)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(goto-char (register-to-point (- ex-token (- ?a ?\C-a)))))
|
|
|
|
|
(setq address (point-marker)))))
|
|
|
|
|
address))
|
|
|
|
|
|
|
|
|
|
(defun ex-search-address (forward)
|
|
|
|
|
"search pattern and set address"
|
|
|
|
|
(if (string= ex-token "")
|
|
|
|
|
(if (null vip-s-string) (error "No previous search string")
|
|
|
|
|
(setq ex-token vip-s-string))
|
|
|
|
|
(setq vip-s-string ex-token))
|
|
|
|
|
(if forward
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(re-search-forward ex-token))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(re-search-backward ex-token)))
|
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-buffer ()
|
|
|
|
|
"get a buffer name and set ex-count and ex-flag if found"
|
|
|
|
|
(setq ex-buffer nil)
|
|
|
|
|
(setq ex-count nil)
|
|
|
|
|
(setq ex-flag nil)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "[a-zA-Z]")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-buffer (following-char))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(if (looking-at "[0-9]")
|
|
|
|
|
(progn
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[0-9][0-9]*")
|
2005-05-16 11:34:49 +00:00
|
|
|
|
(setq ex-count (string-to-number (buffer-substring (point) (mark))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(if (looking-at "[pl#]")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-flag t)
|
|
|
|
|
(forward-char 1)))
|
|
|
|
|
(if (not (looking-at "[\n|]"))
|
2005-03-25 08:30:01 +00:00
|
|
|
|
(error "Invalid extra characters"))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-count ()
|
|
|
|
|
(setq ex-variant nil
|
|
|
|
|
ex-count nil
|
|
|
|
|
ex-flag nil)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "!")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-variant t)
|
|
|
|
|
(forward-char 1)))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "[0-9]")
|
|
|
|
|
(progn
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[0-9][0-9]*")
|
2005-05-16 11:34:49 +00:00
|
|
|
|
(setq ex-count (string-to-number (buffer-substring (point) (mark))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(if (looking-at "[pl#]")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-flag t)
|
|
|
|
|
(forward-char 1)))
|
|
|
|
|
(if (not (looking-at "[\n|]"))
|
2005-03-25 08:30:01 +00:00
|
|
|
|
(error "Invalid extra characters"))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun vip-get-ex-file ()
|
|
|
|
|
"get a file name and set ex-variant, ex-append and ex-offset if found"
|
|
|
|
|
(setq ex-file nil
|
|
|
|
|
ex-variant nil
|
|
|
|
|
ex-append nil
|
|
|
|
|
ex-offset nil)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "!")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-variant t)
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(if (looking-at ">>")
|
|
|
|
|
(progn
|
|
|
|
|
(setq ex-append t
|
|
|
|
|
ex-variant t)
|
|
|
|
|
(forward-char 2)
|
|
|
|
|
(skip-chars-forward " \t")))
|
Fix regular-expression glitches and typos
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html
* admin/admin.el (set-version):
* lisp/allout.el (allout-latexify-one-item):
* lisp/arc-mode.el (archive-arc-rename-entry)
(archive-rar-summarize):
* lisp/calc/calc-graph.el (calc-graph-set-styles)
(calc-graph-hide):
* lisp/calc/calc-help.el (calc-describe-key):
* lisp/calc/calc-lang.el (math-compose-tex-func, eqn):
* lisp/calc/calc.el (calcDigit-key):
* lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list):
* lisp/cedet/ede/speedbar.el (ede-tag-expand):
* lisp/cedet/semantic/sb.el (semantic-sb-show-extra)
(semantic-sb-expand-group):
* lisp/comint.el (comint-substitute-in-file-name):
* lisp/dired.el (dired-actual-switches):
* lisp/emacs-lisp/chart.el (chart-rmail-from):
* lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand):
* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand):
* lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p):
* lisp/emulation/viper-ex.el (viper-get-ex-token)
(viper-get-ex-pat, ex-set-read-variable):
* lisp/epg.el (epg--status-SIG_CREATED):
* lisp/erc/erc-speedbar.el (erc-speedbar-expand-user):
(erc-speedbar-expand-channel, erc-speedbar-expand-server)
* lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p)
(erc-banlist-update):
* lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd):
* lisp/find-dired.el (find-dired):
* lisp/frame.el (frame-set-background-mode):
* lisp/generic-x.el (apache-log-generic-mode):
* lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/ibuffer.el (ibuffer-fontification-alist):
* lisp/ido.el (ido-set-matches-1):
* lisp/info-xref.el (info-xref-lock-file-p):
* lisp/info.el (Info-dir-remove-duplicates)
(Info-unescape-quotes, Info-split-parameter-string)
(Info-speedbar-expand-node):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer):
* lisp/mail/rmail.el (rmail-collect-deleted):
* lisp/mh-e/mh-alias.el (mh-alias-suggest-alias):
* lisp/mh-e/mh-comp.el (mh-forward):
* lisp/mh-e/mh-search.el (mh-index-next-folder)
(mh-index-create-imenu-index):
* lisp/mh-e/mh-xface.el (mh-picon-get-image):
* lisp/minibuffer.el (completion--embedded-envvar-re):
* lisp/net/ange-ftp.el (ange-ftp-ls-parser):
* lisp/net/goto-addr.el (goto-address-mail-regexp)
(goto-address-find-address-at-point):
* lisp/net/pop3.el (pop3-read-response, pop3-user)
(pop3-pass, pop3-apop):
* lisp/net/tramp.el (tramp-ipv6-regexp)
(tramp-replace-environment-variables):
* lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* lisp/nxml/rng-uri.el (rng-uri-escape-multibyte):
* lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri):
* lisp/obsolete/pgg.el (pgg-fetch-key):
* lisp/obsolete/vip.el (vip-get-ex-token):
* lisp/org/ob-core.el (org-babel-string-read):
* lisp/org/org-agenda.el:
(org-agenda-add-entry-to-org-agenda-diary-file):
* lisp/org/org-element.el (org-element-keyword-parser):
* lisp/org/org-list.el (org-list-indent-item-generic):
* lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/org/org-mouse.el (org-mouse-context-menu):
* lisp/org/org-plot.el (org-plot/gnuplot):
* lisp/org/org-protocol.el (org-protocol-flatten-greedy):
* lisp/org/org-table.el (org-table-copy-down)
(org-table-formula-make-cmp-string)
(org-table-get-stored-formulas, org-table-recalculate)
(org-table-edit-formulas):
* lisp/org/org.el (org-translate-link-from-planner)
(org-fill-line-break-nobreak-p):
* lisp/org/ox-ascii.el (org-ascii-item):
* lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks):
* lisp/org/ox.el (org-export-expand-include-keyword):
* lisp/progmodes/ada-xref.el (ada-treat-cmd-string):
* lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords):
* lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-have-help-regexp, cperl-word-at-point-hard)
(cperl-make-regexp-x):
* lisp/progmodes/dcl-mode.el (dcl-option-value-offset):
* lisp/progmodes/etags.el (tag-implicit-name-match-p):
* lisp/progmodes/fortran.el (fortran-fill):
* lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node)
(gdb-locals-handler-custom):
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
* lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath):
* lisp/progmodes/js.el (js--continued-expression-p):
* lisp/progmodes/m4-mode.el (m4-font-lock-keywords):
* lisp/progmodes/meta-mode.el (meta-indent-level-count):
* lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords):
* lisp/progmodes/opascal.el (opascal-find-unit-in-directory):
* lisp/progmodes/pascal.el (pascal-progbeg-re):
* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re)
(ruby-expr-beg, ruby-parse-partial)
(ruby-toggle-string-quotes, ruby-font-lock-keywords):
* lisp/progmodes/sql.el (sql--make-help-docstring):
* lisp/progmodes/verilog-mode.el (verilog-coverpoint-re)
(verilog-skip-forward-comment-p)
(verilog-read-sub-decls-gate)
(verilog-read-auto-template-middle):
* lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable)
(vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity)
(vhdl-speedbar-expand-architecture)
(vhdl-speedbar-expand-config, vhdl-speedbar-expand-package)
(vhdl-speedbar-dired):
* lisp/speedbar.el (speedbar-dired, speedbar-tag-file)
(speedbar-tag-expand):
* lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords):
* lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked):
* lisp/textmodes/ispell.el (ispell-process-line):
* lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry):
* lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes):
* lisp/url/url-parse.el (url-generic-parse-url):
* lisp/url/url-util.el (url-truncate-url-for-viewing):
* lisp/vc/diff-mode.el (diff-unified->context):
* lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist):
* lisp/vc/vc-cvs.el (vc-cvs-parse-status):
* lisp/woman.el (woman0-el, woman-if-ignore)
(woman-change-fonts):
* lisp/xdg.el (xdg--substitute-home-env):
Fix regular-expression infelicities and typos.
Fix regular expression typos
Fix typos reported by Mattias Engdegård in:
that occurred in preloaded modules.
* lisp/frame.el (frame-set-background-mode):
* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
* lisp/isearch.el (isearch-pre-command-hook):
* lisp/minibuffer.el (completion--embedded-envvar-re):
2019-03-05 02:00:00 +00:00
|
|
|
|
(if (looking-at "\\+")
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(progn
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[ \t\n]")
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq ex-offset (buffer-substring (point) (mark)))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")))
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[ \t\n]")
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq ex-file (buffer-substring (point) (mark)))))
|
|
|
|
|
|
|
|
|
|
(defun vip-execute-ex-command ()
|
|
|
|
|
"execute ex command using the value of addresses."
|
|
|
|
|
(cond ((string= ex-token "goto") (ex-goto))
|
|
|
|
|
((string= ex-token "copy") (ex-copy nil))
|
|
|
|
|
((string= ex-token "delete") (ex-delete))
|
|
|
|
|
((string= ex-token "edit") (ex-edit))
|
|
|
|
|
((string= ex-token "file") (vip-info-on-file))
|
|
|
|
|
;((string= ex-token "global") (ex-global nil))
|
|
|
|
|
((string= ex-token "join") (ex-line "join"))
|
|
|
|
|
((string= ex-token "k") (ex-mark))
|
|
|
|
|
((string= ex-token "mark") (ex-mark))
|
|
|
|
|
((string= ex-token "map") (ex-map))
|
|
|
|
|
((string= ex-token "move") (ex-copy t))
|
|
|
|
|
((string= ex-token "put") (ex-put))
|
|
|
|
|
((string= ex-token "quit") (ex-quit))
|
|
|
|
|
((string= ex-token "read") (ex-read))
|
|
|
|
|
((string= ex-token "set") (ex-set))
|
|
|
|
|
((string= ex-token "shell") (ex-shell))
|
|
|
|
|
((string= ex-token "substitute") (ex-substitute))
|
|
|
|
|
((string= ex-token "stop") (suspend-emacs))
|
|
|
|
|
((string= ex-token "t") (ex-copy nil))
|
|
|
|
|
((string= ex-token "tag") (ex-tag))
|
|
|
|
|
((string= ex-token "undo") (vip-undo))
|
|
|
|
|
((string= ex-token "unmap") (ex-unmap))
|
|
|
|
|
;((string= ex-token "v") (ex-global t))
|
|
|
|
|
((string= ex-token "version") (vip-version))
|
|
|
|
|
((string= ex-token "visual") (ex-edit))
|
|
|
|
|
((string= ex-token "write") (ex-write nil))
|
|
|
|
|
((string= ex-token "wq") (ex-write t))
|
|
|
|
|
((string= ex-token "yank") (ex-yank))
|
|
|
|
|
((string= ex-token "!") (ex-command))
|
|
|
|
|
((string= ex-token "=") (ex-line-no))
|
|
|
|
|
((string= ex-token ">") (ex-line "right"))
|
|
|
|
|
((string= ex-token "<") (ex-line "left"))
|
|
|
|
|
((string= ex-token "&") (ex-substitute t))
|
|
|
|
|
((string= ex-token "~") (ex-substitute t t))
|
|
|
|
|
((or (string= ex-token "append")
|
|
|
|
|
(string= ex-token "args")
|
|
|
|
|
(string= ex-token "change")
|
|
|
|
|
(string= ex-token "insert")
|
|
|
|
|
(string= ex-token "open")
|
|
|
|
|
)
|
1996-01-29 23:19:04 +00:00
|
|
|
|
(error "%s: no such command from VIP" ex-token))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
((or (string= ex-token "abbreviate")
|
|
|
|
|
(string= ex-token "list")
|
|
|
|
|
(string= ex-token "next")
|
|
|
|
|
(string= ex-token "print")
|
|
|
|
|
(string= ex-token "preserve")
|
|
|
|
|
(string= ex-token "recover")
|
|
|
|
|
(string= ex-token "rewind")
|
|
|
|
|
(string= ex-token "source")
|
|
|
|
|
(string= ex-token "unabbreviate")
|
|
|
|
|
(string= ex-token "xit")
|
|
|
|
|
(string= ex-token "z")
|
|
|
|
|
)
|
1996-01-29 23:19:04 +00:00
|
|
|
|
(error "%s: not implemented in VIP" ex-token))
|
|
|
|
|
(t (error "%s: Not an editor command" ex-token))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun ex-goto ()
|
|
|
|
|
"ex goto command"
|
|
|
|
|
(if (null ex-addresses)
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(setq ex-addresses (cons (point) nil)))
|
2017-04-28 08:25:26 +00:00
|
|
|
|
(push-mark)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(goto-char (car ex-addresses))
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
|
|
|
|
|
(defun ex-copy (del-flag)
|
|
|
|
|
"ex copy and move command. DEL-FLAG means delete."
|
|
|
|
|
(vip-default-ex-addresses)
|
|
|
|
|
(let ((address (vip-get-ex-address))
|
|
|
|
|
(end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-mark beg)
|
|
|
|
|
(vip-enlarge-region (mark) (point))
|
|
|
|
|
(if del-flag (kill-region (point) (mark))
|
|
|
|
|
(copy-region-as-kill (point) (mark)))
|
|
|
|
|
(if ex-flag
|
|
|
|
|
(progn
|
|
|
|
|
(with-output-to-temp-buffer "*copy text*"
|
|
|
|
|
(princ
|
|
|
|
|
(if (or del-flag ex-g-flag ex-g-variant)
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(current-kill 0)
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(buffer-substring (point) (mark)))))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn
|
|
|
|
|
(vip-read-string "[Hit return to continue] ")
|
|
|
|
|
(save-excursion (kill-buffer "*copy text*")))
|
|
|
|
|
(quit
|
|
|
|
|
(save-excursion (kill-buffer "*copy text*"))
|
|
|
|
|
(signal 'quit nil))))))
|
|
|
|
|
(if (= address 0)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(goto-char address)
|
|
|
|
|
(forward-line 1))
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(insert (current-kill 0))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun ex-delete ()
|
|
|
|
|
"ex delete"
|
|
|
|
|
(vip-default-ex-addresses)
|
|
|
|
|
(vip-get-ex-buffer)
|
|
|
|
|
(let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(if (> beg end) (error "First address exceeds second"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(if ex-count
|
|
|
|
|
(progn
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(forward-line (1- ex-count)))
|
|
|
|
|
(set-mark end))
|
|
|
|
|
(vip-enlarge-region (point) (mark))
|
|
|
|
|
(if ex-flag
|
|
|
|
|
;; show text to be deleted and ask for confirmation
|
|
|
|
|
(progn
|
|
|
|
|
(with-output-to-temp-buffer " *delete text*"
|
|
|
|
|
(princ (buffer-substring (point) (mark))))
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(vip-read-string "[Hit return to continue] ")
|
|
|
|
|
(quit
|
|
|
|
|
(save-excursion (kill-buffer " *delete text*"))
|
|
|
|
|
(error "")))
|
|
|
|
|
(save-excursion (kill-buffer " *delete text*")))
|
|
|
|
|
(if ex-buffer
|
|
|
|
|
(if (and (<= ?A ex-buffer) (<= ex-buffer ?Z))
|
|
|
|
|
(vip-append-to-register
|
1992-11-16 01:44:33 +00:00
|
|
|
|
(+ ex-buffer 32) (point) (mark))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(copy-to-register ex-buffer (point) (mark) nil)))
|
|
|
|
|
(delete-region (point) (mark))))))
|
|
|
|
|
|
|
|
|
|
(defun ex-edit ()
|
|
|
|
|
"ex-edit"
|
|
|
|
|
(vip-get-ex-file)
|
|
|
|
|
(if (and (not ex-variant) (buffer-modified-p) buffer-file-name)
|
|
|
|
|
(error "No write since last change \(:e! overrides\)"))
|
|
|
|
|
(vip-change-mode-to-emacs)
|
|
|
|
|
(set-buffer
|
|
|
|
|
(find-file-noselect (concat default-directory ex-file)))
|
|
|
|
|
(vip-change-mode-to-vi)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if ex-offset
|
|
|
|
|
(progn
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
|
(insert ex-offset "\n")
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
(goto-char (vip-get-ex-address))
|
|
|
|
|
(beginning-of-line))))
|
|
|
|
|
|
|
|
|
|
(defun ex-global (variant)
|
|
|
|
|
"ex global command"
|
|
|
|
|
(if (or ex-g-flag ex-g-variant)
|
|
|
|
|
(error "Global within global not allowed")
|
|
|
|
|
(if variant
|
|
|
|
|
(setq ex-g-flag nil
|
|
|
|
|
ex-g-variant t)
|
|
|
|
|
(setq ex-g-flag t
|
|
|
|
|
ex-g-variant nil)))
|
|
|
|
|
(vip-get-ex-pat)
|
|
|
|
|
(if (null ex-token)
|
|
|
|
|
(error "Missing regular expression for global command"))
|
|
|
|
|
(if (string= ex-token "")
|
|
|
|
|
(if (null vip-s-string) (error "No previous search string")
|
|
|
|
|
(setq ex-g-pat vip-s-string))
|
|
|
|
|
(setq ex-g-pat ex-token
|
|
|
|
|
vip-s-string ex-token))
|
|
|
|
|
(if (null ex-addresses)
|
|
|
|
|
(setq ex-addresses (list (point-max) (point-min))))
|
|
|
|
|
(let ((marks nil) (mark-count 0)
|
|
|
|
|
com-str (end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(if (> beg end) (error "First address exceeds second"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(let ((cont t) (limit (point-marker)))
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
;; skip the last line if empty
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if (and (eobp) (not (bobp))) (backward-char 1))
|
|
|
|
|
(while (and cont (not (bobp)) (>= (point) limit))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(let ((found (re-search-backward ex-g-pat (mark) t)))
|
|
|
|
|
(if (or (and ex-g-flag found)
|
|
|
|
|
(and ex-g-variant (not found)))
|
|
|
|
|
(progn
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(setq mark-count (1+ mark-count))
|
|
|
|
|
(setq marks (cons (point-marker) marks)))))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if (bobp) (setq cont nil)
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(end-of-line)))))
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
|
|
|
|
(setq com-str (buffer-substring (1+ (point)) (1- (point-max)))))
|
|
|
|
|
(while marks
|
|
|
|
|
(goto-char (car marks))
|
|
|
|
|
;; report progress of execution on a slow machine.
|
|
|
|
|
;;(message "Executing global command...")
|
|
|
|
|
;;(if (zerop (% mark-count 10))
|
|
|
|
|
;; (message "Executing global command...%d" mark-count))
|
|
|
|
|
(vip-ex com-str)
|
|
|
|
|
(setq mark-count (1- mark-count))
|
|
|
|
|
(setq marks (cdr marks)))))
|
|
|
|
|
;;(message "Executing global command...done")))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun ex-line (com)
|
|
|
|
|
"ex line commands. COM is join, shift-right or shift-left."
|
|
|
|
|
(vip-default-ex-addresses)
|
|
|
|
|
(vip-get-ex-count)
|
|
|
|
|
(let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))) point)
|
|
|
|
|
(if (> beg end) (error "First address exceeds second"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(if ex-count
|
|
|
|
|
(progn
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(forward-line ex-count)))
|
|
|
|
|
(if ex-flag
|
|
|
|
|
;; show text to be joined and ask for confirmation
|
|
|
|
|
(progn
|
|
|
|
|
(with-output-to-temp-buffer " *text*"
|
|
|
|
|
(princ (buffer-substring (point) (mark))))
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(progn
|
|
|
|
|
(vip-read-string "[Hit return to continue] ")
|
|
|
|
|
(ex-line-subr com (point) (mark)))
|
|
|
|
|
(quit
|
|
|
|
|
(ding)))
|
|
|
|
|
(save-excursion (kill-buffer " *text*")))
|
|
|
|
|
(ex-line-subr com (point) (mark)))
|
|
|
|
|
(setq point (point)))
|
|
|
|
|
(goto-char (1- point))
|
|
|
|
|
(beginning-of-line)))
|
|
|
|
|
|
|
|
|
|
(defun ex-line-subr (com beg end)
|
|
|
|
|
(cond ((string= com "join")
|
|
|
|
|
(goto-char (min beg end))
|
|
|
|
|
(while (and (not (eobp)) (< (point) (max beg end)))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (and (<= (point) (max beg end)) (not (eobp)))
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point) (1- (point)))
|
|
|
|
|
(if (not ex-variant) (fixup-whitespace))))))
|
|
|
|
|
((or (string= com "right") (string= com "left"))
|
|
|
|
|
(indent-rigidly
|
|
|
|
|
(min beg end) (max beg end)
|
|
|
|
|
(if (string= com "right") vip-shift-width (- vip-shift-width)))
|
|
|
|
|
(goto-char (max beg end))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(forward-char 1))))
|
|
|
|
|
|
|
|
|
|
(defun ex-mark ()
|
|
|
|
|
"ex mark"
|
|
|
|
|
(let (char)
|
|
|
|
|
(if (null ex-addresses)
|
|
|
|
|
(setq ex-addresses
|
|
|
|
|
(cons (point) nil)))
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "[a-z]")
|
|
|
|
|
(progn
|
|
|
|
|
(setq char (following-char))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (not (looking-at "[\n|]"))
|
|
|
|
|
(error "Extra characters at end of \"k\" command")))
|
|
|
|
|
(if (looking-at "[\n|]")
|
|
|
|
|
(error "\"k\" requires a following letter")
|
|
|
|
|
(error "Mark must specify a letter"))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (car ex-addresses))
|
1992-11-16 01:44:33 +00:00
|
|
|
|
(point-to-register (- char (- ?a ?\C-a)) nil))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun ex-map ()
|
|
|
|
|
"ex map"
|
|
|
|
|
(let (char string)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(setq char (char-to-string (following-char)))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "[\n|]") (error "Missing rhs"))
|
|
|
|
|
(set-mark (point))
|
2005-07-03 16:26:56 +00:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
(end-of-buffer))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq string (buffer-substring (mark) (point))))
|
|
|
|
|
(if (not (lookup-key ex-map char))
|
|
|
|
|
(define-key ex-map char
|
|
|
|
|
(or (lookup-key vip-mode-map char) 'vip-nil)))
|
|
|
|
|
(define-key vip-mode-map char
|
|
|
|
|
(eval
|
|
|
|
|
(list 'quote
|
|
|
|
|
(cons 'lambda
|
|
|
|
|
(list '(count)
|
|
|
|
|
'(interactive "p")
|
|
|
|
|
(list 'execute-kbd-macro string 'count))))))))
|
|
|
|
|
|
|
|
|
|
(defun ex-unmap ()
|
|
|
|
|
"ex unmap"
|
|
|
|
|
(let (char)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(setq char (char-to-string (following-char)))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (not (looking-at "[\n|]")) (error "Macro must be a character")))
|
|
|
|
|
(if (not (lookup-key ex-map char))
|
|
|
|
|
(error "That macro wasn't mapped"))
|
|
|
|
|
(define-key vip-mode-map char (lookup-key ex-map char))
|
|
|
|
|
(define-key ex-map char nil)))
|
|
|
|
|
|
|
|
|
|
(defun ex-put ()
|
|
|
|
|
"ex put"
|
|
|
|
|
(let ((point (if (null ex-addresses) (point) (car ex-addresses))))
|
|
|
|
|
(vip-get-ex-buffer)
|
|
|
|
|
(setq vip-use-register ex-buffer)
|
|
|
|
|
(goto-char point)
|
|
|
|
|
(if (= point 0) (vip-Put-back 1) (vip-put-back 1))))
|
|
|
|
|
|
|
|
|
|
(defun ex-quit ()
|
|
|
|
|
"ex quit"
|
|
|
|
|
(let (char)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(setq char (following-char)))
|
|
|
|
|
(if (= char ?!) (kill-emacs t) (save-buffers-kill-emacs))))
|
|
|
|
|
|
|
|
|
|
(defun ex-read ()
|
|
|
|
|
"ex read"
|
|
|
|
|
(let ((point (if (null ex-addresses) (point) (car ex-addresses)))
|
|
|
|
|
(variant nil) command file)
|
|
|
|
|
(goto-char point)
|
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
|
|
|
|
(if (not (= point 0)) (with-no-warnings (next-line 1)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(beginning-of-line)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at "!")
|
|
|
|
|
(progn
|
|
|
|
|
(setq variant t)
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(setq command (buffer-substring (mark) (point))))
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(re-search-forward "[ \t\n]")
|
|
|
|
|
(backward-char 1)
|
|
|
|
|
(setq file (buffer-substring (point) (mark)))))
|
|
|
|
|
(if variant
|
|
|
|
|
(shell-command command t)
|
2005-07-03 16:26:56 +00:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
(insert-file file)))))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
|
|
|
|
(defun ex-set ()
|
|
|
|
|
(eval (list 'setq
|
|
|
|
|
(read-variable "Variable: ")
|
|
|
|
|
(eval (read-minibuffer "Value: ")))))
|
|
|
|
|
|
|
|
|
|
(defun ex-shell ()
|
|
|
|
|
"ex shell"
|
|
|
|
|
(vip-change-mode-to-emacs)
|
|
|
|
|
(shell))
|
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
(defun ex-substitute (&optional repeat r-flag)
|
1992-11-10 20:01:10 +00:00
|
|
|
|
"ex substitute.
|
|
|
|
|
If REPEAT use previous reg-exp which is ex-reg-exp or
|
1988-02-11 06:40:33 +00:00
|
|
|
|
vip-s-string"
|
|
|
|
|
(let (pat repl (opt-g nil) (opt-c nil) (matched-pos nil))
|
|
|
|
|
(if repeat (setq ex-token nil) (vip-get-ex-pat))
|
|
|
|
|
(if (null ex-token)
|
|
|
|
|
(setq pat (if r-flag vip-s-string ex-reg-exp)
|
|
|
|
|
repl ex-repl)
|
|
|
|
|
(setq pat (if (string= ex-token "") vip-s-string ex-token))
|
|
|
|
|
(setq vip-s-string pat
|
|
|
|
|
ex-reg-exp pat)
|
|
|
|
|
(vip-get-ex-pat)
|
|
|
|
|
(if (null ex-token)
|
|
|
|
|
(setq ex-token ""
|
|
|
|
|
ex-repl "")
|
|
|
|
|
(setq repl ex-token
|
|
|
|
|
ex-repl ex-token)))
|
|
|
|
|
(while (vip-get-ex-opt-gc)
|
|
|
|
|
(if (string= ex-token "g") (setq opt-g t) (setq opt-c t)))
|
|
|
|
|
(vip-get-ex-count)
|
|
|
|
|
(if ex-count
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if ex-addresses (goto-char (car ex-addresses)))
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(forward-line (1- ex-count))
|
|
|
|
|
(setq ex-addresses (cons (point) (cons (mark) nil))))
|
|
|
|
|
(if (null ex-addresses)
|
|
|
|
|
(setq ex-addresses (cons (point) (cons (point) nil)))
|
|
|
|
|
(if (null (cdr ex-addresses))
|
|
|
|
|
(setq ex-addresses (cons (car ex-addresses) ex-addresses)))))
|
|
|
|
|
;(setq G opt-g)
|
|
|
|
|
(let ((beg (car ex-addresses)) (end (car (cdr ex-addresses)))
|
|
|
|
|
(cont t) eol-mark)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(let ((limit (save-excursion
|
|
|
|
|
(goto-char (max (point) (mark)))
|
|
|
|
|
(point-marker))))
|
|
|
|
|
(goto-char (min (point) (mark)))
|
|
|
|
|
(while (< (point) limit)
|
|
|
|
|
(end-of-line)
|
1992-07-14 19:42:01 +00:00
|
|
|
|
(setq eol-mark (point-marker))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if opt-g
|
|
|
|
|
(progn
|
|
|
|
|
(while (and (not (eolp))
|
|
|
|
|
(re-search-forward pat eol-mark t))
|
|
|
|
|
(if (or (not opt-c) (y-or-n-p "Replace? "))
|
|
|
|
|
(progn
|
|
|
|
|
(setq matched-pos (point))
|
|
|
|
|
(replace-match repl))))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(forward-char))
|
|
|
|
|
(if (and (re-search-forward pat eol-mark t)
|
|
|
|
|
(or (not opt-c) (y-or-n-p "Replace? ")))
|
|
|
|
|
(progn
|
|
|
|
|
(setq matched-pos (point))
|
|
|
|
|
(replace-match repl)))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(forward-char))))))
|
|
|
|
|
(if matched-pos (goto-char matched-pos))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if opt-c (message "done"))))
|
|
|
|
|
|
|
|
|
|
(defun ex-tag ()
|
|
|
|
|
"ex tag"
|
|
|
|
|
(let (tag)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(skip-chars-forward "^ |\t\n")
|
|
|
|
|
(setq tag (buffer-substring (mark) (point))))
|
|
|
|
|
(if (not (string= tag "")) (setq ex-tag tag))
|
|
|
|
|
(vip-change-mode-to-emacs)
|
|
|
|
|
(condition-case conditions
|
|
|
|
|
(progn
|
2019-06-15 15:13:38 +00:00
|
|
|
|
(with-suppressed-warnings ((obsolete find-tag find-tag-other-window))
|
|
|
|
|
(if (string= tag "")
|
|
|
|
|
(find-tag ex-tag t)
|
|
|
|
|
(find-tag-other-window ex-tag)))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(vip-change-mode-to-vi))
|
|
|
|
|
(error
|
|
|
|
|
(vip-change-mode-to-vi)
|
|
|
|
|
(vip-message-conditions conditions)))))
|
|
|
|
|
|
|
|
|
|
(defun ex-write (q-flag)
|
|
|
|
|
"ex write"
|
|
|
|
|
(vip-default-ex-addresses t)
|
|
|
|
|
(vip-get-ex-file)
|
|
|
|
|
(if (string= ex-file "")
|
|
|
|
|
(progn
|
|
|
|
|
(if (null buffer-file-name)
|
|
|
|
|
(error "No file associated with this buffer"))
|
|
|
|
|
(setq ex-file buffer-file-name))
|
|
|
|
|
(setq ex-file (expand-file-name ex-file)))
|
|
|
|
|
(if (and (not (string= ex-file (buffer-file-name)))
|
|
|
|
|
(file-exists-p ex-file)
|
|
|
|
|
(not ex-variant))
|
1996-01-29 23:19:04 +00:00
|
|
|
|
(error "\"%s\" File exists - use w! to override" ex-file))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(if (> beg end) (error "First address exceeds second"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(write-region (point) (mark) ex-file ex-append t)))
|
|
|
|
|
(if (null buffer-file-name) (setq buffer-file-name ex-file))
|
|
|
|
|
(if q-flag (save-buffers-kill-emacs)))
|
|
|
|
|
|
|
|
|
|
(defun ex-yank ()
|
|
|
|
|
"ex yank"
|
|
|
|
|
(vip-default-ex-addresses)
|
|
|
|
|
(vip-get-ex-buffer)
|
|
|
|
|
(let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(if (> beg end) (error "First address exceeds second"))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vip-enlarge-region beg end)
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
(if (or ex-g-flag ex-g-variant) (error "Can't yank within global"))
|
|
|
|
|
(if ex-count
|
|
|
|
|
(progn
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(forward-line (1- ex-count)))
|
|
|
|
|
(set-mark end))
|
|
|
|
|
(vip-enlarge-region (point) (mark))
|
1993-06-09 11:59:12 +00:00
|
|
|
|
(if ex-flag (error "Extra characters at end of command"))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(if ex-buffer
|
|
|
|
|
(copy-to-register ex-buffer (point) (mark) nil))
|
|
|
|
|
(copy-region-as-kill (point) (mark)))))
|
|
|
|
|
|
|
|
|
|
(defun ex-command ()
|
|
|
|
|
"execute shell command"
|
|
|
|
|
(let (command)
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
|
(with-current-buffer " *ex-working-space*"
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(set-mark (point))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(setq command (buffer-substring (mark) (point))))
|
|
|
|
|
(if (null ex-addresses)
|
|
|
|
|
(shell-command command)
|
|
|
|
|
(let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))))
|
|
|
|
|
(if (null beg) (setq beg end))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(set-mark end)
|
|
|
|
|
(vip-enlarge-region (point) (mark))
|
2013-06-18 20:24:44 +00:00
|
|
|
|
(shell-command-on-region (point) (mark) command t t))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
(goto-char beg)))))
|
|
|
|
|
|
|
|
|
|
(defun ex-line-no ()
|
|
|
|
|
"print line number"
|
|
|
|
|
(message "%d"
|
|
|
|
|
(1+ (count-lines
|
|
|
|
|
(point-min)
|
|
|
|
|
(if (null ex-addresses) (point-max) (car ex-addresses))))))
|
|
|
|
|
|
1996-01-01 23:40:10 +00:00
|
|
|
|
(if (file-exists-p vip-startup-file) (load vip-startup-file))
|
1988-02-11 06:40:33 +00:00
|
|
|
|
|
1997-06-22 18:57:55 +00:00
|
|
|
|
(provide 'vip)
|
|
|
|
|
|
1992-07-14 19:42:01 +00:00
|
|
|
|
;;; vip.el ends here
|