X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d5e52f9968174449212416ade62b2ce39c4f5713..35dc09a19c606f9e7a078df32d030451c7c90ba1:/lisp/emulation/viper-ex.el diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 4c64b7b3c7..acaedde300 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1,13 +1,16 @@ ;;; viper-ex.el --- functions implementing the Ex commands for Viper -;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1994-1998, 2000-2012 Free Software Foundation, Inc. + +;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,89 +18,250 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . + +;;; Commentary: -;; Code +;;; Code: (provide 'viper-ex) ;; Compiler pacifier (defvar read-file-name-map) -(defvar vip-use-register) -(defvar vip-s-string) -(defvar vip-shift-width) -(defvar vip-ex-history) -(defvar vip-related-files-and-buffers-ring) -(defvar vip-local-search-start-marker) -(defvar vip-expert-level) -(defvar vip-custom-file-name) -(defvar vip-case-fold-search) - -(eval-when-compile - (let ((load-path (cons (expand-file-name ".") load-path))) - (or (featurep 'viper-util) - (load "viper-util.el" nil nil 'nosuffix)) - (or (featurep 'viper-keym) - (load "viper-keym.el" nil nil 'nosuffix)) - (or (featurep 'viper-cmd) - (load "viper-cmd.el" nil nil 'nosuffix)) - )) +(defvar viper-use-register) +(defvar viper-s-string) +(defvar viper-shift-width) +(defvar viper-ex-history) +(defvar viper-related-files-and-buffers-ring) +(defvar viper-local-search-start-marker) +(defvar viper-expert-level) +(defvar viper-custom-file-name) +(defvar viper-case-fold-search) +(defvar explicit-shell-file-name) +(defvar compile-command) + +;; loading happens only in non-interactive compilation +;; in order to spare non-viperized emacs from being viperized +(if noninteractive + (eval-when-compile + (if (not (featurep 'viper-cmd)) + (require 'viper-cmd)) + )) ;; end pacifier (require 'viper-util) +(defgroup viper-ex nil + "Viper support for Ex commands." + :prefix "ex-" + :group 'viper) + + ;;; Variables -(defconst vip-ex-work-buf-name " *ex-working-space*") -(defconst vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) -(defconst vip-ex-tmp-buf-name " *ex-tmp*") - - -;;; Variable completion in :set command - -;; The list of Ex commands. Used for completing command names. -(defconst ex-token-alist - '(("!") ("=") (">") ("&") ("~") - ("yank") ("xit") ("WWrite") ("Write") ("write") ("wq") ("visual") - ("version") ("vglobal") ("unmap") ("undo") ("tag") ("transfer") ("suspend") - ("substitute") ("submitReport") ("stop") ("sr") ("source") ("shell") - ("set") ("rewind") ("recover") ("read") ("quit") ("pwd") - ("put") ("preserve") ("PreviousRelatedFile") ("RelatedFile") - ("next") ("Next") ("move") ("mark") ("map") ("kmark") ("join") - ("help") ("goto") ("global") ("file") ("edit") ("delete") ("copy") - ("chdir") ("cd") ("Buffer") ("buffer") ("args")) ) +(defconst viper-ex-work-buf-name " *ex-working-space*") +(defvar viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) +(defconst viper-ex-tmp-buf-name " *ex-tmp*") +(defconst viper-ex-print-buf-name " *ex-print*") +(defvar viper-ex-print-buf (get-buffer-create viper-ex-print-buf-name)) + + +;;; ex-commands... + +(defun ex-cmd-obsolete (name) + (error "`%s': Obsolete command, not supported by Viper" name)) + +(defun ex-cmd-not-yet (name) + (error "`%s': Command not implemented in Viper" name)) + +;; alist entries: name (in any order), command, cont(??) +;; If command is a string, then that is an alias to the real command +;; to execute (for instance, ":m" -> ":move"). +;; command attributes: +;; is-mashed: the command's args may be jammed right up against the command +;; one-letter: this is a one-letter token. Any text appearing after +;; the name gets appended as an argument for the command +;; i.e. ":kabc" gets turned into (ex-mark "abc") +(defconst ex-token-alist '( + ("!" (ex-command)) + ("&" (ex-substitute t)) + ("=" (ex-line-no)) + (">" (ex-line "right")) + ("<" (ex-line "left")) + ("Buffer" (if ex-cycle-other-window + (viper-switch-to-buffer) + (viper-switch-to-buffer-other-window))) + ("Next" (ex-next (not ex-cycle-other-window))) + ("PreviousRelatedFile" (ex-next-related-buffer -1)) + ("RelatedFile" (ex-next-related-buffer 1)) + ("W" "Write") + ("WWrite" (save-some-buffers t)) + ("Write" (save-some-buffers)) + ("a" "append") + ("args" (ex-args)) + ("buffer" (if ex-cycle-other-window + (viper-switch-to-buffer-other-window) + (viper-switch-to-buffer))) + ("c" "change") + ;; ch should be "change" but maintain old viper compatibility + ("ch" "chdir") + ("cd" (ex-cd)) + ("chdir" (ex-cd)) + ("copy" (ex-copy nil)) + ("customize" (customize-group "viper")) + ("delete" (ex-delete)) + ("edit" (ex-edit)) + ("file" (ex-set-visited-file-name)) + ("g" "global") + ("global" (ex-global nil) is-mashed) + ("goto" (ex-goto)) + ("help" (ex-help)) + ("join" (ex-line "join")) + ("k" (ex-mark) one-letter) + ("kmark" (ex-mark)) + ("m" "move") + ("make" (ex-compile)) + ; old viper doesn't specify a default for "ma" so leave it undefined + ("map" (ex-map)) + ("mark" (ex-mark)) + ("move" (ex-copy t)) + ("next" (ex-next ex-cycle-other-window)) + ("p" "print") + ("preserve" (ex-preserve)) + ("print" (ex-print)) + ("put" (ex-put)) + ("pwd" (ex-pwd)) + ("quit" (ex-quit)) + ("r" "read") + ("re" "read") + ("read" (ex-read)) + ("recover" (ex-recover)) + ("rewind" (ex-rewind)) + ("s" "substitute") + ("su" "substitute") + ("sub" "substitute") + ("set" (ex-set)) + ("shell" (ex-shell)) + ("source" (ex-source)) + ("stop" (suspend-emacs)) + ("sr" (ex-substitute t t)) + ("submitReport" (viper-submit-report)) + ("substitute" (ex-substitute) is-mashed) + ("suspend" (suspend-emacs)) + ("t" "transfer") + ("tag" (ex-tag)) + ("transfer" (ex-copy nil)) + ("u" "undo") + ("un" "undo") + ("undo" (viper-undo)) + ("unmap" (ex-unmap)) + ("v" "vglobal") + ("version" (viper-version)) + ("vglobal" (ex-global t) is-mashed) + ("visual" (ex-edit)) + ("w" "write") + ("wq" (ex-write t)) + ("write" (ex-write nil)) + ("xit" (ex-write t)) + ("yank" (ex-yank)) + ("~" (ex-substitute t t)) + + ("append" (ex-cmd-obsolete "append")) + ("change" (ex-cmd-obsolete "change")) + ("insert" (ex-cmd-obsolete "insert")) + ("open" (ex-cmd-obsolete "open")) + + ("list" (ex-cmd-not-yet "list")) + ("z" (ex-cmd-not-yet "z")) + ("#" (ex-cmd-not-yet "#")) + + ("abbreviate" (error "`%s': Vi abbreviations are obsolete. Use the more powerful Emacs abbrevs" ex-token)) + ("unabbreviate" (error "`%s': Vi abbreviations are obsolete. Use the more powerful Emacs abbrevs" ex-token)) + )) + +;; No code should touch anything in the alist entry! (other than the name, +;; "car entry", of course) This way, changing this data structure +;; requires changing only the following ex-cmd functions... + +;; Returns cmd if the command may be jammed right up against its +;; arguments, nil if there must be a space. +;; examples of mashable commands: g// g!// v// s// sno// sm// +(defun ex-cmd-is-mashed-with-args (cmd) + (if (eq 'is-mashed (car (nthcdr 2 cmd))) cmd)) + +;; Returns true if this is a one-letter command that may be followed +;; by anything, no whitespace needed. This is a special-case for ":k". +(defun ex-cmd-is-one-letter (cmd) + (if (eq 'one-letter (car (nthcdr 2 cmd))) cmd)) + +;; Executes the function associated with the command +(defun ex-cmd-execute (cmd) + (eval (cadr cmd))) + +;; If this is a one-letter magic command, splice in args. +(defun ex-splice-args-in-1-letr-cmd (key list) + (let ((oneletter (ex-cmd-is-one-letter (assoc (substring key 0 1) list)))) + (if oneletter + (list key + (append (cadr oneletter) + (if (< 1 (length key)) (list (substring key 1)))) + (car (cdr (cdr oneletter))) )) + )) + + +;; Returns the alist entry for the appropriate key. +;; Tries to complete the key before using it in the alist. +;; If there is no appropriate key (no match or duplicate matches) return nil +(defun ex-cmd-assoc (key list) + (let ((entry (try-completion key list)) + result) + (setq result (cond + ((eq entry t) (assoc key list)) + ((stringp entry) (or (ex-splice-args-in-1-letr-cmd key list) + (assoc entry list))) + ((eq entry nil) (ex-splice-args-in-1-letr-cmd key list)) + (t nil) + )) + ;; If we end up with an alias, look up the alias... + (if (stringp (cadr result)) + (setq result (ex-cmd-assoc (cadr result) list))) + ;; and return the corresponding alist entry + result + )) + ;; A-list of Ex variables that can be set using the :set command. -(defconst ex-variable-alist +(defconst ex-variable-alist '(("wrapscan") ("ws") ("wrapmargin") ("wm") - ("global-tabstop") ("gts") ("tabstop") ("ts") + ("tabstop-global") ("ts-g") ("tabstop") ("ts") ("showmatch") ("sm") ("shiftwidth") ("sw") ("shell") ("sh") - ("readonly") ("ro") + ("readonly") ("ro") ("nowrapscan") ("nows") ("noshowmatch") ("nosm") ("noreadonly") ("noro") ("nomagic") ("noma") ("noignorecase") ("noic") - ("global-noautoindent") ("gnoai") ("noautoindent") ("noai") + ("noautoindent-global") ("noai-g") ("noautoindent") ("noai") ("magic") ("ma") ("ignorecase") ("ic") - ("global-autoindent") ("gai") ("autoindent") ("ai") + ("autoindent-global") ("ai-g") ("autoindent") ("ai") + ("all") )) - + ;; Token recognized during parsing of Ex commands (e.g., "read", "comma") (defvar ex-token nil) -;; Type of token. +;; Type of token. ;; If non-nil, gives type of address; if nil, it is a command. (defvar ex-token-type nil) ;; List of addresses passed to Ex command (defvar ex-addresses nil) -;; It seems that this flag is used only for `#', `print', and `list', which -;; aren't implemented. Check later. +;; This flag is supposed to be set only by `#', `print', and `list', +;; none of which is implemented. So, it and the pieces of the code it +;; controls are dead weight. We keep it just in case this might be +;; needed in the future. (defvar ex-flag nil) ;; "buffer" where Ex commands keep deleted data. @@ -107,11 +271,12 @@ ;; Value of ex count. (defvar ex-count nil) -;; Flag for global command. +;; Flag indicating that :global Ex command is being executed. (defvar ex-g-flag nil) - -;; If t, global command is executed on lines not matching ex-g-pat. +;; Flag indicating that :vglobal Ex command is being executed. (defvar ex-g-variant nil) +;; Marks to operate on during a :global Ex command. +(defvar ex-g-marks nil) ;; Save reg-exp used in substitute. (defvar ex-reg-exp nil) @@ -123,8 +288,7 @@ ;; Pattern for global command. (defvar ex-g-pat nil) - -(defvar ex-unix-type-shell +(defcustom ex-unix-type-shell (let ((case-fold-search t)) (and (stringp shell-file-name) (string-match @@ -141,9 +305,11 @@ "bash$\\|bash.exe$" "\\)") shell-file-name))) - "Is the user using a unix-type shell?") + "Is the user using a unix-type shell under a non-OS?" + :type 'boolean + :group 'viper-ex) -(defvar ex-unix-type-shell-options +(defcustom ex-unix-type-shell-options (let ((case-fold-search t)) (if ex-unix-type-shell (cond ((string-match "\\(csh$\\|csh.exe$\\)" shell-file-name) @@ -151,16 +317,31 @@ ((string-match "\\(bash$\\|bash.exe$\\)" shell-file-name) "-noprofile") ; bash: ignore .profile ))) - "Options to pass to the Unix-style shell. -Don't put `-c' here, as it is added automatically.") - -(defvar ex-nontrivial-find-file-function - (cond (ex-unix-type-shell 'vip-ex-nontrivial-find-file-unix) - ((eq system-type 'emx) 'vip-ex-nontrivial-find-file-ms) ; OS/2 - (vip-ms-style-os-p 'vip-ex-nontrivial-find-file-ms) ; a Microsoft OS - (vip-vms-os-p 'vip-ex-nontrivial-find-file-unix) ; VMS - (t 'vip-ex-nontrivial-find-file-unix) ; presumably UNIX - )) + "Options to pass to the Unix-style shell. +Don't put `-c' here, as it is added automatically." + :type '(choice (const nil) string) + :group 'viper-ex) + +(defcustom ex-compile-command "make" + "The command to run when the user types :make." + :type 'string + :group 'viper-ex) + +(defcustom viper-glob-function + (cond (ex-unix-type-shell 'viper-glob-unix-files) + (viper-ms-style-os-p 'viper-glob-mswindows-files) ; Microsoft OS + (t 'viper-glob-unix-files) ; presumably UNIX + ) + "Expand the file spec containing wildcard symbols. +The default tries to set this variable to work with Unix, Windows, +and OS/2. + +However, if it doesn't work right for some types of Unix shells or some OS, +the user should supply the appropriate function and set this variable to the +corresponding function symbol." + :type 'symbol + :group 'viper-ex) + ;; Remembers the previous Ex tag. (defvar ex-tag nil) @@ -180,233 +361,154 @@ Don't put `-c' here, as it is added automatically.") ;; File containing the shell command to be executed at Ex prompt, ;; e.g., :r !date (defvar ex-cmdfile nil) - -;; flag used in vip-ex-read-file-name to indicate that we may be reading -;; multiple file names. Used for :edit and :next -(defvar vip-keep-reading-filename nil) +(defvar ex-cmdfile-args "") + +;; flag used in viper-ex-read-file-name to indicate that we may be reading +;; multiple file names. Used for :edit and :next +(defvar viper-keep-reading-filename nil) -(defconst ex-cycle-other-window t - "*If t, :n and :b cycles through files and buffers in other window. -Then :N and :B cycles in the current window. If nil, this behavior is -reversed.") +(defcustom ex-cycle-other-window t + "If t, :n and :b cycles through files and buffers in other window. +Then :N and :B cycles in the current window. If nil, this behavior is +reversed." + :type 'boolean + :group 'viper-ex) -(defconst ex-cycle-through-non-files nil - "*Cycle through *scratch* and other buffers that don't visit any file.") +(defcustom ex-cycle-through-non-files nil + "Cycle through *scratch* and other buffers that don't visit any file." + :type 'boolean + :group 'viper-ex) ;; Last shell command executed with :! command. -(defvar vip-ex-last-shell-com nil) - +(defvar viper-ex-last-shell-com nil) + ;; Indicates if Minibuffer was exited temporarily in Ex-command. -(defvar vip-incomplete-ex-cmd nil) - -;; Remembers the last ex-command prompt. -(defvar vip-last-ex-prompt "") +(defvar viper-incomplete-ex-cmd nil) +;; Remembers the last ex-command prompt. +(defvar viper-last-ex-prompt "") -;;; Code - -;; Check if ex-token is an initial segment of STR -(defun vip-check-sub (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)))) ;; Get a complete ex command -(defun vip-get-ex-com-subr () - (let (case-fold-search) +(defun viper-get-ex-com-subr () + (let (cmd case-fold-search) (set-mark (point)) (re-search-forward "[a-zA-Z][a-zA-Z]*") (setq ex-token-type 'command) (setq ex-token (buffer-substring (point) (mark t))) - (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 "h") (vip-check-sub "help")) - ((looking-at "c") - (cond ((looking-at "cd") (vip-check-sub "cd")) - ((looking-at "ch") (vip-check-sub "chdir")) - ((looking-at "co") (vip-check-sub "copy")) - (t (vip-check-sub "change")))) - ((looking-at "d") (vip-check-sub "delete")) - ((looking-at "b") (vip-check-sub "buffer")) - ((looking-at "B") (vip-check-sub "Buffer")) - ((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 "k[a-z][^a-z]") - (setq ex-token "kmark") - (forward-char 1) - (exchange-point-and-mark)) ; this is canceled out by another - ; exchange-point-and-mark at the end - ((looking-at "k") (vip-check-sub "kmark")) - ((looking-at "n") (if (looking-at "nu") - (vip-check-sub "number") - (vip-check-sub "next"))) - ((looking-at "N") (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")) - ((looking-at "pw") (vip-check-sub "pwd")) - (t (vip-check-sub "print")))) - ((looking-at "P") (vip-check-sub "PreviousRelatedFile")) - ((looking-at "R") (vip-check-sub "RelatedFile")) - ((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 "sr") (vip-check-sub "sr")) - ((looking-at "st") (vip-check-sub "stop")) - ((looking-at "sus") (vip-check-sub "suspend")) - ((looking-at "subm") (vip-check-sub "submitReport")) - (t (vip-check-sub "substitute")))) - ((looking-at "t") - (if (looking-at "ta") (vip-check-sub "tag") - (vip-check-sub "transfer"))) - ((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 "vglobal")))) - ((looking-at "w") - (if (looking-at "wq") (vip-check-sub "wq") - (vip-check-sub "write"))) - ((looking-at "W") - (if (looking-at "WW") - (vip-check-sub "WWrite") - (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) + (setq cmd (ex-cmd-assoc ex-token ex-token-alist)) + (if cmd + (setq ex-token (car cmd)) + (setq ex-token-type 'non-command)) )) ;; Get an ex-token which is either an address or a command. ;; A token has a type, \(command, address, end-mark\), and a value -(defun vip-get-ex-token () +(defun viper-get-ex-token () (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (skip-chars-forward " \t|") - (cond ((looking-at "#") - (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 ((eq ex-token-type 'plus) 'add-number) - ((eq ex-token-type 'minus) 'sub-number) - (t 'abs-number))) - (setq ex-token (string-to-int (buffer-substring (point) (mark t))))) - ((looking-at "\\$") - (forward-char 1) - (setq ex-token-type 'end)) - ((looking-at "%") - (forward-char 1) - (setq ex-token-type 'whole)) - ((looking-at "+") - (cond ((or (looking-at "+[-+]") (looking-at "+[\n|]")) - (forward-char 1) - (insert "1") - (backward-char 1) - (setq ex-token-type 'plus)) - ((looking-at "+[0-9]") - (forward-char 1) + (let ((case-fold-search t)) + (cond ((looking-at "#") + (setq ex-token-type 'command) + (setq ex-token (char-to-string (following-char))) + (forward-char 1)) + ((looking-at "[a-z]") (viper-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 ((eq ex-token-type 'plus) 'add-number) + ((eq ex-token-type 'minus) 'sub-number) + (t 'abs-number))) + (setq ex-token + (string-to-number (buffer-substring (point) (mark t))))) + ((looking-at "\\$") + (forward-char 1) + (setq ex-token-type 'end)) + ((looking-at "%") + (forward-char 1) + (setq ex-token-type 'whole)) + ((looking-at "+") + (cond ((or (looking-at "+[-+]") (looking-at "+[\n|]")) + (forward-char 1) + (insert "1") + (backward-char 1) (setq ex-token-type 'plus)) - (t - (error vip-BadAddress)))) - ((looking-at "-") - (cond ((or (looking-at "-[-+]") (looking-at "-[\n|]")) - (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 vip-BadAddress)))) - ((looking-at "/") - (forward-char 1) - (set-mark (point)) - (let ((cont t)) - (while (and (not (eolp)) cont) - ;;(re-search-forward "[^/]*/") - (re-search-forward "[^/]*\\(/\\|\n\\)") - (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) - (setq cont nil)))) - (backward-char 1) - (setq ex-token (buffer-substring (point) (mark t))) - (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\\)") - (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\\\?")) - (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 t)))) - ((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))) - (t (error "Marks are ' and a-z"))) - (forward-char 1)) - ((looking-at "\n") - (setq ex-token-type 'end-mark) - (setq ex-token "goto")) - (t - (error vip-BadExCommand))))) - -;; Reads Ex command. Tries to determine if it has to exit because command -;; is complete or invalid. If not, keeps reading command. + ((looking-at "+[0-9]") + (forward-char 1) + (setq ex-token-type 'plus)) + (t + (error viper-BadAddress)))) + ((looking-at "-") + (cond ((or (looking-at "-[-+]") (looking-at "-[\n|]")) + (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 viper-BadAddress)))) + ((looking-at "/") + (forward-char 1) + (set-mark (point)) + (let ((cont t)) + (while (and (not (eolp)) cont) + ;;(re-search-forward "[^/]*/") + (re-search-forward "[^/]*\\(/\\|\n\\)") + (if (not (viper-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) + (setq cont nil)))) + (backward-char 1) + (setq ex-token (buffer-substring (point) (mark t))) + (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\\)") + (if (not (viper-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\\\?")) + (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 t)))) + ((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))) + (t (error "Marks are ' and a-z"))) + (forward-char 1)) + ((looking-at "\n") + (setq ex-token-type 'end-mark) + (setq ex-token "goto")) + (t + (error viper-BadExCommand)))))) + +;; Reads Ex command. Tries to determine if it has to exit because command +;; is complete or invalid. If not, keeps reading command. (defun ex-cmd-read-exit () (interactive) - (setq vip-incomplete-ex-cmd t) + (setq viper-incomplete-ex-cmd t) (let ((quit-regex1 (concat "\\(" "set[ \t]*" "\\|" "edit[ \t]*" @@ -422,7 +524,7 @@ reversed.") "*[ \t]*$")) (stay-regex (concat "\\(" "^[ \t]*$" - "\\|" "[?/].*[?/].*" + "\\|" "[?/].*" "\\|" "[ktgjmsz][ \t]*$" "\\|" "^[ \t]*ab.*" "\\|" "tr[ansfer \t]*" @@ -435,72 +537,81 @@ reversed.") "\\|" "jo.*" "\\|" "^[ \t]*ta.*" "\\|" "^[ \t]*una.*" - "\\|" "^[ \t]*su.*" - "\\|['`][a-z][ \t]*" + ;; don't jump up in :s command + "\\|" "^[ \t]*\\([`'][a-z]\\|[.,%]\\)*[ \t]*su.*" + "\\|" "^[ \t]*\\([`'][a-z]\\|[.,%]\\)*[ \t]*s[^a-z].*" + "\\|" "['`][a-z][ \t]*" + ;; r! assumes that the next one is a shell command + "\\|" "\\(r\\|re\\|rea\\|read\\)[ \t]*!" + ;; w ! assumes that the next one is a shell command + "\\|" "\\(w\\|wr\\|wri\\|writ.?\\)[ \t]+!" "\\|" "![ \t]*[a-zA-Z].*" "\\)" "!*"))) - + (save-window-excursion ;; put cursor at the end of the Ex working buffer - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (goto-char (point-max))) - (cond ((vip-looking-back quit-regex1) (exit-minibuffer)) - ((vip-looking-back stay-regex) (insert " ")) - ((vip-looking-back quit-regex2) (exit-minibuffer)) + (cond ((viper-looking-back quit-regex1) (exit-minibuffer)) + ((viper-looking-back stay-regex) (insert " ")) + ((viper-looking-back quit-regex2) (exit-minibuffer)) (t (insert " "))))) - + ;; complete Ex command (defun ex-cmd-complete () (interactive) (let (save-pos dist compl-list string-to-complete completion-result) - + (save-excursion (setq dist (skip-chars-backward "[a-zA-Z!=>&~]") save-pos (point))) - + (if (or (= dist 0) - (vip-looking-back "\\([ \t]*['`][ \t]*[a-z]*\\)") - (vip-looking-back - "^[ \t]*[a-zA-Z!=>&~][ \t]*[/?]*+[ \t]+[a-zA-Z!=>&~]+")) + (viper-looking-back "\\([ \t]*['`][ \t]*[a-z]*\\)") + (viper-looking-back + "^[ \t]*[a-zA-Z!=>&~][ \t]*[/?]*[ \t]+[a-zA-Z!=>&~]+")) ;; Preceding characters are not the ones allowed in an Ex command ;; or we have typed past command name. - ;; Note: we didn't do parsing, so there may be surprises. - (if (or (vip-looking-back "[a-zA-Z!=>&~][ \t]*[/?]*[ \t]*") - (vip-looking-back "\\([ \t]*['`][ \t]*[a-z]*\\)") + ;; Note: we didn't do parsing, so there can be surprises. + (if (or (viper-looking-back "[a-zA-Z!=>&~][ \t]*[/?]*[ \t]*") + (viper-looking-back "\\([ \t]*['`][ \t]*[a-z]*\\)") (looking-at "[^ \t\n\C-m]")) nil - (with-output-to-temp-buffer "*Completions*" + (with-output-to-temp-buffer "*Completions*" (display-completion-list - (vip-alist-to-list ex-token-alist)))) + (viper-alist-to-list ex-token-alist)))) ;; Preceding chars may be part of a command name (setq string-to-complete (buffer-substring save-pos (point))) (setq completion-result (try-completion string-to-complete ex-token-alist)) - + (cond ((eq completion-result t) ; exact match--do nothing - (vip-tmp-insert-at-eob " (Sole completion)")) + (viper-tmp-insert-at-eob " (Sole completion)")) ((eq completion-result nil) - (vip-tmp-insert-at-eob " (No match)")) + (viper-tmp-insert-at-eob " (No match)")) (t ;; partial completion (goto-char save-pos) (delete-region (point) (point-max)) (insert completion-result) (let (case-fold-search) (setq compl-list - (vip-filter-alist (concat "^" completion-result) + (viper-filter-alist (concat "^" completion-result) ex-token-alist))) (if (> (length compl-list) 1) - (with-output-to-temp-buffer "*Completions*" + (with-output-to-temp-buffer "*Completions*" (display-completion-list - (vip-alist-to-list (reverse compl-list))))))) + (viper-alist-to-list (reverse compl-list))))))) ))) - -;; Read Ex commands -;; Ex commands themselves are implemented in viper-ex.el -(defun vip-ex (&optional string) - (interactive) + +;; Read Ex commands +;; ARG is a prefix argument. If given, the ex command runs on the region +;;(without the user having to specify the address :a,b +;; STRING is the command to execute. If nil, then Viper asks you to enter the +;; command. +(defun viper-ex (arg &optional string) + (interactive "P") (or string (setq ex-g-flag nil ex-g-variant nil)) @@ -508,51 +619,79 @@ reversed.") (address nil) (cont t) (dot (point)) + reg-beg-line reg-end-line + reg-beg reg-end + initial-str prev-token-type com-str) - - (vip-add-keymap vip-ex-cmd-map map) - - (setq com-str (or string (vip-read-string-with-history - ":" - nil - 'vip-ex-history - (car vip-ex-history) - map))) + (viper-add-keymap viper-ex-cmd-map map) + + (if arg + (progn + (viper-enlarge-region (mark t) (point)) + (if (> (point) (mark t)) + (setq reg-beg (mark t) + reg-end (point)) + (setq reg-end (mark t) + reg-beg (point))) + (save-excursion + (goto-char reg-beg) + (setq reg-beg-line (1+ (count-lines (point-min) (point))) + reg-end-line + (+ reg-beg-line (count-lines reg-beg reg-end) -1))))) + (if reg-beg-line + (setq initial-str (format "%d,%d" reg-beg-line reg-end-line))) + + (setq com-str + (if string + (concat initial-str string) + (viper-read-string-with-history + ":" + initial-str + 'viper-ex-history + ;; no default when working on region + (if initial-str + nil + (car viper-ex-history)) + map + (if initial-str + " [Type command to execute on current region]")))) (save-window-excursion ;; just a precaution - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (delete-region (point-min) (point-max)) (insert com-str "\n") (goto-char (point-min))) (setq ex-token-type nil ex-addresses nil) (while cont - (vip-get-ex-token) + (viper-get-ex-token) (cond ((memq ex-token-type '(command 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 "vglobal") - (ex-global t) - (setq cont nil)) - (t - (vip-execute-ex-command) - (save-window-excursion - (setq vip-ex-work-buf - (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) - (skip-chars-forward " \t") - (cond ((looking-at "|") - (forward-char 1)) - ((looking-at "\n") - (setq cont nil)) - (t (error "`%s': %s" ex-token vip-SpuriousText))) - )) - )) + (viper-deactivate-mark) + (let ((cmd (ex-cmd-assoc ex-token ex-token-alist))) + (if (null cmd) + (error "`%s': %s" ex-token viper-BadExCommand)) + (ex-cmd-execute cmd) + (if (or (ex-cmd-is-mashed-with-args cmd) + (ex-cmd-is-one-letter cmd)) + (setq cont nil) + (save-excursion + (save-window-excursion + (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) + (skip-chars-forward " \t") + (cond ((looking-at "|") + (forward-char 1)) + ((looking-at "\n") + (setq cont nil)) + (t (error + "`%s': %s" ex-token viper-SpuriousText))) + ))) + )) ((eq ex-token-type 'non-command) - (error "`%s': %s" ex-token vip-BadExCommand)) + (error "`%s': %s" ex-token viper-BadExCommand)) ((eq ex-token-type 'whole) (setq address nil) (setq ex-addresses @@ -570,69 +709,76 @@ reversed.") (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))) + (t (let ((ans (viper-get-ex-address-subr address dot))) (if ans (setq address ans))))) (setq prev-token-type ex-token-type)))) - + ;; Get a regular expression and set `ex-variant', if found -(defun vip-get-ex-pat () +;; Viper doesn't parse the substitution or search patterns. +;; In particular, it doesn't expand ~ into the last substitution. +(defun viper-get-ex-pat () (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (skip-chars-forward " \t") (if (looking-at "!") + ;; this is probably a variant command r! (progn (setq ex-g-variant (not ex-g-variant) ex-g-flag (not ex-g-flag)) (forward-char 1) (skip-chars-forward " \t"))) (let ((c (following-char))) - (if (string-match "[0-9A-Za-z]" (format "%c" c)) - (error - "Global regexp must be inside matching non-alphanumeric chars")) + (cond ((string-match "[0-9A-Za-z]" (format "%c" c)) + (error + "Global regexp must be inside matching non-alphanumeric chars")) + ((= c ??) (error "`?' is not an allowed pattern delimiter here"))) (if (looking-at "[^\\\\\n]") (progn (forward-char 1) (set-mark (point)) (let ((cont t)) - (while (and (not (eolp)) cont) + ;; the use of eobp instead of eolp permits the use of newlines in + ;; pat2 in s/pat1/pat2/ + (while (and (not (eobp)) cont) (if (not (re-search-forward (format "[^%c]*%c" c c) nil t)) (if (member ex-token '("global" "vglobal")) - (error - "Missing closing delimiter for global regexp") + (error "Missing closing delimiter for global regexp") (goto-char (point-max)))) - (if (not (vip-looking-back + (if (not (viper-looking-back (format "[^\\\\]\\(\\\\\\\\\\)*\\\\%c" c))) - (setq cont nil)))) + (setq cont nil) + ;; we are at an escaped delimiter: unescape it and continue + (delete-char -2) + (insert c) + (if (eolp) + ;; if at eol, exit loop and go to next line + ;; later, delim will be inserted at the end + (progn + (setq cont nil) + (forward-char)))) + )) (setq ex-token (if (= (mark t) (point)) "" (buffer-substring (1- (point)) (mark t)))) - (backward-char 1)) + (backward-char 1) + ;; if the user didn't insert the final pattern delimiter, we're + ;; at newline now. In this case, insert the initial delimiter + ;; specified in variable c + (if (eolp) + (progn + (insert c) + (backward-char 1))) + ) (setq ex-token nil)) c))) -;; get an ex command -(defun vip-get-ex-command () - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) - (if (looking-at "/") (forward-char 1)) - (skip-chars-forward " \t") - (cond ((looking-at "[a-z]") - (vip-get-ex-com-subr) - (if (eq ex-token-type 'non-command) - (error "`%s': %s" ex-token vip-BadExCommand))) - ((looking-at "[!=><&~]") - (setq ex-token (char-to-string (following-char))) - (forward-char 1)) - (t (error vip-BadExCommand))))) - ;; Get an Ex option g or c -(defun vip-get-ex-opt-gc (c) +(defun viper-get-ex-opt-gc (c) (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (if (looking-at (format "%c" c)) (forward-char 1)) (skip-chars-forward " \t") (cond ((looking-at "g") @@ -646,24 +792,24 @@ reversed.") (t nil)))) ;; Compute default addresses. WHOLE-FLAG means use the whole buffer -(defun vip-default-ex-addresses (&optional whole-flag) +(defun viper-default-ex-addresses (&optional whole-flag) (cond ((null ex-addresses) (setq ex-addresses (if whole-flag - (cons (point-max) (cons (point-min) nil)) - (cons (point) (cons (point) nil))))) + (list (point-max) (point-min)) + (list (point) (point))))) ((null (cdr ex-addresses)) (setq ex-addresses (cons (car ex-addresses) ex-addresses))))) ;; Get an ex-address as a marker and set ex-flag if a flag is found -(defun vip-get-ex-address () +(defun viper-get-ex-address () (let ((address (point-marker)) (cont t)) (setq ex-token "") (setq ex-flag nil) (while cont - (vip-get-ex-token) + (viper-get-ex-token) (cond ((eq ex-token-type 'command) (if (member ex-token '("print" "list" "#")) (progn @@ -675,13 +821,13 @@ reversed.") ((eq ex-token-type 'whole) (error "Trailing address expected")) ((eq ex-token-type 'comma) - (error "`%s': %s" ex-token vip-SpuriousText)) - (t (let ((ans (vip-get-ex-address-subr address (point-marker)))) + (error "`%s': %s" ex-token viper-SpuriousText)) + (t (let ((ans (viper-get-ex-address-subr address (point-marker)))) (if ans (setq address ans)))))) address)) ;; Returns an address as a point -(defun vip-get-ex-address-subr (old-address dot) +(defun viper-get-ex-address-subr (old-address dot) (let ((address nil)) (if (null old-address) (setq old-address dot)) (cond ((eq ex-token-type 'dot) @@ -703,7 +849,9 @@ reversed.") (forward-line (1- ex-token)) (setq address (point-marker))))) ((eq ex-token-type 'end) - (setq address (point-max-marker))) + (save-excursion + (goto-char (1- (point-max))) + (setq address (point-marker)))) ((eq ex-token-type 'plus) t) ; do nothing ((eq ex-token-type 'minus) t) ; do nothing ((eq ex-token-type 'search-forward) @@ -718,19 +866,21 @@ reversed.") (save-excursion (if (null ex-token) (exchange-point-and-mark) - (goto-char (vip-register-to-point - (1+ (- ex-token ?a)) 'enforce-buffer))) + (goto-char + (viper-register-to-point + (viper-int-to-char (1+ (- ex-token ?a))) 'enforce-buffer))) (setq address (point-marker))))) address)) ;; Search pattern and set address +;; Doesn't wrap around. Should it? (defun ex-search-address (forward) (if (string= ex-token "") - (if (null vip-s-string) - (error vip-NoPrevSearch) - (setq ex-token vip-s-string)) - (setq vip-s-string ex-token)) + (if (null viper-s-string) + (error viper-NoPrevSearch) + (setq ex-token viper-s-string)) + (setq viper-s-string ex-token)) (if forward (progn (forward-line 1) @@ -739,13 +889,13 @@ reversed.") (re-search-backward ex-token))) ;; Get a buffer name and set `ex-count' and `ex-flag' if found -(defun vip-get-ex-buffer () +(defun viper-get-ex-buffer () (setq ex-buffer nil) (setq ex-count nil) (setq ex-flag nil) (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (skip-chars-forward " \t") (if (looking-at "[a-zA-Z]") (progn @@ -756,22 +906,22 @@ reversed.") (progn (set-mark (point)) (re-search-forward "[0-9][0-9]*") - (setq ex-count (string-to-int (buffer-substring (point) (mark t)))) + (setq ex-count (string-to-number (buffer-substring (point) (mark t)))) (skip-chars-forward " \t"))) (if (looking-at "[pl#]") (progn (setq ex-flag t) (forward-char 1))) (if (not (looking-at "[\n|]")) - (error "`%s': %s" ex-token vip-SpuriousText)))) + (error "`%s': %s" ex-token viper-SpuriousText)))) -(defun vip-get-ex-count () +(defun viper-get-ex-count () (setq ex-variant nil ex-count nil ex-flag nil) (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) + (set-buffer viper-ex-work-buf) (skip-chars-forward " \t") (if (looking-at "!") (progn @@ -782,7 +932,7 @@ reversed.") (progn (set-mark (point)) (re-search-forward "[0-9][0-9]*") - (setq ex-count (string-to-int (buffer-substring (point) (mark t)))) + (setq ex-count (string-to-number (buffer-substring (point) (mark t)))) (skip-chars-forward " \t"))) (if (looking-at "[pl#]") (progn @@ -790,28 +940,27 @@ reversed.") (forward-char 1))) (if (not (looking-at "[\n|]")) (error "`%s': %s" - (buffer-substring (point-min) (1- (point-max))) vip-BadExCommand)))) + (buffer-substring + (point-min) (1- (point-max))) viper-BadExCommand)))) ;; Expand \% and \# in ex command (defun ex-expand-filsyms (cmd buf) (let (cf pf ret) - (save-excursion - (set-buffer buf) + (with-current-buffer buf (setq cf buffer-file-name) (setq pf (ex-next nil t))) ; this finds alternative file name (if (and (null cf) (string-match "[^\\]%\\|\\`%" cmd)) (error "No current file to substitute for `%%'")) (if (and (null pf) (string-match "[^\\]#\\|\\`#" cmd)) (error "No alternate file to substitute for `#'")) - (save-excursion - (set-buffer (get-buffer-create vip-ex-tmp-buf-name)) + (with-current-buffer (get-buffer-create viper-ex-tmp-buf-name) (erase-buffer) (insert cmd) (goto-char (point-min)) (while (re-search-forward "%\\|#" nil t) - (let ((data (match-data)) + (let ((data (match-data)) (char (buffer-substring (match-beginning 0) (match-end 0)))) - (if (vip-looking-back (concat "\\\\" char)) + (if (viper-looking-back (concat "\\\\" char)) (replace-match char) (store-match-data data) (if (string= char "%") @@ -822,21 +971,22 @@ reversed.") (message "%s" ret)) ret)) -;; Get a file name and set ex-variant, `ex-append' and `ex-offset' if found -(defun vip-get-ex-file () +;; Get a file name and set `ex-variant', `ex-append' and `ex-offset' if found +;; If it is r!, then get the command name and whatever args +(defun viper-get-ex-file () (let (prompt) (setq ex-file nil ex-variant nil ex-append nil ex-offset nil - ex-cmdfile nil) + ex-cmdfile nil + ex-cmdfile-args "") (save-excursion - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (skip-chars-forward " \t") (if (looking-at "!") - (if (and (not (vip-looking-back "[ \t]")) + (if (and (not (viper-looking-back "[ \t]")) ;; read doesn't have a corresponding :r! form, so ! is ;; immediately interpreted as a shell command. (not (string= ex-token "read"))) @@ -869,7 +1019,7 @@ reversed.") (setq ex-file (buffer-substring (point) (1- (point-max)))) (setq ex-file ;; For :e, match multiple non-white strings separated - ;; by white. For others, find the first non-white string + ;; by white. For others, find the first non-white string (if (string-match (if (string= ex-token "edit") "[^ \t\n]+\\([ \t]+[^ \t\n]+\\)*" @@ -878,7 +1028,9 @@ reversed.") (progn ;; if file name comes from history, don't leave ;; minibuffer when the user types space - (setq vip-incomplete-ex-cmd nil) + (setq viper-incomplete-ex-cmd nil) + (setq ex-cmdfile-args + (substring ex-file (match-end 0) nil)) ;; this must be the last clause in this progn (substring ex-file (match-beginning 0) (match-end 0)) ) @@ -891,37 +1043,37 @@ reversed.") (skip-chars-backward " \t\n") (setq prompt (buffer-substring (point-min) (point))) )) - - (setq vip-last-ex-prompt prompt) - + + (setq viper-last-ex-prompt prompt) + ;; If we just finished reading command, redisplay prompt - (if vip-incomplete-ex-cmd - (setq ex-file (vip-ex-read-file-name (format ":%s " prompt))) + (if viper-incomplete-ex-cmd + (setq ex-file (viper-ex-read-file-name (format ":%s " prompt))) ;; file was typed in-line (setq ex-file (or ex-file ""))) )) -;; Completes file name or exits minibuffer. If Ex command accepts multiple +;; Completes file name or exits minibuffer. If Ex command accepts multiple ;; file names, arranges to re-enter the minibuffer. -(defun vip-complete-filename-or-exit () +(defun viper-complete-filename-or-exit () (interactive) - (setq vip-keep-reading-filename t) - ;; don't exit if directory---ex-commands don't + (setq viper-keep-reading-filename t) + ;; don't exit if directory---ex-commands don't (cond ((ex-cmd-accepts-multiple-files-p ex-token) (exit-minibuffer)) ;; apparently the argument to an Ex command is ;; supposed to be a shell command - ((vip-looking-back "^[ \t]*!.*") + ((viper-looking-back "^[ \t]*!.*") (setq ex-cmdfile t) (insert " ")) (t (setq ex-cmdfile nil) (minibuffer-complete-word)))) -(defun vip-handle-! () +(defun viper-handle-! () (interactive) (if (and (string= - (buffer-string) (vip-abbreviate-file-name default-directory)) + (buffer-string) (viper-abbreviate-file-name default-directory)) (member ex-token '("read" "write"))) (erase-buffer)) (insert "!")) @@ -929,35 +1081,38 @@ reversed.") (defun ex-cmd-accepts-multiple-files-p (token) (member token '("edit" "next" "Next"))) +;; Read file name from the minibuffer in an ex command. ;; If user doesn't enter anything, then "" is returned, i.e., the ;; prompt-directory is not returned. -(defun vip-ex-read-file-name (prompt) +(defun viper-ex-read-file-name (prompt) (let* ((str "") (minibuffer-local-completion-map (copy-keymap minibuffer-local-completion-map)) beg end cont val) - - (vip-add-keymap ex-read-filename-map - (if vip-emacs-p + + (viper-add-keymap ex-read-filename-map + (if (featurep 'emacs) minibuffer-local-completion-map - read-file-name-map)) - - (setq cont (setq vip-keep-reading-filename t)) + read-file-name-map)) + + (setq cont (setq viper-keep-reading-filename t)) (while cont - (setq vip-keep-reading-filename nil + (setq viper-keep-reading-filename nil val (read-file-name (concat prompt str) nil default-directory)) - (if (string-match " " val) - (setq val (concat "\\\"" val "\\\""))) + (setq val (expand-file-name val)) + (if (and (string-match " " val) + (ex-cmd-accepts-multiple-files-p ex-token)) + (setq val (concat "\"" val "\""))) (setq str (concat str (if (equal val "") "" " ") val (if (equal val "") "" " "))) - + ;; Only edit, next, and Next commands accept multiple files. - ;; vip-keep-reading-filename is set in the anonymous function that is + ;; viper-keep-reading-filename is set in the anonymous function that is ;; bound to " " in ex-read-filename-map. - (setq cont (and vip-keep-reading-filename + (setq cont (and viper-keep-reading-filename (ex-cmd-accepts-multiple-files-p ex-token))) ) - + (setq beg (string-match "[^ \t]" str) ; delete leading blanks end (string-match "[ \t]*$" str)) ; delete trailing blanks (if (member ex-token '("read" "write")) @@ -966,109 +1121,33 @@ reversed.") (progn (setq ex-cmdfile t) (setq beg (1+ beg)) - (setq vip-last-ex-prompt (concat vip-last-ex-prompt " !"))))) + (setq viper-last-ex-prompt + (concat viper-last-ex-prompt " !"))))) (substring str (or beg 0) end))) -;; Execute ex command using the value of addresses -(defun vip-execute-ex-command () - (vip-deactivate-mark) - (cond ((string= ex-token "args") (ex-args)) - ((string= ex-token "copy") (ex-copy nil)) - ((string= ex-token "cd") (ex-cd)) - ((string= ex-token "chdir") (ex-cd)) - ((string= ex-token "delete") (ex-delete)) - ((string= ex-token "edit") (ex-edit)) - ((string= ex-token "file") (vip-info-on-file)) - ((string= ex-token "goto") (ex-goto)) - ((string= ex-token "help") (ex-help)) - ((string= ex-token "join") (ex-line "join")) - ((string= ex-token "kmark") (ex-mark)) - ((string= ex-token "mark") (ex-mark)) - ((string= ex-token "map") (ex-map)) - ((string= ex-token "move") (ex-copy t)) - ((string= ex-token "next") (ex-next ex-cycle-other-window)) - ((string= ex-token "Next") (ex-next (not ex-cycle-other-window))) - ((string= ex-token "RelatedFile") (ex-next-related-buffer 1)) - ((string= ex-token "put") (ex-put)) - ((string= ex-token "pwd") (ex-pwd)) - ((string= ex-token "preserve") (ex-preserve)) - ((string= ex-token "PreviousRelatedFile") (ex-next-related-buffer -1)) - ((string= ex-token "quit") (ex-quit)) - ((string= ex-token "read") (ex-read)) - ((string= ex-token "recover") (ex-recover)) - ((string= ex-token "rewind") (ex-rewind)) - ((string= ex-token "submitReport") (vip-submit-report)) - ((string= ex-token "set") (ex-set)) - ((string= ex-token "shell") (ex-shell)) - ((string= ex-token "source") (ex-source)) - ((string= ex-token "sr") (ex-substitute t t)) - ((string= ex-token "substitute") (ex-substitute)) - ((string= ex-token "suspend") (suspend-emacs)) - ((string= ex-token "stop") (suspend-emacs)) - ((string= ex-token "transfer") (ex-copy nil)) - ((string= ex-token "buffer") (if ex-cycle-other-window - (vip-switch-to-buffer-other-window) - (vip-switch-to-buffer))) - ((string= ex-token "Buffer") (if ex-cycle-other-window - (vip-switch-to-buffer) - (vip-switch-to-buffer-other-window))) - ((string= ex-token "tag") (ex-tag)) - ((string= ex-token "undo") (vip-undo)) - ((string= ex-token "unmap") (ex-unmap)) - ((string= ex-token "version") (vip-version)) - ((string= ex-token "visual") (ex-edit)) - ((string= ex-token "write") (ex-write nil)) - ((string= ex-token "Write") (save-some-buffers)) - ((string= ex-token "wq") (ex-write t)) - ((string= ex-token "WWrite") (save-some-buffers t)) ; don't ask - ((string= ex-token "xit") (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 "change") - (string= ex-token "insert") - (string= ex-token "open")) - (error "`%s': Obsolete command, not supported by Viper" ex-token)) - ((or (string= ex-token "abbreviate") - (string= ex-token "unabbreviate")) - (error - "`%s': Vi abbrevs are obsolete. Use the more powerful Emacs abbrevs" - ex-token)) - ((or (string= ex-token "list") - (string= ex-token "print") - (string= ex-token "z") - (string= ex-token "#")) - (error "`%s': Command not implemented in Viper" ex-token)) - (t (error "`%s': %s" ex-token vip-BadExCommand)))) - -(defun vip-undisplayed-files () + +(defun viper-undisplayed-files () (mapcar - (function - (lambda (b) - (if (null (get-buffer-window b)) - (let ((f (buffer-file-name b))) - (if f f - (if ex-cycle-through-non-files - (let ((s (buffer-name b))) - (if (string= " " (substring s 0 1)) - nil - s)) - nil))) - nil))) + (lambda (b) + (if (null (get-buffer-window b)) + (let ((f (buffer-file-name b))) + (if f f + (if ex-cycle-through-non-files + (let ((s (buffer-name b))) + (if (string= " " (substring s 0 1)) + nil + s)) + nil))) + nil)) (buffer-list))) (defun ex-args () - (let ((l (vip-undisplayed-files)) + (let ((l (viper-undisplayed-files)) (args "") (file-count 1)) (while (not (null l)) - (if (car l) + (if (car l) (setq args (format "%s %d) %s\n" args file-count (car l)) file-count (1+ file-count))) (setq l (cdr l))) @@ -1076,46 +1155,46 @@ reversed.") (message "All files are already displayed") (save-excursion (save-window-excursion - (with-output-to-temp-buffer " *vip-info*" + (with-output-to-temp-buffer " *viper-info*" (princ "\n\nThese files are not displayed in any window.\n") (princ "\n=============\n") (princ args) (princ "\n=============\n") (princ "\nThe numbers can be given as counts to :next. ") (princ "\n\nPress any key to continue...\n\n")) - (vip-read-event)))))) + (viper-read-event)))))) -;; Ex cd command. Default directory of this buffer changes +;; Ex cd command. Default directory of this buffer changes (defun ex-cd () - (vip-get-ex-file) + (viper-get-ex-file) (if (string= ex-file "") (setq ex-file "~")) (setq default-directory (file-name-as-directory (expand-file-name ex-file)))) ;; Ex copy and move command. DEL-FLAG means delete (defun ex-copy (del-flag) - (vip-default-ex-addresses) - (let ((address (vip-get-ex-address)) + (viper-default-ex-addresses) + (let ((address (viper-get-ex-address)) (end (car ex-addresses)) (beg (car (cdr ex-addresses)))) (goto-char end) (save-excursion (push-mark beg t) - (vip-enlarge-region (mark t) (point)) + (viper-enlarge-region (mark t) (point)) (if del-flag (kill-region (point) (mark t)) (copy-region-as-kill (point) (mark t))) (if ex-flag (progn - (with-output-to-temp-buffer "*copy text*" + (with-output-to-temp-buffer " *copy text*" (princ (if (or del-flag ex-g-flag ex-g-variant) (current-kill 0) (buffer-substring (point) (mark t))))) (condition-case nil (progn - (read-string "[Hit return to continue] ") - (save-excursion (kill-buffer "*copy text*"))) - (quit (save-excursion (kill-buffer "*copy text*")) + (read-string "[Hit return to confirm] ") + (save-excursion (kill-buffer " *copy text*"))) + (quit (save-excursion (kill-buffer " *copy text*")) (signal 'quit nil)))))) (if (= address 0) (goto-char (point-min)) @@ -1125,109 +1204,119 @@ reversed.") ;; Ex delete command (defun ex-delete () - (vip-default-ex-addresses) - (vip-get-ex-buffer) + (viper-default-ex-addresses) + (viper-get-ex-buffer) (let ((end (car ex-addresses)) (beg (car (cdr ex-addresses)))) - (if (> beg end) (error vip-FirstAddrExceedsSecond)) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) (save-excursion - (vip-enlarge-region beg end) + (viper-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 t)) + (viper-enlarge-region (point) (mark t)) (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 t)))) (condition-case nil - (read-string "[Hit return to continue] ") + (read-string "[Hit return to confirm] ") (quit (save-excursion (kill-buffer " *delete text*")) - (error ""))) + (error "Viper bell"))) (save-excursion (kill-buffer " *delete text*"))) (if ex-buffer - (cond ((vip-valid-register ex-buffer '(Letter)) - (vip-append-to-register + (cond ((viper-valid-register ex-buffer '(Letter)) + (viper-append-to-register (downcase ex-buffer) (point) (mark t))) - ((vip-valid-register ex-buffer) + ((viper-valid-register ex-buffer) (copy-to-register ex-buffer (point) (mark t) nil)) - (t (error vip-InvalidRegister ex-buffer)))) + (t (error viper-InvalidRegister ex-buffer)))) (kill-region (point) (mark t)))))) ;; Ex edit command -;; In Viper, `e' and `e!' behave identically. In both cases, the user is +;; In Viper, `e' and `e!' behave identically. In both cases, the user is ;; asked if current buffer should really be discarded. -;; This command can take multiple file names. It replaces the current buffer +;; This command can take multiple file names. It replaces the current buffer ;; with the first file in its argument list (defun ex-edit (&optional file) (if (not file) - (vip-get-ex-file)) + (viper-get-ex-file)) (cond ((and (string= ex-file "") buffer-file-name) - (setq ex-file (vip-abbreviate-file-name (buffer-file-name)))) + (setq ex-file (viper-abbreviate-file-name (buffer-file-name)))) ((string= ex-file "") - (error vip-NoFileSpecified))) - - (let (msg do-edit) - (if buffer-file-name - (cond ((buffer-modified-p) - (setq msg - (format "Buffer %s is modified. Discard changes? " - (buffer-name)) - do-edit t)) - ((not (verify-visited-file-modtime (current-buffer))) - (setq msg - (format "File %s changed on disk. Reread from disk? " - buffer-file-name) - do-edit t)) - (t (setq do-edit nil)))) - - (if do-edit - (if (yes-or-no-p msg) - (progn - (set-buffer-modified-p nil) - (kill-buffer (current-buffer))) - (message "Buffer %s was left intact" (buffer-name)))) - ) ; let - + (error viper-NoFileSpecified))) + + (let (msg do-edit) + (if buffer-file-name + (cond ((buffer-modified-p) + (setq msg + (format "Buffer %s is modified. Discard changes? " + (buffer-name)) + do-edit t)) + ((not (verify-visited-file-modtime (current-buffer))) + (setq msg + (format "File %s changed on disk. Reread from disk? " + buffer-file-name) + do-edit t)) + (t (setq do-edit nil)))) + + (if do-edit + (if (yes-or-no-p msg) + (progn + (set-buffer-modified-p nil) + (kill-buffer (current-buffer))) + (message "Buffer %s was left intact" (buffer-name)))) + ) ; let + (if (null (setq file (get-file-buffer ex-file))) - (progn - (ex-find-file ex-file) + (progn + ;; this also does shell-style globbing + (ex-find-file + ;; replace # and % with the previous/current file + (ex-expand-filsyms ex-file (current-buffer))) (or (eq major-mode 'dired-mode) - (vip-change-state-to-vi)) + (viper-change-state-to-vi)) (goto-char (point-min))) (switch-to-buffer file)) (if ex-offset (progn - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (delete-region (point-min) (point-max)) (insert ex-offset "\n") (goto-char (point-min))) - (goto-char (vip-get-ex-address)) + (goto-char (viper-get-ex-address)) (beginning-of-line))) - (ex-fixup-history vip-last-ex-prompt ex-file)) + (ex-fixup-history viper-last-ex-prompt ex-file)) ;; Find-file FILESPEC if it appears to specify a single file. -;; Otherwise, assume that FILES{EC is a wildcard. +;; Otherwise, assume that FILESPEC is a wildcard. ;; In this case, split it into substrings separated by newlines. -;; Each line is assumed to be a file name. find-file's each file thus obtained. +;; Each line is assumed to be a file name. (defun ex-find-file (filespec) (let ((nonstandard-filename-chars "[^-a-zA-Z0-9_./,~$\\]")) (cond ((file-exists-p filespec) (find-file filespec)) ((string-match nonstandard-filename-chars filespec) - (funcall ex-nontrivial-find-file-function filespec)) + (mapcar 'find-file (funcall viper-glob-function filespec))) (t (find-file filespec))) )) ;; Ex global command +;; This is executed in response to: +;; :global "pattern" ex-command +;; :vglobal "pattern" ex-command +;; :global executes ex-command on all lines matching +;; :vglobal executes ex-command on all lines that don't match +;; +;; With VARIANT nil, this functions executes :global +;; With VARIANT t, executes :vglobal (defun ex-global (variant) (let ((gcommand ex-token)) (if (or ex-g-flag ex-g-variant) @@ -1237,30 +1326,33 @@ reversed.") ex-g-variant t) (setq ex-g-flag t ex-g-variant nil))) - (vip-get-ex-pat) + (viper-get-ex-pat) (if (null ex-token) (error "`%s': Missing regular expression" gcommand))) - + (if (string= ex-token "") - (if (null vip-s-string) - (error vip-NoPrevSearch) - (setq ex-g-pat vip-s-string)) + (if (null viper-s-string) + (error viper-NoPrevSearch) + (setq ex-g-pat viper-s-string)) (setq ex-g-pat ex-token - vip-s-string ex-token)) + viper-s-string ex-token)) (if (null ex-addresses) (setq ex-addresses (list (point-max) (point-min))) - (vip-default-ex-addresses)) - (let ((marks nil) (mark-count 0) - com-str (end (car ex-addresses)) (beg (car (cdr ex-addresses)))) - (if (> beg end) (error vip-FirstAddrExceedsSecond)) + (viper-default-ex-addresses)) + (setq ex-g-marks nil) + (let ((mark-count 0) + (end (car ex-addresses)) + (beg (car (cdr ex-addresses))) + com-str) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) (save-excursion - (vip-enlarge-region beg end) + (viper-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 (eobp) (vip-backward-char-carefully)) + (if (eobp) (viper-backward-char-carefully)) (while (and cont (not (bobp)) (>= (point) limit)) (beginning-of-line) (set-mark (point)) @@ -1271,20 +1363,20 @@ reversed.") (progn (end-of-line) (setq mark-count (1+ mark-count)) - (setq marks (cons (point-marker) marks))))) + (setq ex-g-marks (cons (point-marker) ex-g-marks))))) (beginning-of-line) (if (bobp) (setq cont nil) (forward-line -1) (end-of-line))))) - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) + ;; com-str is the command string, i.e., g/pattern/ or v/pattern' (setq com-str (buffer-substring (1+ (point)) (1- (point-max))))) - (while marks - (goto-char (car marks)) - (vip-ex com-str) + (while ex-g-marks + (goto-char (car ex-g-marks)) + (viper-ex nil com-str) (setq mark-count (1- mark-count)) - (setq marks (cdr marks))))) + (setq ex-g-marks (cdr ex-g-marks))))) ;; Ex goto command (defun ex-goto () @@ -1292,16 +1384,17 @@ reversed.") (setq ex-addresses (cons (point) nil))) (push-mark (point) t) (goto-char (car ex-addresses)) - (beginning-of-line)) + (beginning-of-line) + ) ;; Ex line commands. COM is join, shift-right or shift-left (defun ex-line (com) - (vip-default-ex-addresses) - (vip-get-ex-count) + (viper-default-ex-addresses) + (viper-get-ex-count) (let ((end (car ex-addresses)) (beg (car (cdr ex-addresses))) point) - (if (> beg end) (error vip-FirstAddrExceedsSecond)) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) (save-excursion - (vip-enlarge-region beg end) + (viper-enlarge-region beg end) (exchange-point-and-mark) (if ex-count (progn @@ -1310,14 +1403,14 @@ reversed.") (if ex-flag ;; show text to be joined and ask for confirmation (progn - (with-output-to-temp-buffer " *text*" + (with-output-to-temp-buffer " *join text*" (princ (buffer-substring (point) (mark t)))) (condition-case nil (progn - (read-string "[Hit return to continue] ") + (read-string "[Hit return to confirm] ") (ex-line-subr com (point) (mark t))) (quit (ding))) - (save-excursion (kill-buffer " *text*"))) + (save-excursion (kill-buffer " *join text*"))) (ex-line-subr com (point) (mark t))) (setq point (point))) (goto-char (1- point)) @@ -1336,54 +1429,60 @@ reversed.") ((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))) + (if (string= com "right") viper-shift-width (- viper-shift-width))) (goto-char (max beg end)) (end-of-line) - (vip-forward-char-carefully)))) + (viper-forward-char-carefully)))) ;; Ex mark command -(defun ex-mark () +;; Sets the mark to the current point. +;; If name is omitted, get the name straight from the work buffer." +(defun ex-mark (&optional name) (let (char) (if (null ex-addresses) (setq ex-addresses (cons (point) nil))) - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) - (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 "`%s': %s" ex-token vip-SpuriousText))) - (error "`%s' requires a following letter" ex-token))) + (if name + (if (eq 1 (length name)) + (setq char (string-to-char name)) + (error "`%s': Spurious text \"%s\" after mark name" + name (substring name 1))) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) + (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 "`%s': %s" ex-token viper-SpuriousText))) + (error "`%s' requires a following letter" ex-token)))) (save-excursion (goto-char (car ex-addresses)) - (point-to-register (1+ (- char ?a)))))) + (point-to-register (viper-int-to-char (1+ (- char ?a))))))) + + - - ;; Alternate file is the file next to the first one in the buffer ring (defun ex-next (cycle-other-window &optional find-alt-file) (catch 'ex-edit (let (count l) - (if (not find-alt-file) + (if (not find-alt-file) (progn - (vip-get-ex-file) + (viper-get-ex-file) (if (or (char-or-string-p ex-offset) - (and (not (string= "" ex-file)) + (and (not (string= "" ex-file)) (not (string-match "^[0-9]+$" ex-file)))) (progn (ex-edit t) (throw 'ex-edit nil)) - (setq count (string-to-int ex-file)) + (setq count (string-to-number ex-file)) (if (= count 0) (setq count 1)) (if (< count 0) (error "Usage: `next ' (count >= 0)")))) (setq count 1)) - (setq l (vip-undisplayed-files)) + (setq l (viper-undisplayed-files)) (while (> count 0) (while (and (not (null l)) (null (car l))) (setq l (cdr l))) @@ -1399,70 +1498,69 @@ reversed.") (set-window-buffer w (get-file-buffer (car l))) (bury-buffer b) ;; this puts "next " in the ex-command history - (ex-fixup-history vip-last-ex-prompt ex-file)) + (ex-fixup-history viper-last-ex-prompt ex-file)) (error "Not that many undisplayed files"))))))) (defun ex-next-related-buffer (direction &optional no-recursion) - - (vip-ring-rotate1 vip-related-files-and-buffers-ring direction) - - (let ((file-or-buffer-name - (vip-current-ring-item vip-related-files-and-buffers-ring)) - (old-ring vip-related-files-and-buffers-ring) + + (viper-ring-rotate1 viper-related-files-and-buffers-ring direction) + + (let ((file-or-buffer-name + (viper-current-ring-item viper-related-files-and-buffers-ring)) + (old-ring viper-related-files-and-buffers-ring) (old-win (selected-window)) skip-rest buf wind) - - (or (and (ring-p vip-related-files-and-buffers-ring) - (> (ring-length vip-related-files-and-buffers-ring) 0)) + + (or (and (ring-p viper-related-files-and-buffers-ring) + (> (ring-length viper-related-files-and-buffers-ring) 0)) (error "This buffer has no related files or buffers")) - + (or (stringp file-or-buffer-name) (error "File and buffer names must be strings, %S" file-or-buffer-name)) - + (setq buf (cond ((get-buffer file-or-buffer-name)) ((file-exists-p file-or-buffer-name) (find-file-noselect file-or-buffer-name)) )) - - (if (not (vip-buffer-live-p buf)) + + (if (not (viper-buffer-live-p buf)) (error "Didn't find buffer %S or file %S" file-or-buffer-name - (vip-abbreviate-file-name + (viper-abbreviate-file-name (expand-file-name file-or-buffer-name)))) - + (if (equal buf (current-buffer)) (or no-recursion ;; try again (progn (setq skip-rest t) (ex-next-related-buffer direction 'norecursion)))) - + (if skip-rest () ;; setup buffer - (if (setq wind (vip-get-visible-buffer-window buf)) + (if (setq wind (viper-get-visible-buffer-window buf)) () - (setq wind (get-lru-window (if vip-xemacs-p nil 'visible))) + (setq wind (get-lru-window (if (featurep 'xemacs) nil 'visible))) (set-window-buffer wind buf)) - - (if (vip-window-display-p) + + (if (viper-window-display-p) (progn (raise-frame (window-frame wind)) (if (equal (window-frame wind) (window-frame old-win)) (save-window-excursion (select-window wind) (sit-for 1)) (select-window wind))) (save-window-excursion (select-window wind) (sit-for 1))) - - (save-excursion - (set-buffer buf) - (setq vip-related-files-and-buffers-ring old-ring)) - - (setq vip-local-search-start-marker (point-marker)) + + (with-current-buffer buf + (setq viper-related-files-and-buffers-ring old-ring)) + + (setq viper-local-search-start-marker (point-marker)) ))) - - + + ;; Force auto save (defun ex-preserve () (message "Autosaving all buffers that need to be saved...") @@ -1471,58 +1569,64 @@ reversed.") ;; Ex put (defun ex-put () (let ((point (if (null ex-addresses) (point) (car ex-addresses)))) - (vip-get-ex-buffer) - (setq vip-use-register ex-buffer) + (viper-get-ex-buffer) + (setq viper-use-register ex-buffer) (goto-char point) - (if (bobp) (vip-Put-back 1) (vip-put-back 1)))) + (if (bobp) (viper-Put-back 1) (viper-put-back 1)))) ;; Ex print working directory (defun ex-pwd () - (message default-directory)) + (message "%s" default-directory)) ;; Ex quit command (defun ex-quit () - ;; skip "!", if it is q!. In Viper q!, w!, etc., behave as q, w, etc. - (save-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + ;; skip "!", if it is q!. In Viper q!, w!, etc., behave as q, w, etc. + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (if (looking-at "!") (forward-char 1))) - (if (< vip-expert-level 3) + (if (< viper-expert-level 3) (save-buffers-kill-emacs) (kill-buffer (current-buffer)))) ;; Ex read command +;; ex-read doesn't support wildcards, because file completion is a better +;; mechanism. We also don't support # and % (except in :r +;; because file history is a better mechanism. (defun ex-read () - (vip-get-ex-file) + (viper-get-ex-file) (let ((point (if (null ex-addresses) (point) (car ex-addresses))) command) (goto-char point) - (vip-add-newline-at-eob-if-necessary) + (viper-add-newline-at-eob-if-necessary) (if (not (or (bobp) (eobp))) (forward-line 1)) (if (and (not ex-variant) (string= ex-file "")) (progn (if (null buffer-file-name) - (error vip-NoFileSpecified)) + (error viper-NoFileSpecified)) (setq ex-file buffer-file-name))) (if ex-cmdfile (progn - (setq command (ex-expand-filsyms ex-file (current-buffer))) + (setq command + ;; replace # and % with the previous/current file + (ex-expand-filsyms + (concat (shell-quote-argument ex-file) ex-cmdfile-args) + (current-buffer))) (shell-command command t)) (insert-file-contents ex-file))) - (ex-fixup-history vip-last-ex-prompt ex-file)) - + (ex-fixup-history viper-last-ex-prompt ex-file ex-cmdfile-args)) + ;; this function fixes ex-history for some commands like ex-read, ex-edit -(defun ex-fixup-history (&rest args) - (setq vip-ex-history - (cons (mapconcat 'identity args " ") (cdr vip-ex-history)))) - +(defun ex-fixup-history (&rest args) + (setq viper-ex-history + (cons (mapconcat 'identity args " ") (cdr viper-ex-history)))) + ;; Ex recover from emacs \#file\# (defun ex-recover () - (vip-get-ex-file) + (viper-get-ex-file) (if (or ex-append ex-offset) - (error "`recover': %s" vip-SpuriousText)) + (error "`recover': %s" viper-SpuriousText)) (if (string= ex-file "") (progn (if (null buffer-file-name) @@ -1538,7 +1642,7 @@ reversed.") ;; Tell that `rewind' is obsolete and to use `:next count' instead (defun ex-rewind () (message - "Use `:n ' instead. Counts are obtained from the `:args' command")) + "Use `:n ' instead. Counts are obtained from the `:args' command")) ;; read variable name for ex-set @@ -1550,20 +1654,20 @@ reversed.") (define-key minibuffer-local-completion-map " " 'minibuffer-complete-and-exit) (define-key minibuffer-local-completion-map "=" 'exit-minibuffer) - (if (vip-set-unread-command-events + (if (viper-set-unread-command-events (ex-get-inline-cmd-args "[ \t]*[a-zA-Z]*[ \t]*" nil "\C-m")) (progn (setq batch t) - (vip-set-unread-command-events ?\C-m))) + (viper-set-unread-command-events ?\C-m))) (message ":set [= ]") (or batch (sit-for 2)) - + (while (string-match "^[ \\t\\n]*$" (setq str (completing-read ":set " ex-variable-alist))) - (message ":set ") + (message ":set [= ]") ;; if there are unread events, don't wait - (or (vip-set-unread-command-events "") (sit-for 2)) + (or (viper-set-unread-command-events "") (sit-for 2)) ) ; while str)) @@ -1575,40 +1679,43 @@ reversed.") (ask-if-save t) (auto-cmd-label "; don't touch or else...") (delete-turn-on-auto-fill-pattern - "([ \t]*add-hook[ \t]+'vip-insert-state-hooks[ \t]+'turn-on-auto-fill.*)") + "([ \t]*add-hook[ \t]+'viper-insert-state-hook[ \t]+'turn-on-auto-fill.*)") actual-lisp-cmd lisp-cmd-del-pattern val2 orig-var) (setq orig-var var) - (cond ((member var '("ai" "autoindent")) - (setq var "vip-auto-indent" + (cond ((string= var "all") + (setq ask-if-save nil + set-cmd nil)) + ((member var '("ai" "autoindent")) + (setq var "viper-auto-indent" set-cmd "setq" ask-if-save nil val "t")) - ((member var '("gai" "global-autoindent")) - (kill-local-variable 'vip-auto-indent) - (setq var "vip-auto-indent" + ((member var '("ai-g" "autoindent-global")) + (kill-local-variable 'viper-auto-indent) + (setq var "viper-auto-indent" set-cmd "setq-default" val "t")) ((member var '("noai" "noautoindent")) - (setq var "vip-auto-indent" + (setq var "viper-auto-indent" ask-if-save nil val "nil")) - ((member var '("gnoai" "global-noautoindent")) - (kill-local-variable 'vip-auto-indent) - (setq var "vip-auto-indent" + ((member var '("noai-g" "noautoindent-global")) + (kill-local-variable 'viper-auto-indent) + (setq var "viper-auto-indent" set-cmd "setq-default" val "nil")) ((member var '("ic" "ignorecase")) - (setq var "vip-case-fold-search" + (setq var "viper-case-fold-search" val "t")) ((member var '("noic" "noignorecase")) - (setq var "vip-case-fold-search" + (setq var "viper-case-fold-search" val "nil")) ((member var '("ma" "magic")) - (setq var "vip-re-search" + (setq var "viper-re-search" val "t")) - ((member var '("noma" "nomagic")) - (setq var "vip-re-search" + ((member var '("noma" "nomagic")) + (setq var "viper-re-search" val "nil")) ((member var '("ro" "readonly")) (setq var "buffer-read-only" @@ -1623,103 +1730,107 @@ reversed.") (setq var "blink-matching-paren" val "nil")) ((member var '("ws" "wrapscan")) - (setq var "vip-search-wrap-around-t" + (setq var "viper-search-wrap-around" val "t")) ((member var '("nows" "nowrapscan")) - (setq var "vip-search-wrap-around-t" + (setq var "viper-search-wrap-around" val "nil"))) - (if (eq val 0) ; value must be set by the user + (if (and set-cmd (eq val 0)) ; value must be set by the user (let ((cursor-in-echo-area t)) (message ":set %s = " var) ;; if there are unread events, don't wait - (or (vip-set-unread-command-events "") (sit-for 2)) + (or (viper-set-unread-command-events "") (sit-for 2)) (setq val (read-string (format ":set %s = " var))) (ex-fixup-history "set" orig-var val) - + ;; check numerical values (if (member var '("sw" "shiftwidth" "ts" "tabstop" - "gts" "global-tabstop" - "wm" "wrapmargin")) + "ts-g" "tabstop-global" + "wm" "wrapmargin")) (condition-case nil (or (numberp (setq val2 (car (read-from-string val)))) (error "%s: Invalid value, numberp, %S" var val)) (error (error "%s: Invalid value, numberp, %S" var val)))) - + (cond ((member var '("sw" "shiftwidth")) - (setq var "vip-shift-width")) + (setq var "viper-shift-width")) ((member var '("ts" "tabstop")) ;; make it take effect in curr buff and new bufs (setq var "tab-width" set-cmd "setq" ask-if-save nil)) - ((member var '("gts" "global-tabstop")) + ((member var '("ts-g" "tabstop-global")) (kill-local-variable 'tab-width) (setq var "tab-width" set-cmd "setq-default")) ((member var '("wm" "wrapmargin")) ;; make it take effect in curr buff and new bufs - (kill-local-variable 'fill-column) - (setq var "fill-column" + (kill-local-variable 'fill-column) + (setq var "fill-column" val (format "(- (window-width) %s)" val) set-cmd "setq-default")) ((member var '("sh" "shell")) (setq var "explicit-shell-file-name" val (format "\"%s\"" val))))) (ex-fixup-history "set" orig-var)) - - (setq actual-lisp-cmd (format "\n(%s %s %s) %s" - set-cmd var val auto-cmd-label)) - (setq lisp-cmd-del-pattern - (format "^\n?[ \t]*([ \t]*%s[ \t]+%s[ \t].*)[ \t]*%s" - set-cmd var auto-cmd-label)) - + + (if set-cmd + (setq actual-lisp-cmd + (format "\n(%s %s %s) %s" set-cmd var val auto-cmd-label) + lisp-cmd-del-pattern + (format "^\n?[ \t]*([ \t]*%s[ \t]+%s[ \t].*)[ \t]*%s" + set-cmd var auto-cmd-label))) + (if (and ask-if-save (y-or-n-p (format "Do you want to save this setting in %s " - vip-custom-file-name))) + viper-custom-file-name))) (progn - (vip-save-string-in-file - actual-lisp-cmd vip-custom-file-name + (viper-save-string-in-file + actual-lisp-cmd viper-custom-file-name ;; del pattern lisp-cmd-del-pattern) (if (string= var "fill-column") (if (> val2 0) - (vip-save-string-in-file + (viper-save-string-in-file (concat - "(add-hook 'vip-insert-state-hooks 'turn-on-auto-fill) " + "(add-hook 'viper-insert-state-hook 'turn-on-auto-fill) " auto-cmd-label) - vip-custom-file-name + viper-custom-file-name delete-turn-on-auto-fill-pattern) - (vip-save-string-in-file - nil vip-custom-file-name delete-turn-on-auto-fill-pattern) - (vip-save-string-in-file - nil vip-custom-file-name + (viper-save-string-in-file + nil viper-custom-file-name delete-turn-on-auto-fill-pattern) + (viper-save-string-in-file + nil viper-custom-file-name ;; del pattern lisp-cmd-del-pattern) )) )) - - (message "%s %s %s" set-cmd var (if (string-match "^[ \t]*$" val) - (format "%S" val) - val)) - (eval (car (read-from-string actual-lisp-cmd))) - (if (string= var "fill-column") - (if (> val2 0) - (auto-fill-mode 1) - (auto-fill-mode -1))) - + + (if set-cmd + (message "%s %s %s" + set-cmd var + (if (string-match "^[ \t]*$" val) + (format "%S" val) + val))) + (if actual-lisp-cmd + (eval (car (read-from-string actual-lisp-cmd)))) + (if (string= var "fill-column") + (if (> val2 0) + (auto-fill-mode 1) + (auto-fill-mode -1))) + (if (string= var "all") (ex-show-vars)) )) ;; In inline args, skip regex-forw and (optionally) chars-back. ;; Optional 3d arg is a string that should replace ' ' to prevent its ;; special meaning (defun ex-get-inline-cmd-args (regex-forw &optional chars-back replace-str) - (save-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (goto-char (point-min)) (re-search-forward regex-forw nil t) (let ((beg (point)) @@ -1735,7 +1846,7 @@ reversed.") (if replace-str (while (re-search-forward " +" nil t) (replace-match replace-str nil t) - (vip-forward-char-carefully))) + (viper-forward-char-carefully))) (goto-char end) (buffer-substring beg end)))) @@ -1743,59 +1854,59 @@ reversed.") ;; Ex shell command (defun ex-shell () (shell)) - -;; Viper help. Invokes Info + +;; Viper help. Invokes Info (defun ex-help () (condition-case nil (progn (pop-to-buffer (get-buffer-create "*info*")) - (info (if vip-xemacs-p "viper.info" "viper")) + (info (if (featurep 'xemacs) "viper.info" "viper")) (message "Type `i' to search for a specific topic")) (error (beep 1) - (with-output-to-temp-buffer " *vip-info*" + (with-output-to-temp-buffer " *viper-info*" (princ (format " The Info file for Viper does not seem to be installed. This file is part of the standard distribution of %sEmacs. Please contact your system administrator. " - (if vip-xemacs-p "X" "") + (if (featurep 'xemacs) "X" "") )))))) -;; Ex source command. Loads the file specified as argument or `~/.vip' +;; Ex source command. Loads the file specified as argument or `~/.viper' (defun ex-source () - (vip-get-ex-file) + (viper-get-ex-file) (if (string= ex-file "") - (load vip-custom-file-name) + (load viper-custom-file-name) (load ex-file))) ;; Ex substitute command -;; If REPEAT use previous regexp which is ex-reg-exp or vip-s-string -(defun ex-substitute (&optional repeat r-flag) +;; If REPEAT use previous regexp which is ex-reg-exp or viper-s-string +(defun ex-substitute (&optional repeat r-flag) (let ((opt-g nil) (opt-c nil) (matched-pos nil) - (case-fold-search vip-case-fold-search) + (case-fold-search viper-case-fold-search) delim pat repl) - (if repeat (setq ex-token nil) (setq delim (vip-get-ex-pat))) + (if repeat (setq ex-token nil) (setq delim (viper-get-ex-pat))) (if (null ex-token) (progn - (setq pat (if r-flag vip-s-string ex-reg-exp)) + (setq pat (if r-flag viper-s-string ex-reg-exp)) (or (stringp pat) (error "No previous pattern to use in substitution")) (setq repl ex-repl delim (string-to-char pat))) - (setq pat (if (string= ex-token "") vip-s-string ex-token)) - (setq vip-s-string pat + (setq pat (if (string= ex-token "") viper-s-string ex-token)) + (setq viper-s-string pat ex-reg-exp pat) - (setq delim (vip-get-ex-pat)) + (setq delim (viper-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 delim) + (while (viper-get-ex-opt-gc delim) (if (string= ex-token "g") (setq opt-g t) (setq opt-c t))) - (vip-get-ex-count) + (viper-get-ex-count) (if ex-count (save-excursion (if ex-addresses (goto-char (car ex-addresses))) @@ -1811,39 +1922,55 @@ Please contact your system administrator. " (end (car (cdr ex-addresses))) eol-mark) (save-excursion - (vip-enlarge-region beg end) + (viper-enlarge-region beg end) (let ((limit (save-excursion (goto-char (max (point) (mark t))) (point-marker)))) (goto-char (min (point) (mark t))) (while (< (point) limit) - (end-of-line) - (setq eol-mark (point-marker)) + (save-excursion + (end-of-line) + ;; This move allows the use of newline as the last character in + ;; the substitution pattern + (viper-forward-char-carefully) + (setq eol-mark (point-marker))) (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? ")) + (if (or (not opt-c) + (progn + (viper-put-on-search-overlay (match-beginning 0) + (match-end 0)) + (y-or-n-p "Replace? "))) (progn + (viper-hide-search-overlay) (setq matched-pos (point)) (if (not (stringp repl)) (error "Can't perform Ex substitution: No previous replacement pattern")) (replace-match repl t)))) (end-of-line) - (vip-forward-char-carefully)) + (viper-forward-char-carefully)) (if (null pat) (error "Can't repeat Ex substitution: No previous regular expression")) (if (and (re-search-forward pat eol-mark t) - (or (not opt-c) (y-or-n-p "Replace? "))) + (or (not opt-c) + (progn + (viper-put-on-search-overlay (match-beginning 0) + (match-end 0)) + (y-or-n-p "Replace? ")))) (progn + (viper-hide-search-overlay) (setq matched-pos (point)) (if (not (stringp repl)) (error "Can't perform Ex substitution: No previous replacement pattern")) (replace-match repl t))) - (end-of-line) - (vip-forward-char-carefully)))))) + ;;(end-of-line) + ;;(viper-forward-char-carefully) + (goto-char eol-mark) + ))))) (if matched-pos (goto-char matched-pos)) (beginning-of-line) (if opt-c (message "done")))) @@ -1851,48 +1978,51 @@ Please contact your system administrator. " ;; Ex tag command (defun ex-tag () (let (tag) - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (skip-chars-forward " \t") (set-mark (point)) (skip-chars-forward "^ |\t\n") (setq tag (buffer-substring (mark t) (point)))) (if (not (string= tag "")) (setq ex-tag tag)) - (vip-change-state-to-emacs) + (viper-change-state-to-emacs) (condition-case conds (progn (if (string= tag "") (find-tag ex-tag t) (find-tag-other-window ex-tag)) - (vip-change-state-to-vi)) + (viper-change-state-to-vi)) (error - (vip-change-state-to-vi) - (vip-message-conditions conds))))) + (viper-change-state-to-vi) + (viper-message-conditions conds))))) ;; Ex write command +;; ex-write doesn't support wildcards, because file completion is a better +;; mechanism. We also don't support # and % +;; because file history is a better mechanism. (defun ex-write (q-flag) - (vip-default-ex-addresses t) - (vip-get-ex-file) + (viper-default-ex-addresses t) + (viper-get-ex-file) (let ((end (car ex-addresses)) - (beg (car (cdr ex-addresses))) + (beg (car (cdr ex-addresses))) (orig-buf (current-buffer)) - (orig-buf-file-name (buffer-file-name)) - (orig-buf-name (buffer-name)) - (buff-changed-p (buffer-modified-p)) + ;;(orig-buf-file-name (buffer-file-name)) + ;;(orig-buf-name (buffer-name)) + ;;(buff-changed-p (buffer-modified-p)) temp-buf writing-same-file region file-exists writing-whole-file) - (if (> beg end) (error vip-FirstAddrExceedsSecond)) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) (if ex-cmdfile (progn - (vip-enlarge-region beg end) - (shell-command-on-region (point) (mark t) ex-file)) + (viper-enlarge-region beg end) + (shell-command-on-region (point) (mark t) + (concat ex-file ex-cmdfile-args))) (if (and (string= ex-file "") (not (buffer-file-name))) (setq ex-file (read-file-name - (format "Buffer %s isn't visiting any file. File to save in: " + (format "Buffer %s isn't visiting any file. File to save in: " (buffer-name))))) - + (setq writing-whole-file (and (= (point-min) beg) (= (point-max) end)) ex-file (if (string= ex-file "") (buffer-file-name) @@ -1904,94 +2034,88 @@ Please contact your system administrator. " (setq ex-file (concat (file-name-as-directory ex-file) (file-name-nondirectory buffer-file-name)))) - + (setq file-exists (file-exists-p ex-file) writing-same-file (string= ex-file (buffer-file-name))) + ;; do actual writing (if (and writing-whole-file writing-same-file) + ;; saving whole buffer in visited file (if (not (buffer-modified-p)) (message "(No changes need to be saved)") + (viper-maybe-checkout (current-buffer)) (save-buffer) (save-restriction (widen) (ex-write-info file-exists ex-file (point-min) (point-max)) )) - ;; writing some other file or portion of the current file - (cond ((and file-exists - (not writing-same-file) - (not (yes-or-no-p - (format "File %s exists. Overwrite? " ex-file)))) - (error "Quit")) - ((and writing-whole-file (not ex-append)) - (unwind-protect - (progn - (set-visited-file-name ex-file) - (set-buffer-modified-p t) - (save-buffer)) - ;; restore the buffer file name - (set-visited-file-name orig-buf-file-name) - (set-buffer-modified-p buff-changed-p) - ;; If the buffer wasn't visiting a file, restore buffer name. - ;; Name could've been changed by packages such as uniquify. - (or orig-buf-file-name - (progn - (unlock-buffer) - (rename-buffer orig-buf-name)))) - (save-restriction - (widen) - (ex-write-info - file-exists ex-file (point-min) (point-max)))) - (t ; writing a region - (unwind-protect - (save-excursion - (vip-enlarge-region beg end) - (setq region (buffer-substring (point) (mark t))) - ;; create temp buffer for the region - (setq temp-buf (get-buffer-create " *ex-write*")) - (set-buffer temp-buf) - (set-visited-file-name ex-file 'noquerry) - (erase-buffer) - (if (and file-exists ex-append) - (insert-file-contents ex-file)) - (goto-char (point-max)) - (insert region) - (save-buffer) - (ex-write-info - file-exists ex-file (point-min) (point-max)) - )) - (set-buffer temp-buf) - (set-buffer-modified-p nil) - (kill-buffer temp-buf)) - )) - (set-buffer orig-buf) - ;; this prevents the loss of data if writing part of the buffer + ;; writing to non-visited file and it already exists + (if (and file-exists (not writing-same-file) + (not (yes-or-no-p + (format "File %s exists. Overwrite? " ex-file)))) + (error "Quit")) + ;; writing a region or whole buffer to non-visited file + (unwind-protect + (save-excursion + (viper-enlarge-region beg end) + (setq region (buffer-substring (point) (mark t))) + ;; create temp buffer for the region + (setq temp-buf (get-buffer-create " *ex-write*")) + (set-buffer temp-buf) + (if (featurep 'xemacs) + (set-visited-file-name ex-file) + (set-visited-file-name ex-file 'noquery)) + (erase-buffer) + (if (and file-exists ex-append) + (insert-file-contents ex-file)) + (goto-char (point-max)) + (insert region) + ;; ask user + (viper-maybe-checkout (current-buffer)) + (setq selective-display nil) + (save-buffer) + (ex-write-info + file-exists ex-file (point-min) (point-max)) + ) + ;; this must be under unwind-protect so that + ;; temp-buf will be deleted in case of an error + (set-buffer temp-buf) + (set-buffer-modified-p nil) + (kill-buffer temp-buf) + ;; buffer/region has been written, now take care of details + (set-buffer orig-buf))) + ;; set the right file modification time (if (and (buffer-file-name) writing-same-file) (set-visited-file-modtime)) - (or writing-whole-file + ;; prevent loss of data if saving part of the buffer in visited file + (or writing-whole-file (not writing-same-file) - (set-buffer-modified-p t)) + (progn + (sit-for 2) + (message "Warning: you have saved only part of the buffer!") + (set-buffer-modified-p t))) (if q-flag - (if (< vip-expert-level 2) + (if (< viper-expert-level 2) (save-buffers-kill-emacs) (kill-buffer (current-buffer)))) ))) - + (defun ex-write-info (exists file-name beg end) (message "`%s'%s %d lines, %d characters" - (vip-abbreviate-file-name file-name) + (viper-abbreviate-file-name file-name) (if exists "" " [New file]") (count-lines beg (min (1+ end) (point-max))) (- end beg))) ;; Ex yank command (defun ex-yank () - (vip-default-ex-addresses) - (vip-get-ex-buffer) + (viper-default-ex-addresses) + (viper-get-ex-buffer) (let ((end (car ex-addresses)) (beg (car (cdr ex-addresses)))) - (if (> beg end) (error vip-FirstAddrExceedsSecond)) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) (save-excursion - (vip-enlarge-region beg end) + (viper-enlarge-region beg end) (exchange-point-and-mark) (if (or ex-g-flag ex-g-variant) (error "Can't execute `yank' within `global'")) @@ -2000,32 +2124,33 @@ Please contact your system administrator. " (set-mark (point)) (forward-line (1- ex-count))) (set-mark end)) - (vip-enlarge-region (point) (mark t)) - (if ex-flag (error "`yank': %s" vip-SpuriousText)) + (viper-enlarge-region (point) (mark t)) + (if ex-flag (error "`yank': %s" viper-SpuriousText)) (if ex-buffer - (cond ((vip-valid-register ex-buffer '(Letter)) - (vip-append-to-register + (cond ((viper-valid-register ex-buffer '(Letter)) + (viper-append-to-register (downcase ex-buffer) (point) (mark t))) - ((vip-valid-register ex-buffer) + ((viper-valid-register ex-buffer) (copy-to-register ex-buffer (point) (mark t) nil)) - (t (error vip-InvalidRegister ex-buffer)))) + (t (error viper-InvalidRegister ex-buffer)))) (copy-region-as-kill (point) (mark t))))) ;; Execute shell command (defun ex-command () (let (command) - (save-window-excursion - (setq vip-ex-work-buf (get-buffer-create vip-ex-work-buf-name)) - (set-buffer vip-ex-work-buf) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) (skip-chars-forward " \t") (setq command (buffer-substring (point) (point-max))) (end-of-line)) + ;; replace # and % with the previous/current file (setq command (ex-expand-filsyms command (current-buffer))) (if (and (> (length command) 0) (string= "!" (substring command 0 1))) - (if vip-ex-last-shell-com - (setq command (concat vip-ex-last-shell-com (substring command 1))) + (if viper-ex-last-shell-com + (setq command + (concat viper-ex-last-shell-com (substring command 1))) (error "No previous shell command"))) - (setq vip-ex-last-shell-com command) + (setq viper-ex-last-shell-com command) (if (null ex-addresses) (shell-command command) (let ((end (car ex-addresses)) (beg (car (cdr ex-addresses)))) @@ -2033,10 +2158,32 @@ Please contact your system administrator. " (save-excursion (goto-char beg) (set-mark end) - (vip-enlarge-region (point) (mark t)) + (viper-enlarge-region (point) (mark t)) (shell-command-on-region (point) (mark t) command t)) (goto-char beg))))) +(defun ex-compile () + "Reads args from the command line, then runs make with the args. +If no args are given, then it runs the last compile command. +Type 'mak ' (including the space) to run make with no args." + (let (args) + (with-current-buffer (setq viper-ex-work-buf + (get-buffer-create viper-ex-work-buf-name)) + (setq args (buffer-substring (point) (point-max))) + (end-of-line)) + ;; Remove the newline that may (will?) be at the end of the args + (if (string= "\n" (substring args (1- (length args)))) + (setq args (substring args 0 (1- (length args))))) + ;; Run last command if no args given, else construct a new command. + (setq args + (if (string= "" args) + (if (boundp 'compile-command) + compile-command + ex-compile-command) + (concat ex-compile-command " " args))) + (compile args) + )) + ;; Print line number (defun ex-line-no () (message "%d" @@ -2045,15 +2192,17 @@ Please contact your system administrator. " (if (null ex-addresses) (point-max) (car ex-addresses)))))) ;; Give information on the file visited by the current buffer -(defun vip-info-on-file () +(defun viper-info-on-file () (interactive) - (let ((pos1 (vip-line-pos 'start)) - (pos2 (vip-line-pos 'end)) + (let ((pos1 (viper-line-pos 'start)) + (pos2 (viper-line-pos 'end)) lines file info) - (setq lines (count-lines (point-min) (vip-line-pos 'end)) - file (if (buffer-file-name) - (concat (vip-abbreviate-file-name (buffer-file-name)) ":") - (concat (buffer-name) " [Not visiting any file]:")) + (setq lines (count-lines (point-min) (viper-line-pos 'end)) + file (cond ((buffer-file-name) + (concat (viper-abbreviate-file-name (buffer-file-name)) ":")) + ((buffer-file-name (buffer-base-buffer)) + (concat (viper-abbreviate-file-name (buffer-file-name (buffer-base-buffer))) " (indirect buffer):")) + (t (concat (buffer-name) " [Not visiting any file]:"))) info (format "line=%d/%d pos=%d/%d col=%d %s" (if (= pos1 pos2) (1+ lines) @@ -2064,15 +2213,93 @@ Please contact your system administrator. " (if (buffer-modified-p) "[Modified]" "[Unchanged]"))) (if (< (+ 1 (length info) (length file)) (window-width (minibuffer-window))) - (message (concat file " " info)) + (message "%s" (concat file " " info)) (save-window-excursion - (with-output-to-temp-buffer " *vip-info*" - (princ (concat "\n" - file "\n\n\t" info - "\n\n\nPress any key to continue...\n\n"))) - (vip-read-event) - (kill-buffer " *vip-info*"))) + (with-output-to-temp-buffer " *viper-info*" + (princ (concat "\n" file "\n\n\t" info "\n\n"))) + (let ((inhibit-quit t)) + (viper-set-unread-command-events (viper-read-event))) + (kill-buffer " *viper-info*"))) + )) + + +;; Without arguments displays info on file. With an arg, sets the visited file +;; name to that arg +(defun ex-set-visited-file-name () + (viper-get-ex-file) + (if (string= ex-file "") + (viper-info-on-file) + ;; If ex-file is a directory, use the file portion of the buffer + ;; file name (like ex-write). Do this even if ex-file is a + ;; non-existent directory, since set-visited-file-name signals an + ;; error on this condition, too. + (if (and (string= (file-name-nondirectory ex-file) "") + buffer-file-name + (not (file-directory-p buffer-file-name))) + (setq ex-file (concat (file-name-as-directory ex-file) + (file-name-nondirectory buffer-file-name)))) + (set-visited-file-name ex-file))) + + +;; display all variables set through :set +(defun ex-show-vars () + (with-output-to-temp-buffer " *viper-info*" + (princ (if viper-auto-indent + "autoindent (local)\n" "noautoindent (local)\n")) + (princ (if (default-value 'viper-auto-indent) + "autoindent (global) \n" "noautoindent (global) \n")) + (princ (if viper-case-fold-search "ignorecase\n" "noignorecase\n")) + (princ (if viper-re-search "magic\n" "nomagic\n")) + (princ (if buffer-read-only "readonly\n" "noreadonly\n")) + (princ (if blink-matching-paren "showmatch\n" "noshowmatch\n")) + (princ (if viper-search-wrap-around "wrapscan\n" "nowrapscan\n")) + (princ (format "shiftwidth \t\t= %S\n" viper-shift-width)) + (princ (format "tabstop (local) \t= %S\n" tab-width)) + (princ (format "tabstop (global) \t= %S\n" (default-value 'tab-width))) + (princ (format "wrapmargin (local) \t= %S\n" + (- (window-width) fill-column))) + (princ (format "wrapmargin (global) \t= %S\n" + (- (window-width) (default-value 'fill-column)))) + (princ (format "shell \t\t\t= %S\n" (if (boundp 'explicit-shell-file-name) + explicit-shell-file-name + 'none))) )) +(defun ex-print () + (viper-default-ex-addresses) + (let ((end (car ex-addresses)) + (beg (car (cdr ex-addresses)))) + (if (> beg end) (error viper-FirstAddrExceedsSecond)) + (save-excursion + (viper-enlarge-region beg end) + (if (or ex-g-flag ex-g-variant) + ;; When executing a global command, collect output of each + ;; print in viper-ex-print-buf. + (progn + (append-to-buffer viper-ex-print-buf (point) (mark t)) + ;; Is this the last mark for the global command? + (unless (cdr ex-g-marks) + (with-current-buffer viper-ex-print-buf + (ex-print-display-lines (buffer-string)) + (erase-buffer)))) + (ex-print-display-lines (buffer-substring (point) (mark t))))))) + +(defun ex-print-display-lines (lines) + (cond + ;; String doesn't contain a newline. + ((not (string-match "\n" lines)) + (message "%s" lines)) + ;; String contains only one newline at the end. Strip it off. + ((= (string-match "\n" lines) (1- (length lines))) + (message "%s" (substring lines 0 -1))) + ;; String spans more than one line. Use a temporary buffer. + (t + (save-current-buffer + (with-output-to-temp-buffer " *viper-info*" + (princ lines)))))) + + + + -;;; viper-ex.el ends here +;;; viper-ex.el ends here