2001-07-16 12:23:00 +00:00
|
|
|
;;; hippie-exp.el --- expand text trying various ways to find its expansion
|
1993-03-17 15:58:09 +00:00
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
;; Copyright (C) 1992, 2001-2011 Free Software Foundation, Inc.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
;; Author: Anders Holst <aho@sans.kth.se>
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
;; Last change: 3 March 1998
|
|
|
|
;; Version: 1.6
|
1998-05-26 09:23:23 +00:00
|
|
|
;; Keywords: abbrev convenience
|
1993-03-17 15:58:09 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1993-01-06 04:35:15 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1993-01-06 04:35:15 +00:00
|
|
|
|
1993-03-17 17:17:05 +00:00
|
|
|
;;; Commentary:
|
1996-01-14 07:34:30 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
;; `hippie-expand' is a single function for a lot of different kinds
|
|
|
|
;; of completions and expansions. Called repeatedly it tries all
|
2003-01-31 15:24:20 +00:00
|
|
|
;; possible completions in succession.
|
1993-01-06 04:35:15 +00:00
|
|
|
;; Which kinds of completions to try, and in which order, is
|
|
|
|
;; determined by the contents of `hippie-expand-try-functions-list'.
|
|
|
|
;; Much customization of `hippie-expand' can be made by changing the
|
|
|
|
;; order of, removing, or inserting new functions in this list.
|
|
|
|
;; Given a positive numeric argument, `hippie-expand' jumps directly
|
|
|
|
;; ARG functions forward in this list. Given some other argument
|
|
|
|
;; (a negative argument or just Ctrl-U) it undoes the tried
|
|
|
|
;; completion.
|
1993-12-23 04:38:57 +00:00
|
|
|
;;
|
1993-01-06 04:35:15 +00:00
|
|
|
;; If the variable `hippie-expand-verbose' is non-nil, `hippie-expand'
|
|
|
|
;; outputs in a message which try-function in the list that is used
|
|
|
|
;; currently (ie. was used currently and will be tried first the next
|
|
|
|
;; time).
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; The variable `hippie-expand-max-buffers' determines in how many
|
|
|
|
;; buffers, apart from the current, to search for expansions in. It
|
|
|
|
;; is used by the try-functions named "-all-buffers".
|
1993-12-23 04:38:57 +00:00
|
|
|
;; The variable `hippie-expand-ignore-buffers' is a list of regexps
|
|
|
|
;; matching buffer names (as strings) or major modes (as atoms) of
|
|
|
|
;; buffers that should not be searched by the try-functions named
|
|
|
|
;; "-all-buffers".
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
;; If set, the variable `hippie-expand-only-buffers' does the opposite
|
|
|
|
;; of `hippie-expand-ignore-buffers', in that the search is restricted
|
|
|
|
;; to only the kind of buffers listed.
|
|
|
|
;; If the variable `hippie-expand-no-restriction' is non-nil, narrowed
|
|
|
|
;; buffers are widened before they are searched.
|
|
|
|
;; The variable `hippie-expand-dabbrev-skip-space' controls whether
|
|
|
|
;; trailing spaces will be included in the abbreviation to search for,
|
|
|
|
;; which then gives the same behavior as the original `dabbrev-expand'.
|
|
|
|
;; The variable `hippie-expand-dabbrev-as-symbol' controls whether
|
|
|
|
;; characters of syntax '_' is considered part of the words to expand
|
|
|
|
;; dynamically.
|
1993-01-06 04:35:15 +00:00
|
|
|
;; See also the macro `make-hippie-expand-function' below.
|
2003-01-31 15:24:20 +00:00
|
|
|
;;
|
1993-01-06 04:35:15 +00:00
|
|
|
;; A short description of the current try-functions in this file:
|
|
|
|
;; `try-complete-file-name' : very convenient to have in any buffer,
|
|
|
|
;; and not just in the minibuffer or (some) shell-mode. It goes
|
|
|
|
;; through all possible completions instead of just completing as
|
|
|
|
;; much as is unique.
|
|
|
|
;; `try-complete-file-name-partially' : To insert in the list just
|
|
|
|
;; before `try-complete-file-name' for those who want first to get
|
|
|
|
;; a file name completed only as many characters as is unique.
|
|
|
|
;; `try-expand-all-abbrevs' : can be removed if you don't use abbrevs.
|
|
|
|
;; Otherwise it looks through all abbrev-tables, starting with
|
2003-01-31 15:24:20 +00:00
|
|
|
;; the local followed by the global.
|
|
|
|
;; `try-expand-line' : Searches the buffer for an entire line that
|
|
|
|
;; begins exactly as the current line. Convenient sometimes, for
|
1993-01-06 04:35:15 +00:00
|
|
|
;; example as a substitute for (or complement to) the history
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; list in shell-like buffers. At other times, only confusing.
|
1993-01-06 04:35:15 +00:00
|
|
|
;; `try-expand-line-all-buffers' : Like `try-expand-line' but searches
|
|
|
|
;; in all buffers (except the current). (This may be a little
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; slow, don't use it unless you are really fond of `hippie-expand'.)
|
|
|
|
;; `try-expand-list' : Tries to expand the text back to the nearest
|
2009-12-03 01:33:56 +00:00
|
|
|
;; open delimiter, to a whole list from the buffer. Convenient for
|
|
|
|
;; example when writing Lisp or TeX.
|
2003-01-31 15:24:20 +00:00
|
|
|
;; `try-expand-list-all-buffers' : Like `try-expand-list' but searches
|
|
|
|
;; in all buffers (except the current).
|
1993-01-06 04:35:15 +00:00
|
|
|
;; `try-expand-dabbrev' : works exactly as dabbrev-expand (but of
|
|
|
|
;; course in a way compatible with the other try-functions).
|
|
|
|
;; `try-expand-dabbrev-all-buffers' : perhaps the most useful of them,
|
|
|
|
;; like `dabbrev-expand' but searches all Emacs buffers (except the
|
|
|
|
;; current) for matching words. (No, I don't find this one
|
2003-01-31 15:24:20 +00:00
|
|
|
;; particularly slow.)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; `try-expand-dabbrev-visible': Searches the currently visible parts of
|
|
|
|
;; all windows. Can be put before `try-expand-dabbrev-all-buffers' to
|
|
|
|
;; first try the expansions you can see.
|
|
|
|
;; `try-expand-dabbrev-from-kill': Searches the kill ring for a suitable
|
|
|
|
;; completion of the word. Good to have, just in case the word was not
|
|
|
|
;; found elsewhere.
|
|
|
|
;; `try-expand-whole-kill' : Tries to complete text with a whole entry
|
|
|
|
;; from the kill ring. May be good if you don't know how far up in
|
|
|
|
;; the kill-ring the required entry is, and don't want to mess with
|
|
|
|
;; "Choose Next Paste".
|
1993-01-06 04:35:15 +00:00
|
|
|
;; `try-complete-lisp-symbol' : like `lisp-complete-symbol', but goes
|
|
|
|
;; through all possibilities instead of completing what is unique.
|
|
|
|
;; Might be tedious (usually a lot of possible completions) and
|
|
|
|
;; since its function is much like `lisp-complete-symbol', which
|
|
|
|
;; already has a key of its own, you might want to remove this.
|
|
|
|
;; `try-complete-lisp-symbol-partially' : To insert in the list just
|
|
|
|
;; before `try-complete-lisp-symbol' for those who first want to get
|
2003-01-31 15:24:20 +00:00
|
|
|
;; completion of what is unique in the name.
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;
|
|
|
|
;; Not all of the above functions are by default in
|
|
|
|
;; `hippie-expand-try-functions-list'. This variable is better set
|
|
|
|
;; in ".emacs" to make `hippie-expand' behave maximally convenient
|
|
|
|
;; according to personal taste. Also, instead of loading the
|
|
|
|
;; variable with all kinds of try-functions above, it might be an
|
|
|
|
;; idea to use `make-hippie-expand-function' to construct different
|
|
|
|
;; `hippie-expand'-like functions, with different try-lists and bound
|
2009-12-03 01:33:56 +00:00
|
|
|
;; to different keys. It is also possible to make
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; `hippie-expand-try-functions-list' a buffer local variable, and
|
|
|
|
;; let it depend on the mode (by setting it in the mode-hooks).
|
1993-01-06 04:35:15 +00:00
|
|
|
;;
|
|
|
|
;; To write new try-functions, consider the following:
|
|
|
|
;; Each try-function takes one argument OLD which is nil the first
|
|
|
|
;; time the function is called and true in succeeding calls for the
|
|
|
|
;; same string to complete. The first time the function has to
|
|
|
|
;; extract the string before point to complete, and substitute the
|
|
|
|
;; first completion alternative for it. On following calls it has to
|
|
|
|
;; substitute the next possible completion for the last tried string.
|
|
|
|
;; The try-function is to return t as long as it finds new
|
|
|
|
;; possible completions. When there are no more alternatives it has
|
|
|
|
;; to restore the text before point to its original contents, and
|
|
|
|
;; return nil (don't beep or message or anything).
|
|
|
|
;; The try-function can (should) use the following functions:
|
|
|
|
;; `he-init-string' : Initializes the text to substitute to the
|
|
|
|
;; contents of the region BEGIN to END. Also sets the variable
|
|
|
|
;; `he-search-string' to the text to expand.
|
|
|
|
;; `he-substitute-string' : substitutes STR into the region
|
|
|
|
;; initialized with `he-init-string'. (An optional second argument
|
|
|
|
;; TRANS-CASE non-nil, means transfer of case from the abbreviation
|
|
|
|
;; to the expansion is ok if that is enabled in the buffer.)
|
|
|
|
;; `he-reset-string' : Resets the initialized region to its original
|
|
|
|
;; contents.
|
|
|
|
;; There is also a variable: `he-tried-table' which is meant to contain
|
2003-01-31 15:24:20 +00:00
|
|
|
;; all tried expansions so far. The try-function can check this
|
1993-01-06 04:35:15 +00:00
|
|
|
;; variable to see whether an expansion has already been tried
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; (hint: `he-string-member').
|
1993-01-06 04:35:15 +00:00
|
|
|
;;
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; Known bugs
|
1993-01-06 04:35:15 +00:00
|
|
|
;;
|
|
|
|
;; It may happen that some completion suggestion occurs twice, in
|
2003-01-31 15:24:20 +00:00
|
|
|
;; spite of the use of `he-tried-table' to prevent that. This is
|
1993-01-06 04:35:15 +00:00
|
|
|
;; because different try-functions may try to complete different
|
|
|
|
;; lengths of text, and thus put different amounts of the
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; text in `he-tried-table'. Anyway this seems to occur seldom enough
|
|
|
|
;; not to be too disturbing. Also it should NOT be possible for the
|
1993-01-06 04:35:15 +00:00
|
|
|
;; opposite situation to occur, that `hippie-expand' misses some
|
|
|
|
;; suggestion because it thinks it has already tried it.
|
|
|
|
;;
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;; Acknowledgement
|
1993-01-06 04:35:15 +00:00
|
|
|
;;
|
|
|
|
;; I want to thank Mikael Djurfeldt in discussions with whom the idea
|
|
|
|
;; of this function took form.
|
|
|
|
;; I am also grateful to all those who have given me suggestions on
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; how to improve it, and all those who helped to find and remove bugs.
|
1993-01-06 04:35:15 +00:00
|
|
|
;;
|
|
|
|
|
1993-03-17 17:17:05 +00:00
|
|
|
;;; Code:
|
1993-01-06 04:35:15 +00:00
|
|
|
|
2009-01-01 02:46:11 +00:00
|
|
|
(require 'comint)
|
1999-11-25 19:18:59 +00:00
|
|
|
|
1997-05-03 19:53:57 +00:00
|
|
|
(defgroup hippie-expand nil
|
|
|
|
"Expand text trying various ways to find its expansion."
|
1999-11-25 19:18:59 +00:00
|
|
|
:link '(custom-manual "(autotype)Hippie Expand")
|
|
|
|
:link '(emacs-commentary-link "hippie-exp")
|
1998-05-26 09:23:23 +00:00
|
|
|
:group 'abbrev
|
|
|
|
:group 'convenience)
|
1997-05-03 19:53:57 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defvar he-num -1)
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(defvar he-string-beg (make-marker))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(defvar he-string-end (make-marker))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(defvar he-search-string ())
|
|
|
|
|
|
|
|
(defvar he-expand-list ())
|
|
|
|
|
|
|
|
(defvar he-tried-table ())
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(defvar he-search-loc (make-marker))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(defvar he-search-loc2 ())
|
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defvar he-search-bw ())
|
|
|
|
|
|
|
|
(defvar he-search-bufs ())
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(defvar he-searched-n-bufs ())
|
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(defvar he-search-window ())
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;;###autoload
|
1999-11-25 19:18:59 +00:00
|
|
|
(defcustom hippie-expand-try-functions-list
|
|
|
|
'(try-complete-file-name-partially
|
|
|
|
try-complete-file-name
|
|
|
|
try-expand-all-abbrevs
|
|
|
|
try-expand-list
|
|
|
|
try-expand-line
|
|
|
|
try-expand-dabbrev
|
|
|
|
try-expand-dabbrev-all-buffers
|
|
|
|
try-expand-dabbrev-from-kill
|
|
|
|
try-complete-lisp-symbol-partially
|
|
|
|
try-complete-lisp-symbol)
|
1993-01-06 04:35:15 +00:00
|
|
|
"The list of expansion functions tried in order by `hippie-expand'.
|
|
|
|
To change the behavior of `hippie-expand', remove, change the order of,
|
1999-11-25 19:18:59 +00:00
|
|
|
or insert functions in this list."
|
|
|
|
:type '(repeat function)
|
|
|
|
:group 'hippie-expand)
|
1993-01-06 04:35:15 +00:00
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;;###autoload
|
1997-05-03 19:53:57 +00:00
|
|
|
(defcustom hippie-expand-verbose t
|
2008-12-03 05:48:14 +00:00
|
|
|
"Non-nil makes `hippie-expand' output which function it is trying."
|
1997-05-03 19:53:57 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'hippie-expand)
|
1993-01-06 04:35:15 +00:00
|
|
|
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defcustom hippie-expand-dabbrev-skip-space nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Non-nil means tolerate trailing spaces in the abbreviation to expand."
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
:group 'hippie-expand
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defcustom hippie-expand-dabbrev-as-symbol t
|
2008-12-03 05:48:14 +00:00
|
|
|
"Non-nil means expand as symbols, i.e. syntax `_' is considered a letter."
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
:group 'hippie-expand
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defcustom hippie-expand-no-restriction t
|
2008-12-03 05:48:14 +00:00
|
|
|
"Non-nil means that narrowed buffers are widened during search."
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
:group 'hippie-expand
|
|
|
|
:type 'boolean)
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;;###autoload
|
1997-05-03 19:53:57 +00:00
|
|
|
(defcustom hippie-expand-max-buffers ()
|
2008-12-03 05:48:14 +00:00
|
|
|
"The maximum number of buffers (apart from the current) searched.
|
1997-05-03 19:53:57 +00:00
|
|
|
If nil, all buffers are searched."
|
|
|
|
:type '(choice (const :tag "All" nil)
|
|
|
|
integer)
|
|
|
|
:group 'hippie-expand)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
|
1993-12-23 04:38:57 +00:00
|
|
|
;;;###autoload
|
2009-11-11 05:49:09 +00:00
|
|
|
(defcustom hippie-expand-ignore-buffers (list (purecopy "^ \\*.*\\*$") 'dired-mode)
|
2008-12-03 05:48:14 +00:00
|
|
|
"A list specifying which buffers not to search (if not current).
|
1993-12-23 04:38:57 +00:00
|
|
|
Can contain both regexps matching buffer names (as strings) and major modes
|
1997-05-03 19:53:57 +00:00
|
|
|
\(as atoms)"
|
|
|
|
:type '(repeat (choice regexp (symbol :tag "Major Mode")))
|
|
|
|
:group 'hippie-expand)
|
1993-12-23 04:38:57 +00:00
|
|
|
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defcustom hippie-expand-only-buffers ()
|
2008-12-03 05:48:14 +00:00
|
|
|
"A list specifying the only buffers to search (in addition to current).
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
Can contain both regexps matching buffer names (as strings) and major modes
|
2001-12-20 18:59:32 +00:00
|
|
|
\(as atoms). If non-nil, this variable overrides the variable
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
`hippie-expand-ignore-buffers'."
|
|
|
|
:type '(repeat (choice regexp (symbol :tag "Major Mode")))
|
|
|
|
:group 'hippie-expand)
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;;###autoload
|
1993-01-06 04:35:15 +00:00
|
|
|
(defun hippie-expand (arg)
|
|
|
|
"Try to expand text before point, using multiple methods.
|
|
|
|
The expansion functions in `hippie-expand-try-functions-list' are
|
|
|
|
tried in order, until a possible expansion is found. Repeated
|
|
|
|
application of `hippie-expand' inserts successively possible
|
2003-01-31 15:24:20 +00:00
|
|
|
expansions.
|
1993-01-06 04:35:15 +00:00
|
|
|
With a positive numeric argument, jumps directly to the ARG next
|
2003-01-31 15:24:20 +00:00
|
|
|
function in this list. With a negative argument or just \\[universal-argument],
|
|
|
|
undoes the expansion."
|
1993-01-06 04:35:15 +00:00
|
|
|
(interactive "P")
|
2003-01-31 15:24:20 +00:00
|
|
|
(if (or (not arg)
|
1993-01-06 04:35:15 +00:00
|
|
|
(and (integerp arg) (> arg 0)))
|
|
|
|
(let ((first (or (= he-num -1)
|
|
|
|
(not (equal this-command last-command)))))
|
|
|
|
(if first
|
|
|
|
(progn
|
|
|
|
(setq he-num -1)
|
|
|
|
(setq he-tried-table nil)))
|
|
|
|
(if arg
|
|
|
|
(if (not first) (he-reset-string))
|
|
|
|
(setq arg 0))
|
|
|
|
(let ((i (max (+ he-num arg) 0)))
|
|
|
|
(while (not (or (>= i (length hippie-expand-try-functions-list))
|
2003-01-31 15:24:20 +00:00
|
|
|
(apply (nth i hippie-expand-try-functions-list)
|
1993-01-06 04:35:15 +00:00
|
|
|
(list (= he-num i)))))
|
|
|
|
(setq i (1+ i)))
|
|
|
|
(setq he-num i))
|
|
|
|
(if (>= he-num (length hippie-expand-try-functions-list))
|
|
|
|
(progn
|
|
|
|
(setq he-num -1)
|
|
|
|
(if first
|
|
|
|
(message "No expansion found")
|
|
|
|
(message "No further expansions found"))
|
|
|
|
(ding))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(if (and hippie-expand-verbose
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(not (window-minibuffer-p (selected-window))))
|
1996-01-25 00:54:39 +00:00
|
|
|
(message "Using %s"
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(nth he-num hippie-expand-try-functions-list)))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (and (>= he-num 0)
|
|
|
|
(eq (marker-buffer he-string-beg) (current-buffer)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(progn
|
|
|
|
(setq he-num -1)
|
|
|
|
(he-reset-string)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(if (and hippie-expand-verbose
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(not (window-minibuffer-p (selected-window))))
|
1993-01-06 04:35:15 +00:00
|
|
|
(message "Undoing expansions"))))))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
;; Initializes the region to expand (to between BEG and END).
|
|
|
|
(defun he-init-string (beg end)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-string-beg beg)
|
|
|
|
(set-marker he-string-end end)
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(setq he-search-string (buffer-substring-no-properties beg end)))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
;; Resets the expanded region to its original contents.
|
|
|
|
(defun he-reset-string ()
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(let ((newpos (point-marker)))
|
|
|
|
(goto-char he-string-beg)
|
|
|
|
(insert he-search-string)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(delete-region (point) he-string-end)
|
|
|
|
(goto-char newpos)))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
;; Substitutes an expansion STR into the correct region (the region
|
2003-01-31 15:24:20 +00:00
|
|
|
;; initialized with `he-init-string').
|
1993-01-06 04:35:15 +00:00
|
|
|
;; An optional argument TRANS-CASE means that it is ok to transfer case
|
|
|
|
;; from the abbreviation to the expansion if that is possible, and is
|
|
|
|
;; enabled in the buffer.
|
|
|
|
(defun he-substitute-string (str &optional trans-case)
|
|
|
|
(let ((trans-case (and trans-case
|
|
|
|
case-replace
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
case-fold-search))
|
|
|
|
(newpos (point-marker))
|
|
|
|
(subst ()))
|
1993-01-06 04:35:15 +00:00
|
|
|
(goto-char he-string-beg)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq subst (if trans-case (he-transfer-case he-search-string str) str))
|
|
|
|
(setq he-tried-table (cons subst he-tried-table))
|
|
|
|
(insert subst)
|
|
|
|
(delete-region (point) he-string-end)
|
|
|
|
(goto-char newpos)))
|
|
|
|
|
|
|
|
(defun he-capitalize-first (str)
|
|
|
|
(save-match-data
|
|
|
|
(if (string-match "\\Sw*\\(\\sw\\).*" str)
|
|
|
|
(let ((res (downcase str))
|
|
|
|
(no (match-beginning 1)))
|
|
|
|
(aset res no (upcase (aref str no)))
|
|
|
|
res)
|
|
|
|
str)))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(defun he-ordinary-case-p (str)
|
|
|
|
(or (string= str (downcase str))
|
|
|
|
(string= str (upcase str))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(string= str (capitalize str))
|
|
|
|
(string= str (he-capitalize-first str))))
|
|
|
|
|
|
|
|
(defun he-transfer-case (from-str to-str)
|
|
|
|
(cond ((string= from-str (substring to-str 0 (min (length from-str)
|
|
|
|
(length to-str))))
|
|
|
|
to-str)
|
|
|
|
((not (he-ordinary-case-p to-str))
|
1995-10-15 08:54:13 +00:00
|
|
|
to-str)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
((string= from-str (downcase from-str))
|
|
|
|
(downcase to-str))
|
|
|
|
((string= from-str (upcase from-str))
|
|
|
|
(upcase to-str))
|
|
|
|
((string= from-str (he-capitalize-first from-str))
|
|
|
|
(he-capitalize-first to-str))
|
|
|
|
((string= from-str (capitalize from-str))
|
|
|
|
(capitalize to-str))
|
|
|
|
(t
|
|
|
|
to-str)))
|
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
;; Check if STR is a member of LST.
|
2001-12-20 18:59:32 +00:00
|
|
|
;; Transform to the final case if optional TRANS-CASE is non-nil.
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(defun he-string-member (str lst &optional trans-case)
|
|
|
|
(if str
|
|
|
|
(member (if (and trans-case
|
|
|
|
case-replace
|
|
|
|
case-fold-search)
|
|
|
|
(he-transfer-case he-search-string str)
|
|
|
|
str)
|
|
|
|
lst)))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
;; Check if current buffer matches any atom or regexp in LST.
|
|
|
|
;; Atoms are interpreted as major modes, strings as regexps mathing the name.
|
|
|
|
(defun he-buffer-member (lst)
|
|
|
|
(or (memq major-mode lst)
|
|
|
|
(progn
|
|
|
|
(while (and lst
|
|
|
|
(or (not (stringp (car lst)))
|
|
|
|
(not (string-match (car lst) (buffer-name)))))
|
|
|
|
(setq lst (cdr lst)))
|
|
|
|
lst)))
|
1993-12-23 04:38:57 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
;; For the real hippie-expand enthusiast: A macro that makes it
|
|
|
|
;; possible to use many functions like hippie-expand, but with
|
|
|
|
;; different try-functions-lists.
|
|
|
|
;; Usage is for example:
|
|
|
|
;; (fset 'my-complete-file (make-hippie-expand-function
|
|
|
|
;; '(try-complete-file-name-partially
|
|
|
|
;; try-complete-file-name)))
|
|
|
|
;; (fset 'my-complete-line (make-hippie-expand-function
|
|
|
|
;; '(try-expand-line
|
|
|
|
;; try-expand-line-all-buffers)))
|
2003-01-31 15:24:20 +00:00
|
|
|
;;
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;;###autoload
|
1993-01-06 04:35:15 +00:00
|
|
|
(defmacro make-hippie-expand-function (try-list &optional verbose)
|
|
|
|
"Construct a function similar to `hippie-expand'.
|
|
|
|
Make it use the expansion functions in TRY-LIST. An optional second
|
|
|
|
argument VERBOSE non-nil makes the function verbose."
|
1999-11-15 12:20:50 +00:00
|
|
|
`(function (lambda (arg)
|
2003-01-31 15:24:20 +00:00
|
|
|
,(concat
|
1999-11-15 12:20:50 +00:00
|
|
|
"Try to expand text before point, using the following functions: \n"
|
|
|
|
(mapconcat 'prin1-to-string (eval try-list) ", "))
|
|
|
|
(interactive "P")
|
|
|
|
(let ((hippie-expand-try-functions-list ,try-list)
|
|
|
|
(hippie-expand-verbose ,verbose))
|
|
|
|
(hippie-expand arg)))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
|
;;; Here follows the try-functions and their requisites:
|
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defun try-complete-file-name (old)
|
|
|
|
"Try to complete text as a file name.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-init-string (he-file-name-beg) (point))
|
2008-07-31 05:33:56 +00:00
|
|
|
(let ((name-part (file-name-nondirectory he-search-string))
|
|
|
|
(dir-part (expand-file-name (or (file-name-directory
|
1993-01-06 04:35:15 +00:00
|
|
|
he-search-string) ""))))
|
|
|
|
(if (not (he-string-member name-part he-tried-table))
|
|
|
|
(setq he-tried-table (cons name-part he-tried-table)))
|
|
|
|
(if (and (not (equal he-search-string ""))
|
2008-07-31 05:33:56 +00:00
|
|
|
(file-directory-p dir-part))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list (sort (file-name-all-completions
|
1993-01-06 04:35:15 +00:00
|
|
|
name-part
|
|
|
|
dir-part)
|
|
|
|
'string-lessp))
|
|
|
|
(setq he-expand-list ())))))
|
|
|
|
|
|
|
|
(while (and he-expand-list
|
|
|
|
(he-string-member (car he-expand-list) he-tried-table))
|
|
|
|
(setq he-expand-list (cdr he-expand-list)))
|
|
|
|
(if (null he-expand-list)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(let ((filename (he-concat-directory-file-name
|
2008-07-31 05:33:56 +00:00
|
|
|
(file-name-directory he-search-string)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(car he-expand-list))))
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-substitute-string filename)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-tried-table (cons (car he-expand-list) (cdr he-tried-table)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq he-expand-list (cdr he-expand-list))
|
|
|
|
t)))
|
|
|
|
|
|
|
|
(defun try-complete-file-name-partially (old)
|
|
|
|
"Try to complete text as a file name, as many characters as unique.
|
|
|
|
The argument OLD has to be nil the first call of this function. It
|
2003-01-31 15:24:20 +00:00
|
|
|
returns t if a unique, possibly partial, completion is found, nil
|
1993-01-06 04:35:15 +00:00
|
|
|
otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-init-string (he-file-name-beg) (point))
|
2008-07-31 05:33:56 +00:00
|
|
|
(let ((name-part (file-name-nondirectory he-search-string))
|
|
|
|
(dir-part (expand-file-name (or (file-name-directory
|
1993-01-06 04:35:15 +00:00
|
|
|
he-search-string) ""))))
|
|
|
|
(if (and (not (equal he-search-string ""))
|
2008-07-31 05:33:56 +00:00
|
|
|
(file-directory-p dir-part))
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq expansion (file-name-completion name-part
|
|
|
|
dir-part)))
|
|
|
|
(if (or (eq expansion t)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(string= expansion name-part)
|
|
|
|
(he-string-member expansion he-tried-table))
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq expansion ())))))
|
|
|
|
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(let ((filename (he-concat-directory-file-name
|
2008-07-31 05:33:56 +00:00
|
|
|
(file-name-directory he-search-string)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
expansion)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-substitute-string filename)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-tried-table (cons expansion (cdr he-tried-table)))
|
1993-01-06 04:35:15 +00:00
|
|
|
t))))
|
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(defvar he-file-name-chars
|
2008-07-31 05:33:56 +00:00
|
|
|
(cond ((memq system-type '(ms-dos windows-nt cygwin))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
"-a-zA-Z0-9_/.,~^#$+=:\\\\")
|
|
|
|
(t ;; More strange file formats ?
|
|
|
|
"-a-zA-Z0-9_/.,~^#$+="))
|
|
|
|
"Characters that are considered part of the file name to expand.")
|
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defun he-file-name-beg ()
|
1997-05-29 18:32:11 +00:00
|
|
|
(let ((op (point)))
|
|
|
|
(save-excursion
|
|
|
|
(skip-chars-backward he-file-name-chars)
|
|
|
|
(if (> (skip-syntax-backward "w") 0) ;; No words with non-file chars
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
op
|
|
|
|
(point)))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
2008-07-31 05:33:56 +00:00
|
|
|
;; Thanks go to David Hughes <ukchugd@ukpmr.cs.philips.nl> who
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; helped to make it work on PC.
|
|
|
|
(defun he-concat-directory-file-name (dir-part name-part)
|
|
|
|
"Try to slam together two parts of a file specification, system dependently."
|
1996-06-18 16:28:22 +00:00
|
|
|
(cond ((null dir-part) name-part)
|
2009-08-22 21:59:40 +00:00
|
|
|
((eq system-type 'ms-dos)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (and (string-match "\\\\" dir-part)
|
|
|
|
(not (string-match "/" dir-part))
|
|
|
|
(= (aref name-part (1- (length name-part))) ?/))
|
|
|
|
(aset name-part (1- (length name-part)) ?\\))
|
|
|
|
(concat dir-part name-part))
|
2003-01-31 15:24:20 +00:00
|
|
|
(t
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(concat dir-part name-part))))
|
2003-01-31 15:24:20 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defun try-complete-lisp-symbol (old)
|
|
|
|
"Try to complete word as an Emacs Lisp symbol.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-init-string (he-lisp-symbol-beg) (point))
|
|
|
|
(if (not (he-string-member he-search-string he-tried-table))
|
|
|
|
(setq he-tried-table (cons he-search-string he-tried-table)))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list
|
1993-01-06 04:35:15 +00:00
|
|
|
(and (not (equal he-search-string ""))
|
|
|
|
(sort (all-completions he-search-string obarray
|
|
|
|
(function (lambda (sym)
|
|
|
|
(or (boundp sym)
|
|
|
|
(fboundp sym)
|
|
|
|
(symbol-plist sym)))))
|
|
|
|
'string-lessp)))))
|
|
|
|
(while (and he-expand-list
|
|
|
|
(he-string-member (car he-expand-list) he-tried-table))
|
|
|
|
(setq he-expand-list (cdr he-expand-list)))
|
|
|
|
(if (null he-expand-list)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string (car he-expand-list))
|
|
|
|
(setq he-expand-list (cdr he-expand-list))
|
|
|
|
t)))
|
|
|
|
|
|
|
|
(defun try-complete-lisp-symbol-partially (old)
|
|
|
|
"Try to complete as an Emacs Lisp symbol, as many characters as unique.
|
|
|
|
The argument OLD has to be nil the first call of this function. It
|
2003-01-31 15:24:20 +00:00
|
|
|
returns t if a unique, possibly partial, completion is found, nil
|
1993-01-06 04:35:15 +00:00
|
|
|
otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-init-string (he-lisp-symbol-beg) (point))
|
|
|
|
(if (not (string= he-search-string ""))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq expansion
|
1993-01-06 04:35:15 +00:00
|
|
|
(try-completion he-search-string obarray
|
|
|
|
(function (lambda (sym)
|
|
|
|
(or (boundp sym)
|
|
|
|
(fboundp sym)
|
|
|
|
(symbol-plist sym)))))))
|
|
|
|
(if (or (eq expansion t)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(string= expansion he-search-string)
|
|
|
|
(he-string-member expansion he-tried-table))
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq expansion ()))))
|
|
|
|
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun he-lisp-symbol-beg ()
|
1997-05-29 18:32:11 +00:00
|
|
|
(save-excursion
|
|
|
|
(skip-syntax-backward "w_")
|
|
|
|
(point)))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(defun try-expand-line (old)
|
|
|
|
"Try to complete the current line to an entire line in the buffer.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ())
|
|
|
|
(strip-prompt (and (get-buffer-process (current-buffer))
|
2005-04-26 23:13:46 +00:00
|
|
|
comint-use-prompt-regexp
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
comint-prompt-regexp)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-line-beg strip-prompt) (point))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-search-loc he-string-beg)
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq he-search-bw t)))
|
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
;; Try looking backward unless inhibited.
|
|
|
|
(if he-search-bw
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-line-search he-search-string
|
|
|
|
strip-prompt t))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(set-marker he-search-loc he-string-end)
|
|
|
|
(setq he-search-bw ())))))
|
|
|
|
|
|
|
|
(if (not expansion) ; Then look forward.
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq expansion (he-line-search he-search-string
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
strip-prompt nil))
|
|
|
|
(set-marker he-search-loc (point)))))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun try-expand-line-all-buffers (old)
|
|
|
|
"Try to complete the current line, searching all other buffers.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ())
|
|
|
|
(strip-prompt (and (get-buffer-process (current-buffer))
|
2005-04-26 23:13:46 +00:00
|
|
|
comint-use-prompt-regexp
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
comint-prompt-regexp))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(buf (current-buffer))
|
|
|
|
(orig-case-fold-search case-fold-search))
|
1993-01-06 04:35:15 +00:00
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-line-beg strip-prompt) (point))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(setq he-search-bufs (buffer-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-searched-n-bufs 0)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
2003-01-31 15:24:20 +00:00
|
|
|
(while (and he-search-bufs
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(not expansion)
|
|
|
|
(or (not hippie-expand-max-buffers)
|
|
|
|
(< he-searched-n-bufs hippie-expand-max-buffers)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(set-buffer (car he-search-bufs))
|
|
|
|
(if (and (not (eq (current-buffer) buf))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if hippie-expand-only-buffers
|
|
|
|
(he-buffer-member hippie-expand-only-buffers)
|
|
|
|
(not (he-buffer-member hippie-expand-ignore-buffers))))
|
1993-01-06 04:35:15 +00:00
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq strip-prompt (and (get-buffer-process (current-buffer))
|
2005-04-26 23:13:46 +00:00
|
|
|
comint-use-prompt-regexp
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
comint-prompt-regexp))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq expansion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(let ((case-fold-search orig-case-fold-search))
|
|
|
|
(he-line-search he-search-string
|
|
|
|
strip-prompt nil)))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(setq he-searched-n-bufs (1+ he-searched-n-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs)))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(set-buffer buf)
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
2003-01-31 15:24:20 +00:00
|
|
|
(defun he-line-search (str strip-prompt reverse)
|
1993-01-06 04:35:15 +00:00
|
|
|
(let ((result ()))
|
|
|
|
(while (and (not result)
|
|
|
|
(if reverse
|
2003-01-31 15:24:20 +00:00
|
|
|
(re-search-backward
|
1993-01-06 04:35:15 +00:00
|
|
|
(he-line-search-regexp str strip-prompt)
|
|
|
|
nil t)
|
|
|
|
(re-search-forward
|
|
|
|
(he-line-search-regexp str strip-prompt)
|
|
|
|
nil t)))
|
1999-11-15 12:20:50 +00:00
|
|
|
(setq result (buffer-substring-no-properties (match-end 1)
|
|
|
|
(match-end 0)))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (he-string-member result he-tried-table t)
|
|
|
|
(setq result nil))) ; if already in table, ignore
|
1993-01-06 04:35:15 +00:00
|
|
|
result))
|
|
|
|
|
|
|
|
(defun he-line-beg (strip-prompt)
|
|
|
|
(save-excursion
|
2003-01-31 15:24:20 +00:00
|
|
|
(if (re-search-backward (he-line-search-regexp "" strip-prompt)
|
Replace still more end-of-line etc with line-end-position, etc.
* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)
(nnbabyl-check-mbox): Use point-at-bol.
* lisp/cedet/semantic/lex.el (semantic-lex-ignore-comments, semantic-flex):
* lisp/cedet/semantic/grammar.el (semantic-grammar-epilogue):
* lisp/cedet/ede/speedbar.el (ede-find-nearest-file-line):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/ede/autoconf-edit.el (autoconf-delete-parameter):
Use point-at-bol and point-at-eol.
* lisp/vc/emerge.el (emerge-line-number-in-buf):
* lisp/textmodes/ispell.el (ispell-region):
* lisp/textmodes/fill.el (current-fill-column):
* lisp/progmodes/xscheme.el (xscheme-send-current-line):
* lisp/progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment):
* lisp/progmodes/sh-script.el (sh-handle-prev-do):
* lisp/progmodes/meta-mode.el (meta-indent-line):
* lisp/progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
(idlwave-in-quote):
* lisp/progmodes/idlw-shell.el (idlwave-shell-current-frame)
(idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
* lisp/progmodes/fortran.el (fortran-looking-at-if-then):
* lisp/progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
* lisp/progmodes/cperl-mode.el (cperl-sniff-for-indent)
(cperl-find-pods-heres):
* lisp/progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
* lisp/net/quickurl.el (quickurl-list-insert):
* lisp/net/ldap.el (ldap-search-internal):
* lisp/net/eudc.el (eudc-expand-inline):
* lisp/mail/sendmail.el (sendmail-send-it):
* lisp/mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
* lisp/emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
(viper-brac-function):
* lisp/calc/calc-yank.el (calc-do-grab-region):
* lisp/calc/calc-keypd.el (calc-keypad-press):
* lisp/term.el (term-move-columns, term-insert-spaces):
* lisp/speedbar.el (speedbar-highlight-one-tag-line):
* lisp/simple.el (current-word):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* lisp/info.el (Info-find-node-in-buffer-1, Info-follow-reference)
(Info-scroll-down):
* lisp/hippie-exp.el (he-line-beg):
* lisp/epa.el (epa--marked-keys):
* lisp/dired-aux.el (dired-kill-line, dired-do-kill-lines)
(dired-update-file-line, dired-add-entry, dired-remove-entry)
(dired-relist-entry):
* lisp/buff-menu.el (Buffer-menu-buffer):
* lisp/array.el (current-line):
* lisp/allout.el (allout-resolve-xref)
(allout-latex-verbatim-quote-curr-line):
Replace yet more uses of end-of-line etc with line-end-position.
2010-11-09 05:33:07 +00:00
|
|
|
(line-beginning-position) t)
|
1993-01-06 04:35:15 +00:00
|
|
|
(match-beginning 2)
|
|
|
|
(point))))
|
|
|
|
|
|
|
|
(defun he-line-search-regexp (pat strip-prompt)
|
|
|
|
(if strip-prompt
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\("
|
1993-01-06 04:35:15 +00:00
|
|
|
(regexp-quote pat)
|
|
|
|
"[^\n]*[^ \t\n]\\)")
|
2003-01-31 15:24:20 +00:00
|
|
|
(concat "^\\(\\s-*\\)\\("
|
1993-01-06 04:35:15 +00:00
|
|
|
(regexp-quote pat)
|
|
|
|
"[^\n]*[^ \t\n]\\)")))
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(defun try-expand-list (old)
|
|
|
|
"Try to complete the current beginning of a list.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-list-beg) (point))
|
|
|
|
(set-marker he-search-loc he-string-beg)
|
|
|
|
(setq he-search-bw t)))
|
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
;; Try looking backward unless inhibited.
|
|
|
|
(if he-search-bw
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-list-search he-search-string t))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(set-marker he-search-loc he-string-end)
|
|
|
|
(setq he-search-bw ())))))
|
|
|
|
|
|
|
|
(if (not expansion) ; Then look forward.
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-list-search he-search-string nil))
|
|
|
|
(set-marker he-search-loc (point)))))))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(if old (he-reset-string))
|
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun try-expand-list-all-buffers (old)
|
|
|
|
"Try to complete the current list, searching all other buffers.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ())
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(buf (current-buffer))
|
|
|
|
(orig-case-fold-search case-fold-search))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-list-beg) (point))
|
|
|
|
(setq he-search-bufs (buffer-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-searched-n-bufs 0)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))
|
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
2003-01-31 15:24:20 +00:00
|
|
|
(while (and he-search-bufs
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(not expansion)
|
|
|
|
(or (not hippie-expand-max-buffers)
|
|
|
|
(< he-searched-n-bufs hippie-expand-max-buffers)))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-buffer (car he-search-bufs))
|
|
|
|
(if (and (not (eq (current-buffer) buf))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if hippie-expand-only-buffers
|
|
|
|
(he-buffer-member hippie-expand-only-buffers)
|
|
|
|
(not (he-buffer-member hippie-expand-ignore-buffers))))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
(goto-char he-search-loc)
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq expansion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(let ((case-fold-search orig-case-fold-search))
|
|
|
|
(he-list-search he-search-string nil)))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(setq he-searched-n-bufs (1+ he-searched-n-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs)))))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
|
|
|
|
(set-buffer buf)
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
2003-01-31 15:24:20 +00:00
|
|
|
(defun he-list-search (str reverse)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(let ((result ())
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
beg pos err)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(while (and (not result)
|
|
|
|
(if reverse
|
|
|
|
(search-backward str nil t)
|
|
|
|
(search-forward str nil t)))
|
|
|
|
(setq pos (point))
|
|
|
|
(setq beg (match-beginning 0))
|
|
|
|
(goto-char beg)
|
|
|
|
(setq err ())
|
|
|
|
(condition-case ()
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(forward-list 1)
|
|
|
|
(error (setq err t)))
|
2003-01-31 15:24:20 +00:00
|
|
|
(if (and reverse
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(> (point) he-string-beg))
|
|
|
|
(setq err t))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(if (not err)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(setq result (buffer-substring-no-properties beg (point)))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (he-string-member result he-tried-table t)
|
|
|
|
(setq result nil)))) ; if already in table, ignore
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(goto-char pos))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defun he-list-beg ()
|
|
|
|
(save-excursion
|
|
|
|
(condition-case ()
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(backward-up-list 1)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(error ()))
|
|
|
|
(point)))
|
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(defun try-expand-all-abbrevs (old)
|
|
|
|
"Try to expand word before point according to all abbrev tables.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible expansions of the same
|
|
|
|
string). It returns t if a new expansion is found, nil otherwise."
|
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-dabbrev-beg) (point))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list
|
1993-01-06 04:35:15 +00:00
|
|
|
(and (not (equal he-search-string ""))
|
|
|
|
(mapcar (function (lambda (sym)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (and (boundp sym) (vectorp (eval sym)))
|
|
|
|
(abbrev-expansion (downcase he-search-string)
|
|
|
|
(eval sym)))))
|
2003-01-31 15:24:20 +00:00
|
|
|
(append '(local-abbrev-table
|
1993-01-06 04:35:15 +00:00
|
|
|
global-abbrev-table)
|
|
|
|
abbrev-table-name-list))))))
|
|
|
|
(while (and he-expand-list
|
|
|
|
(or (not (car he-expand-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(he-string-member (car he-expand-list) he-tried-table t)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq he-expand-list (cdr he-expand-list)))
|
|
|
|
(if (null he-expand-list)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(he-substitute-string (car he-expand-list) t)
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq he-expand-list (cdr he-expand-list))
|
|
|
|
t)))
|
|
|
|
|
|
|
|
(defun try-expand-dabbrev (old)
|
|
|
|
"Try to expand word \"dynamically\", searching the current buffer.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible expansions of the same
|
|
|
|
string). It returns t if a new expansion is found, nil otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-dabbrev-beg) (point))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-search-loc he-string-beg)
|
1993-01-06 04:35:15 +00:00
|
|
|
(setq he-search-bw t)))
|
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
;; Try looking backward unless inhibited.
|
|
|
|
(if he-search-bw
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-dabbrev-search he-search-string t))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(set-marker he-search-loc he-string-end)
|
|
|
|
(setq he-search-bw ())))))
|
|
|
|
|
|
|
|
(if (not expansion) ; Then look forward.
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-dabbrev-search he-search-string nil))
|
|
|
|
(set-marker he-search-loc (point)))))))
|
2003-01-31 15:24:20 +00:00
|
|
|
|
1993-01-06 04:35:15 +00:00
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun try-expand-dabbrev-all-buffers (old)
|
2009-12-03 01:33:56 +00:00
|
|
|
"Try to expand word \"dynamically\", searching all other buffers.
|
1993-01-06 04:35:15 +00:00
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible expansions of the same
|
|
|
|
string). It returns t if a new expansion is found, nil otherwise."
|
|
|
|
(let ((expansion ())
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(buf (current-buffer))
|
|
|
|
(orig-case-fold-search case-fold-search))
|
1993-01-06 04:35:15 +00:00
|
|
|
(if (not old)
|
|
|
|
(progn
|
|
|
|
(he-init-string (he-dabbrev-beg) (point))
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(setq he-search-bufs (buffer-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-searched-n-bufs 0)
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(if (not (equal he-search-string ""))
|
2003-01-31 15:24:20 +00:00
|
|
|
(while (and he-search-bufs
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(not expansion)
|
|
|
|
(or (not hippie-expand-max-buffers)
|
|
|
|
(< he-searched-n-bufs hippie-expand-max-buffers)))
|
1993-01-06 04:35:15 +00:00
|
|
|
(set-buffer (car he-search-bufs))
|
|
|
|
(if (and (not (eq (current-buffer) buf))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if hippie-expand-only-buffers
|
|
|
|
(he-buffer-member hippie-expand-only-buffers)
|
|
|
|
(not (he-buffer-member hippie-expand-ignore-buffers))))
|
1993-01-06 04:35:15 +00:00
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(save-restriction
|
|
|
|
(if hippie-expand-no-restriction
|
|
|
|
(widen))
|
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion
|
|
|
|
(let ((case-fold-search orig-case-fold-search))
|
|
|
|
(he-dabbrev-search he-search-string nil)))
|
|
|
|
(set-marker he-search-loc (point))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(setq he-searched-n-bufs (1+ he-searched-n-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs))))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-search-bufs (cdr he-search-bufs))
|
|
|
|
(set-marker he-search-loc 1 (car he-search-bufs)))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
|
|
|
(set-buffer buf)
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if old (he-reset-string))
|
1993-01-06 04:35:15 +00:00
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
;; Thanks go to Jeff Dairiki <dairiki@faraday.apl.washington.edu> who
|
|
|
|
;; suggested this one.
|
|
|
|
(defun try-expand-dabbrev-visible (old)
|
|
|
|
"Try to expand word \"dynamically\", searching visible window parts.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible expansions of the same
|
|
|
|
string). It returns t if a new expansion is found, nil otherwise."
|
|
|
|
(let ((expansion ())
|
|
|
|
(flag (if (frame-visible-p (window-frame (selected-window)))
|
|
|
|
'visible t)))
|
2009-12-03 01:33:56 +00:00
|
|
|
(unless old
|
|
|
|
(he-init-string (he-dabbrev-beg) (point))
|
|
|
|
(setq he-search-window (selected-window))
|
|
|
|
(set-marker he-search-loc
|
|
|
|
(window-start he-search-window)
|
|
|
|
(window-buffer he-search-window)))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
|
|
|
|
(while (and (not (equal he-search-string ""))
|
2009-12-03 01:33:56 +00:00
|
|
|
(marker-position he-search-loc)
|
|
|
|
(not expansion))
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
(with-current-buffer (marker-buffer he-search-loc)
|
2009-12-03 01:33:56 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char he-search-loc)
|
|
|
|
(setq expansion (he-dabbrev-search he-search-string ()
|
|
|
|
(window-end he-search-window)))
|
|
|
|
(if (and expansion
|
|
|
|
(eq (marker-buffer he-string-beg) (current-buffer))
|
|
|
|
(eq (marker-position he-string-beg) (match-beginning 0)))
|
|
|
|
(setq expansion
|
|
|
|
(he-dabbrev-search he-search-string ()
|
|
|
|
(window-end he-search-window))))
|
|
|
|
(set-marker he-search-loc (point) (current-buffer))))
|
|
|
|
(unless expansion
|
|
|
|
(setq he-search-window (next-window he-search-window nil flag))
|
|
|
|
(if (eq he-search-window (selected-window))
|
|
|
|
(set-marker he-search-loc nil)
|
|
|
|
(set-marker he-search-loc (window-start he-search-window)
|
|
|
|
(window-buffer he-search-window)))))
|
2003-01-31 15:24:20 +00:00
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(if old (he-reset-string))
|
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
1993-01-06 04:35:15 +00:00
|
|
|
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(defun he-dabbrev-search (pattern &optional reverse limit)
|
|
|
|
(let ((result ())
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(regpat (cond ((not hippie-expand-dabbrev-as-symbol)
|
|
|
|
(concat "\\<" (regexp-quote pattern) "\\sw+"))
|
|
|
|
((eq (char-syntax (aref pattern 0)) ?_)
|
|
|
|
(concat (regexp-quote pattern) "\\(\\sw\\|\\s_\\)+"))
|
|
|
|
(t
|
|
|
|
(concat "\\<" (regexp-quote pattern)
|
|
|
|
"\\(\\sw\\|\\s_\\)+")))))
|
2003-01-31 15:24:20 +00:00
|
|
|
(while (and (not result)
|
1993-01-06 04:35:15 +00:00
|
|
|
(if reverse
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(re-search-backward regpat limit t)
|
|
|
|
(re-search-forward regpat limit t)))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(setq result (buffer-substring-no-properties (match-beginning 0)
|
|
|
|
(match-end 0)))
|
|
|
|
(if (or (and hippie-expand-dabbrev-as-symbol
|
|
|
|
(> (match-beginning 0) (point-min))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(memq (char-syntax (char-after (1- (match-beginning 0))))
|
|
|
|
'(?_ ?w)))
|
|
|
|
(he-string-member result he-tried-table t))
|
|
|
|
(setq result nil))) ; ignore if bad prefix or already in table
|
1993-01-06 04:35:15 +00:00
|
|
|
result))
|
|
|
|
|
|
|
|
(defun he-dabbrev-beg ()
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(let ((op (point)))
|
|
|
|
(save-excursion
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if hippie-expand-dabbrev-skip-space
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(skip-syntax-backward ". "))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if (= (skip-syntax-backward (if hippie-expand-dabbrev-as-symbol
|
|
|
|
"w_" "w"))
|
|
|
|
0)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
op
|
|
|
|
(point)))))
|
|
|
|
|
|
|
|
(defun try-expand-dabbrev-from-kill (old)
|
|
|
|
"Try to expand word \"dynamically\", searching the kill ring.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(he-init-string (he-dabbrev-beg) (point))
|
|
|
|
(setq he-expand-list
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
kill-ring))
|
|
|
|
(setq he-search-loc2 0)))
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
(setq expansion (he-dabbrev-kill-search he-search-string)))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(if old (he-reset-string))
|
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion t)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun he-dabbrev-kill-search (pattern)
|
|
|
|
(let ((result ())
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(regpat (cond ((not hippie-expand-dabbrev-as-symbol)
|
|
|
|
(concat "\\<" (regexp-quote pattern) "\\sw+"))
|
|
|
|
((eq (char-syntax (aref pattern 0)) ?_)
|
|
|
|
(concat (regexp-quote pattern) "\\(\\sw\\|\\s_\\)+"))
|
|
|
|
(t
|
|
|
|
(concat "\\<" (regexp-quote pattern)
|
|
|
|
"\\(\\sw\\|\\s_\\)+"))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(killstr (car he-expand-list)))
|
2003-01-31 15:24:20 +00:00
|
|
|
(while (and (not result)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
he-expand-list)
|
|
|
|
(while (and (not result)
|
|
|
|
(string-match regpat killstr he-search-loc2))
|
|
|
|
(setq result (substring killstr (match-beginning 0) (match-end 0)))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(set-text-properties 0 (length result) () result)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq he-search-loc2 (1+ (match-beginning 0)))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(if (or (and hippie-expand-dabbrev-as-symbol
|
|
|
|
(> (match-beginning 0) 0)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(memq (char-syntax (aref killstr (1- (match-beginning 0))))
|
|
|
|
'(?_ ?w)))
|
|
|
|
(he-string-member result he-tried-table t))
|
|
|
|
(setq result nil))) ; ignore if bad prefix or already in table
|
2003-01-31 15:24:20 +00:00
|
|
|
(if (and (not result)
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
he-expand-list)
|
|
|
|
(progn
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list (cdr he-expand-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq killstr (car he-expand-list))
|
|
|
|
(setq he-search-loc2 0))))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defun try-expand-whole-kill (old)
|
|
|
|
"Try to complete text with something from the kill ring.
|
|
|
|
The argument OLD has to be nil the first call of this function, and t
|
|
|
|
for subsequent calls (for further possible completions of the same
|
|
|
|
string). It returns t if a new completion is found, nil otherwise."
|
|
|
|
(let ((expansion ()))
|
|
|
|
(if (not old)
|
2003-01-31 15:24:20 +00:00
|
|
|
(progn
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(he-init-string (he-kill-beg) (point))
|
|
|
|
(if (not (he-string-member he-search-string he-tried-table))
|
|
|
|
(setq he-tried-table (cons he-search-string he-tried-table)))
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
kill-ring))
|
|
|
|
(setq he-search-loc2 ())))
|
|
|
|
(if (not (equal he-search-string ""))
|
|
|
|
(setq expansion (he-whole-kill-search he-search-string)))
|
|
|
|
(if (not expansion)
|
|
|
|
(progn
|
|
|
|
(if old (he-reset-string))
|
|
|
|
())
|
|
|
|
(progn
|
|
|
|
(he-substitute-string expansion)
|
|
|
|
t))))
|
|
|
|
|
|
|
|
(defun he-whole-kill-search (str)
|
|
|
|
(let ((case-fold-search ())
|
|
|
|
(result ())
|
|
|
|
(str (regexp-quote str))
|
|
|
|
(killstr (car he-expand-list))
|
|
|
|
(pos -1))
|
|
|
|
(while (and (not result)
|
|
|
|
he-expand-list)
|
|
|
|
(if (not he-search-loc2)
|
|
|
|
(while (setq pos (string-match str killstr (1+ pos)))
|
|
|
|
(setq he-search-loc2 (cons pos he-search-loc2))))
|
|
|
|
(while (and (not result)
|
|
|
|
he-search-loc2)
|
|
|
|
(setq pos (car he-search-loc2))
|
|
|
|
(setq he-search-loc2 (cdr he-search-loc2))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char he-string-beg)
|
|
|
|
(if (and (>= (- (point) pos) (point-min)) ; avoid some string GC
|
|
|
|
(eq (char-after (- (point) pos)) (aref killstr 0))
|
|
|
|
(search-backward (substring killstr 0 pos)
|
|
|
|
(- (point) pos) t))
|
(hippie-expand-dabbrev-skip-space): Renamed `he-dabbrev-skip-space'.
(hippie-expand-dabbrev-as-symbol): Renamed `he-dabbrev-as-symbol'.
(hippie-expand-no-restriction): New variable.
(hippie-expand-only-buffers): New variable.
(he-init-string,he-line-search,he-list-search,he-dabbrev-search): Use
`buffer-substring-no-properties' to avoid transfer of text properties.
(he-dabbrev-kill-search,he-whole-kill-search): Remove text properties
from search result.
(he-regexp-member): Removed function.
(he-buffer-member): New function used instead of `he-regexp-member'.
(try-expand-line,try-expand-line-all-buffers,try-expand-list,
try-expand-list-all-buffers,try-expand-dabbrev,
try-expand-dabbrev-all-buffers): Depending on
`hippie-expand-no-restriction', widen the buffer before search.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `he-buffer-member' and
`hippie-expand-only-buffers'.
1998-03-10 18:30:07 +00:00
|
|
|
(progn
|
|
|
|
(setq result (substring killstr pos))
|
|
|
|
(set-text-properties 0 (length result) () result))))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(if (and result
|
|
|
|
(he-string-member result he-tried-table))
|
|
|
|
(setq result nil))) ; ignore if already in table
|
|
|
|
(if (and (not result)
|
|
|
|
he-expand-list)
|
|
|
|
(progn
|
2003-01-31 15:24:20 +00:00
|
|
|
(setq he-expand-list (cdr he-expand-list))
|
(hippie-expand): Removed bug - don't undo from another buffer.
(he-reset-string): Removed bug - don't move markers.
(he-capitalize-first): New function, defining new "case".
(he-transfer-case): New function.
(he-transfer-case-ok): Function removed.
(he-substitute-string,he-ordinary-case-p,he-string-member): Use the
new functions above, for the new case handling.
(he-file-name-chars): New variable.
(he-file-name-beg): Use `he-file-name-chars'.
(he-file-name-nondirectory,he-file-name-directory,
he-file-directory-p,he-concat-directory-file-name): New functions
to handle VMS and PC filename formats more accurately.
(try-complete-file-name,try-complete-file-name-partially): Use the
new functions above.
(try-expand-line-all-buffers,try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use `case-fold-search' from the
original buffer.
(he-line-beg): Removed bug that made point move.
(try-expand-all-abbrevs): Check that abbrev tables exist before use.
(try-expand-dabbrev-visible): New try function.
(he-search-window): New variable used by `try-expand-dabbrev-visible'.
(he-dab-search-regexp): Function removed.
(he-dab-search): Renamed to `he-dabbrev-search'.
(he-dabbrev-search): Find only whole matching symbols.
(he-dabbrev-skip-space): New variable.
(he-dabbrev-beg): Use `he-dabbrev-skip-space'.
(try-expand-dabbrev-from-kill,he-dabbrev-kill-search): New try
function, with requisites.
(try-expand-whole-kill,he-whole-kill-search,he-kill-beg): New try
function, with requisites.
(he-search-loc2): New variable, used by `try-expand-whole-kill'
and `try-expand-dabbrev-from-kill'.
(hippie-expand-try-functions-list): Added the try functions
`try-complete-file-name-partially', `try-expand-dabbrev-from-kill'
and `try-complete-lisp-symbol-partially'.
(Several functions): Adjusted and corrected use of `he-tried-table'.
1995-10-13 15:57:04 +00:00
|
|
|
(setq killstr (car he-expand-list))
|
|
|
|
(setq pos -1))))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defun he-kill-beg ()
|
|
|
|
(let ((op (point)))
|
|
|
|
(save-excursion
|
|
|
|
(skip-syntax-backward "^w_")
|
|
|
|
(if (= (skip-syntax-backward "w_") 0)
|
|
|
|
op
|
|
|
|
(point)))))
|
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
|
|
|
|
(provide 'hippie-exp)
|
1993-01-06 04:35:15 +00:00
|
|
|
|
* hippie-exp.el: Renamed from hippie.el.
Changes from Anders Holst, to bring hippie-expand up to version 1.2:
* hippie-exp.el (hippie-expand-max-buffers): New variable.
(try-expand-line-all-buffers, try-expand-list-all-buffers,
try-expand-dabbrev-all-buffers): Use it.
(try-expand-list, try-expand-list-all-buffers): New functions.
(he-string-beg, he-string-end, he-search-loc): These values are
now markers, not integers. Uses changed.
(he-reset-string, he-substitute-string): Use a marker to preserve
the old position of point.
(try-expand-all-abbrevs): handle case the same way as the
usual expand-abbrev (which is not a very good way, but for
consistency...).
(he-dabbrev-beg): Use `skip-syntax' instead of `skip-chars', to
adjust its behavior to different modes.
(hippie-expand): Don't messages which try function it is using,
when the expansion itself is done in the minibuffer (it was very
annoying to have the message obscuring the expansion).
(try-complete-file-name, try-complete-file-name-partially,
try-complete-lisp-symbol, try-complete-lisp-symbol-partially,
try-expand-line, try-expand-line-all-buffers,
try-expand-all-abbrevs, try-expand-dabbrev,
try-expand-dabbrev-all-buffers): No unnecessary "resetting" of the
epansion, when no expansion is done (caused the buffer to be
marked as changed, although nothing was done, among other things).
(he-reset-string): Undoing of last expansion at a later occasion, now
undoes correctly (before, it garbled things up).
(make-hippie-expand-function): now uses "(function ...)"
instead of "'" (matters for compilation).
(try-expand-line, try-expand-line-all-buffers,
he-line-search-regexp): uses `comint-prompt-regexp' instead of
`shell-prompt-pattern', to strip off prompt in process buffers.
1993-07-18 06:20:15 +00:00
|
|
|
;;; hippie-exp.el ends here
|