Mercurial > emacs
view lisp/dabbrev.el @ 4872:628cbf7e7005
(comint-after-partial-file-name-command):
Renamed from comint-after-partial-pathname-command.
(comint-match-partial-file-name, comint-after-partial-file-name):
Renamed from comint-match-partial-pathname, etc.
(comint-last-output-start): New variable to record
where most recent process output started from.
(comint-mode): Initialise it.
(comint-output-filter): Set it.
(comint-previous-matching-input-string): Moved to
comint-previous-matching-input-position.
(comint-previous-matching-input-string): Use it.
(comint-search-arg, comint-search-start,
comint-previous-input-string): New subroutines.
(comint-previous-input, comint-next-input,
comint-previous-matching-input, comint-next-matching-input,
comint-previous-matching-input-from-input,
comint-next-matching-input-from-input): Use them.
(comint-mode-map): Added signal menu-bar. Moved
comint-backward/forward-matching-input to output menu-bar, since
they move within the buffer rather than do input.
(comint-send-input, comint-after-pmark-p,
comint-kill-input, comint-proc-query): Removed serialisation of
obtaining the process mark's marker-position.
Commented out comint-load-hooks.
(comint-dynamic-simple-complete): New subroutine.
(comint-dynamic-complete-filename-command): New variable.
(comint-after-partial-pathname-command): New variable.
(comint-after-partial-pathname): New subroutine.
(comint-dynamic-complete): Use them.
(comint-mode): Make them local.
Renamed comint-dynamic-complete-command to
comint-dynamic-complete-command-command for consistency.
Renamed comint-file-name-addsuffix/autolist/recexact to
comint-completion-addsuffix/autolist/recexact for consistency.
(comint-replace-by-expanded-history): Check if input
ring size is not big enough for relative reference.
(comint-read-input-ring, comint-input-ring-file-name):
From shell.el.
(shell-write-input-ring): New subroutine.
(comint-file-name-prefix): New variable.
(comint-directory): New inline subroutine.
(comint-dynamic-complete-filename, comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Use it.
(comint-dynamic-complete-filename,
comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Make sure local
completion-ignore-case is nil.
(comint-next-prompt, comint-previous-prompt): Use
paragraph-start and paragraph motion commands rather than
re-search-forward and re-search-backward commands.
(comint-dynamic-list-input-ring,
comint-previous-matching-input-string): Use ring-empty-p rather
than zerop and ring-length.
(comint-input-ignoredups): New variable.
(comint-send-input, shell-read-input-ring): Use it.
(comint-mode): Make comint-input-ignoredups local. Doc fix.
(comint-scroll-to-bottom-on-input): New variable.
(comint-scroll-to-bottom-on-output): New variable.
(comint-scroll-show-maximum-output): New variable.
(comint-output-filter-hook): New variable, defaults to
comint-postoutput-scroll-to-bottom.
(comint-output-filter): Renamed from comint-filter
for consistency. Now calls comint-output-filter-hook.
(comint-preinput-scroll-to-bottom): New subroutine.
(comint-postoutput-scroll-to-bottom): New subroutine.
(comint-show-maximum-output): New command.
(comint-copy-old-input): New command.
(comint-send-input): Run comint-output-filter-hook if
necessary as a kludge to prevent messy redisplays.
(comint-mode-map): Added comint-show-maximum-output to
C-c C-e and menu-bar output, and comint-copy-old-input to C-c C-i
and menu-bar input.
(comint-mode): Make local variables
comint-scroll-to-bottom-on-input, before-change-function,
comint-scroll-to-bottom-on-output, comint-scroll-show-maximum-output,
and comint-output-filter-hook.
(comint-version): Deleted--no need for separate version.
(comint-input-ring-index): Make this a permanent local.
(comint-mode): Don't alter comint-input-ring-index or comint-input-ring
if already set meaningfully.
(comint-mode-map): Added keys M-R/S for
comint-previous/next-matching-input-from-input and to completion
menu-bar. Added comint-forward/backward-matching-input and
comint-previous/next-matching-input to completion menu-bar.
(comint-mode): Doc fix for functionality.
(comint-exec-1): Uses setenv.
(comint-update-env): Removed.
(comint-input-ring-size): Incremented to 32, as with
command history.
(comint-dynamic-list-input-ring): Check for zero
length ring. Use ring length, not ring size, when generating
list. Use buffer " *Input History*".
(comint-previous-matching-input-string): Check for zero-length ring.
Check last item in case at end of cycle and it's a match.
(comint-searching-input-ring): New subroutine.
(comint-regexp-arg): New subroutine.
(comint-previous-matching-input-from-input): New command.
(comint-next-matching-input-from-input): New command.
(comint-replace-by-expanded-history): Fix for matching
inside quotes. Fix to allow argument subrange specifiers. Fix to
identify and reject absolute input number references.
(comint-within-quotes): New subroutine.
(comint-how-many-region): New subroutine.
(comint-args): New subroutine.
(comint-delim-arg): New subroutine.
(comint-arguments): New subroutine.
(comint-delimiter-argument-list): New variable.
(comint-send-input): Inserts input arguments into ring
separated by single spaces.
(comint-filter): Checks the buffer's process to make
sure it's still there. Otherwise, set-buffer will fail.
(comint-backward-matching-input): New command.
(comint-forward-matching-input): New command.
(comint-next-prompt, comint-previous-prompt):
Error if reach beg/end of buffer.
(comint-dynamic-complete): Fix for absolute input
number references.
(comint-dynamic-complete-filename): Changed listings
function to comint-dynamic-list-filename-completions. Uses
file-directory-p rather than string-match to test for directories.
(comint-dynamic-list-completions): Changed to list the
list of completions supplied as the function argument. Use buffer
" *Completions*".
(comint-match-partial-pathname): New subroutine.
(comint-dynamic-complete-variable): New command.
(comint-dynamic-list-filename-completions): New function.
(comint-previous-input):
Don't use replace-match; just insert before deleting.
(comint-magic-space): Use self-insert command.
(comint-history-file-name): New variable.
(comint-mode): Initialize comint-input-ring before
running comint-mode-hook.
(comint-input-autoexpand): New variable.
(comint-dynamic-complete-command): New variable.
(comint-get-current-command): New variable.
(comint-read-input-ring): New function.
(comint-send-input): Handle history expansion.
(comint-input-sentinel): Doc fix.
(comint-mode-map): Added key binding for C-c C-h.
Added menu bars for completion, input and output.
(comint-dynamic-list-input-ring): New function.
(comint-previous-input-string): New subroutine.
(comint-previous-input): Use it.
(comint-previous-matching-input-string): New subroutine.
(comint-previous-matching-input): Use it.
(comint-replace-by-expanded-history): New command.
(comint-magic-space): New command.
(comint-replace-by-expanded-filename): Now replaces
expanded match for a filename, and then calls filename completion
comint-dynamic-complete-filename to do file name completion.
(comint-kill-output): Don't kill prompt.
(comint-show-output): Don't move point if it's
visible where it is, and if point is moved, put it after prompt.
(comint-dynamic-complete): Totally new definition.
(comint-dynamic-complete-filename): New name for old
function comint-dynamic-complete, completes files and lists
candidates, souped up for configurability.
(comint-dynamic-complete-variable): New command.
(comint-file-name-autolist): New variable.
(comint-file-name-addsuffix): New variable,
(comint-file-name-recexact): New variable.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 22 Oct 1993 02:57:36 +0000 |
parents | ca1e006fff42 |
children | 069c54e77fd1 |
line wrap: on
line source
;;; dabbrev.el --- dynamic abbreviation package for GNU Emacs. ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. ;; Last-Modified: 16 Mar 1992 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; Commentary: ; DABBREVS - "Dynamic abbreviations" hack, originally written by Don Morrison ; for Twenex Emacs. Converted to mlisp by Russ Fish. Supports the table ; feature to avoid hitting the same expansion on re-expand, and the search ; size limit variable. Bugs fixed from the Twenex version are flagged by ; comments starting with ;;; . ; ; converted to Emacs Lisp by Spencer Thomas. ; Thoroughly cleaned up by Richard Stallman. ; ; If anyone feels like hacking at it, Bob Keller (Keller@Utah-20) first ; suggested the beast, and has some good ideas for its improvement, but ; doesn't know TECO (the lucky devil...). One thing that should definitely ; be done is adding the ability to search some other buffer(s) if you can?t ; find the expansion you want in the current one. ;;; Code: ;; (defun dabbrevs-help () ;; "Give help about dabbrevs." ;; (interactive) ;; (&info "emacs" "dabbrevs") ; Select the specific info node. ;; ) (defvar dabbrevs-limit nil "*Limits region searched by `dabbrevs-expand' to this many chars away.") (make-variable-buffer-local 'dabbrevs-limit) (defvar dabbrevs-backward-only nil "*If non-NIL, `dabbrevs-expand' only looks backwards.") ; State vars for dabbrevs-re-expand. (defvar last-dabbrevs-table nil "Table of expansions seen so far (local)") (make-variable-buffer-local 'last-dabbrevs-table) (defvar last-dabbrevs-abbreviation "" "Last string we tried to expand (local).") (make-variable-buffer-local 'last-dabbrevs-abbreviation) (defvar last-dabbrevs-direction 0 "Direction of last dabbrevs search (local)") (make-variable-buffer-local 'last-dabbrevs-direction) (defvar last-dabbrevs-abbrev-location nil "Location last abbreviation began (local).") (make-variable-buffer-local 'last-dabbrevs-abbrev-location) (defvar last-dabbrevs-expansion nil "Last expansion of an abbreviation. (local)") (make-variable-buffer-local 'last-dabbrevs-expansion) (defvar last-dabbrevs-expansion-location nil "Location the last expansion was found. (local)") (make-variable-buffer-local 'last-dabbrevs-expansion-location) ;;;###autoload (defun dabbrev-expand (arg) "Expand previous word \"dynamically\". Expands to the most recent, preceding word for which this is a prefix. If no suitable preceding word is found, words following point are considered. If `case-fold-search' and `case-replace' are non-nil (usually true) then the substituted word may be case-adjusted to match the abbreviation that you had typed. This takes place if the substituted word, as found, is all lower case, or if it is at the beginning of a sentence and only its first letter was upper case. A positive prefix arg N says to take the Nth backward DISTINCT possibility. A negative argument says search forward. The variable `dabbrev-backward-only' may be used to limit the direction of search to backward if set non-nil. If the cursor has not moved from the end of the previous expansion and no argument is given, replace the previously-made expansion with the next possible expansion not yet tried." (interactive "*P") (let (abbrev expansion old which loc n pattern (do-case (and case-fold-search case-replace))) ;; abbrev -- the abbrev to expand ;; expansion -- the expansion found (eventually) or nil until then ;; old -- the text currently in the buffer ;; (the abbrev, or the previously-made expansion) ;; loc -- place where expansion is found ;; (to start search there for next expansion if requested later) ;; do-case -- non-nil if should transform case when substituting. (save-excursion (if (and (null arg) (eq last-command this-command) last-dabbrevs-abbrev-location) (progn (setq abbrev last-dabbrevs-abbreviation) (setq old last-dabbrevs-expansion) (setq which last-dabbrevs-direction)) (setq which (if (null arg) (if dabbrevs-backward-only 1 0) (prefix-numeric-value arg))) (setq loc (point)) (forward-word -1) (setq last-dabbrevs-abbrev-location (point)) ; Original location. (setq abbrev (buffer-substring (point) loc)) (setq old abbrev) (setq last-dabbrevs-expansion-location nil) (setq last-dabbrev-table nil)) ; Clear table of things seen. (setq pattern (concat "\\b" (regexp-quote abbrev) "\\(\\sw\\|\\s_\\)+")) ;; Try looking backward unless inhibited. (if (>= which 0) (progn (setq n (max 1 which)) (if last-dabbrevs-expansion-location (goto-char last-dabbrevs-expansion-location)) (while (and (> n 0) (setq expansion (dabbrevs-search pattern t do-case))) (setq loc (point-marker)) (setq last-dabbrev-table (cons expansion last-dabbrev-table)) (setq n (1- n))) (or expansion (setq last-dabbrevs-expansion-location nil)) (setq last-dabbrevs-direction (min 1 which)))) (if (and (<= which 0) (not expansion)) ; Then look forward. (progn (setq n (max 1 (- which))) (if last-dabbrevs-expansion-location (goto-char last-dabbrevs-expansion-location)) (while (and (> n 0) (setq expansion (dabbrevs-search pattern nil do-case))) (setq loc (point-marker)) (setq last-dabbrev-table (cons expansion last-dabbrev-table)) (setq n (1- n))) (setq last-dabbrevs-direction -1)))) (if (not expansion) (let ((first (string= abbrev old))) (setq last-dabbrevs-abbrev-location nil) (if (not first) (progn (undo-boundary) (search-backward old) (if (eq major-mode 'picture-mode) (picture-replace-match abbrev t 'literal) (replace-match abbrev t 'literal)))) (error (if first "No dynamic expansion for \"%s\" found." "No further dynamic expansions for \"%s\" found.") abbrev)) ;; Success: stick it in and return. (undo-boundary) (search-backward old) ;; Make case of replacement conform to case of abbreviation ;; provided (1) that kind of thing is enabled in this buffer ;; and (2) the replacement itself is all lower case. ;; First put back the original abbreviation with its original ;; case pattern. (save-excursion (if (eq major-mode 'picture-mode) (picture-replace-match abbrev t 'literal) (replace-match abbrev t 'literal))) (search-forward abbrev) (let ((do-case (and do-case (string= (substring expansion 1) (downcase (substring expansion 1)))))) ;; First put back the original abbreviation with its original ;; case pattern. (save-excursion (replace-match abbrev t 'literal)) ;;; This used to be necessary, but no longer, ;;; because now point is preserved correctly above. ;;; (search-forward abbrev) (if (eq major-mode 'picture-mode) (picture-replace-match (if do-case (downcase expansion) expansion) (not do-case) 'literal) (replace-match (if do-case (downcase expansion) expansion) (not do-case) 'literal))) ;; Save state for re-expand. (setq last-dabbrevs-abbreviation abbrev) (setq last-dabbrevs-expansion expansion) (setq last-dabbrevs-expansion-location loc)))) ;;;###autoload (define-key esc-map "/" 'dabbrev-expand) ;; Search function used by dabbrevs library. ;; First arg is string to find as prefix of word. Second arg is ;; t for reverse search, nil for forward. Variable dabbrevs-limit ;; controls the maximum search region size. ;; Table of expansions already seen is examined in buffer last-dabbrev-table, ;; so that only distinct possibilities are found by dabbrevs-re-expand. ;; Note that to prevent finding the abbrev itself it must have been ;; entered in the table. ;; IGNORE-CASE non-nil means treat case as insignificant while ;; looking for a match and when comparing with previous matches. ;; Also if that's non-nil and the match is found at the beginning of a sentence ;; and is in lower case except for the initial ;; then it is converted to all lower case for return. ;; Value is the expansion, or nil if not found. After a successful ;; search, point is left right after the expansion found. (defun dabbrevs-search (pattern reverse ignore-case) (let (missing result (case-fold-search ignore-case)) (save-restriction ; Uses restriction for limited searches. (if dabbrevs-limit (narrow-to-region last-dabbrevs-abbrev-location (+ (point) (* dabbrevs-limit (if reverse -1 1))))) ;; Keep looking for a distinct expansion. (setq result nil) (setq missing nil) (while (and (not result) (not missing)) ; Look for it, leave loop if search fails. (setq missing (not (if reverse (re-search-backward pattern nil t) (re-search-forward pattern nil t)))) (if (not missing) (progn (setq result (buffer-substring (match-beginning 0) (match-end 0))) (let* ((test last-dabbrev-table)) (while (and test (not (if ignore-case (string= (downcase (car test)) (downcase result)) (string= (car test) result)))) (setq test (cdr test))) (if test (setq result nil)))))) ; if already in table, ignore (if result (save-excursion (let ((beg (match-beginning 0))) (goto-char beg) (and ignore-case (string= (substring result 1) (downcase (substring result 1))) (if (string= paragraph-start (concat "^$\\|" page-delimiter)) (and (re-search-backward sentence-end nil t) (= (match-end 0) beg)) (forward-char 1) (backward-sentence) (= (point) beg)) (setq result (downcase result)))))) result))) (provide 'dabbrev) ;;; dabbrev.el ends here