2008-04-09 03:34:19 +00:00
|
|
|
;;; minibuffer.el --- Minibuffer completion functions
|
|
|
|
|
2009-01-05 03:18:22 +00:00
|
|
|
;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
|
|
|
|
|
|
|
|
;; 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
|
2008-04-09 03:34:19 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2008-04-09 03:34:19 +00:00
|
|
|
;; 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/>.
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
;; Names with "--" are for functions and variables that are meant to be for
|
|
|
|
;; internal use only.
|
|
|
|
|
|
|
|
;; Functional completion tables have an extended calling conventions:
|
|
|
|
;; - The `action' can be (additionally to nil, t, and lambda) of the form
|
2008-05-23 01:58:15 +00:00
|
|
|
;; (boundaries . SUFFIX) in which case it should return
|
|
|
|
;; (boundaries START . END). See `completion-boundaries'.
|
2008-05-20 17:03:30 +00:00
|
|
|
;; Any other return value should be ignored (so we ignore values returned
|
|
|
|
;; from completion tables that don't know about this new `action' form).
|
|
|
|
|
|
|
|
;;; Bugs:
|
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
;; - completion-all-sorted-completions list all the completions, whereas
|
|
|
|
;; it should only lists the ones that `try-completion' would consider.
|
|
|
|
;; E.g. it should honor completion-ignored-extensions.
|
2008-05-20 17:03:30 +00:00
|
|
|
;; - choose-completion can't automatically figure out the boundaries
|
2009-10-21 20:03:57 +00:00
|
|
|
;; corresponding to the displayed completions because we only
|
|
|
|
;; provide the start info but not the end info in
|
|
|
|
;; completion-base-position.
|
2009-10-26 03:39:15 +00:00
|
|
|
;; - quoting is problematic. E.g. the double-dollar quoting used in
|
|
|
|
;; substitie-in-file-name (and hence read-file-name-internal) bumps
|
|
|
|
;; into various bugs:
|
2009-10-21 20:03:57 +00:00
|
|
|
;; - choose-completion doesn't know how to quote the text it inserts.
|
|
|
|
;; E.g. it fails to double the dollars in file-name completion, or
|
|
|
|
;; to backslash-escape spaces and other chars in comint completion.
|
2009-10-26 03:39:15 +00:00
|
|
|
;; - when completing ~/tmp/fo$$o, the highligting in *Completions*
|
|
|
|
;; is off by one position.
|
|
|
|
;; - all code like PCM which relies on all-completions to match
|
|
|
|
;; its argument gets confused because all-completions returns unquoted
|
|
|
|
;; texts (as desired for *Completions* output).
|
2009-10-21 20:03:57 +00:00
|
|
|
;; - C-x C-f ~/*/sr ? should not list "~/./src".
|
|
|
|
;; - minibuffer-force-complete completes ~/src/emacs/t<!>/lisp/minibuffer.el
|
|
|
|
;; to ~/src/emacs/trunk/ and throws away lisp/minibuffer.el.
|
2008-04-09 19:33:56 +00:00
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
;;; Todo:
|
|
|
|
|
2009-08-30 03:45:30 +00:00
|
|
|
;; - make partial-complete-mode obsolete:
|
|
|
|
;; - (?) <foo.h> style completion for file names.
|
2009-10-21 20:03:57 +00:00
|
|
|
;; This can't be done identically just by tweaking completion,
|
|
|
|
;; because partial-completion-mode's behavior is to expand <string.h>
|
|
|
|
;; to /usr/include/string.h only when exiting the minibuffer, at which
|
|
|
|
;; point the completion code is actually not involved normally.
|
|
|
|
;; Partial-completion-mode does it via a find-file-not-found-function.
|
|
|
|
;; - special code for C-x C-f <> to visit the file ref'd at point
|
|
|
|
;; via (require 'foo) or #include "foo". ffap seems like a better
|
|
|
|
;; place for this feature (supplemented with major-mode-provided
|
|
|
|
;; functions to find the file ref'd at point).
|
|
|
|
|
|
|
|
;; - case-sensitivity currently confuses two issues:
|
2009-08-30 03:45:30 +00:00
|
|
|
;; - whether or not a particular completion table should be case-sensitive
|
2009-10-21 20:03:57 +00:00
|
|
|
;; (i.e. whether strings that differ only by case are semantically
|
2009-08-30 03:45:30 +00:00
|
|
|
;; equivalent)
|
|
|
|
;; - whether the user wants completion to pay attention to case.
|
|
|
|
;; e.g. we may want to make it possible for the user to say "first try
|
|
|
|
;; completion case-sensitively, and if that fails, try to ignore case".
|
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
;; - add support for ** to pcm.
|
2008-04-21 19:02:54 +00:00
|
|
|
;; - Add vc-file-name-completion-table to read-file-name-internal.
|
|
|
|
;; - A feature like completing-help.el.
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
;;; Completion table manipulation
|
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
;; New completion-table operation.
|
2008-05-23 01:58:15 +00:00
|
|
|
(defun completion-boundaries (string table pred suffix)
|
|
|
|
"Return the boundaries of the completions returned by TABLE for STRING.
|
2008-05-20 17:03:30 +00:00
|
|
|
STRING is the string on which completion will be performed.
|
2008-05-23 01:58:15 +00:00
|
|
|
SUFFIX is the string after point.
|
|
|
|
The result is of the form (START . END) where START is the position
|
|
|
|
in STRING of the beginning of the completion field and END is the position
|
|
|
|
in SUFFIX of the end of the completion field.
|
|
|
|
E.g. for simple completion tables, the result is always (0 . (length SUFFIX))
|
|
|
|
and for file names the result is the positions delimited by
|
2008-05-20 17:03:30 +00:00
|
|
|
the closest directory separators."
|
|
|
|
(let ((boundaries (if (functionp table)
|
2008-05-23 01:58:15 +00:00
|
|
|
(funcall table string pred (cons 'boundaries suffix)))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(if (not (eq (car-safe boundaries) 'boundaries))
|
|
|
|
(setq boundaries nil))
|
|
|
|
(cons (or (cadr boundaries) 0)
|
2008-05-23 01:58:15 +00:00
|
|
|
(or (cddr boundaries) (length suffix)))))
|
2008-05-20 17:03:30 +00:00
|
|
|
|
2008-04-13 22:12:02 +00:00
|
|
|
(defun completion--some (fun xs)
|
|
|
|
"Apply FUN to each element of XS in turn.
|
|
|
|
Return the first non-nil returned value.
|
|
|
|
Like CL's `some'."
|
2008-05-20 17:03:30 +00:00
|
|
|
(let ((firsterror nil)
|
|
|
|
res)
|
2008-04-13 22:12:02 +00:00
|
|
|
(while (and (not res) xs)
|
2008-05-20 17:03:30 +00:00
|
|
|
(condition-case err
|
|
|
|
(setq res (funcall fun (pop xs)))
|
|
|
|
(error (unless firsterror (setq firsterror err)) nil)))
|
|
|
|
(or res
|
|
|
|
(if firsterror (signal (car firsterror) (cdr firsterror))))))
|
2008-04-13 22:12:02 +00:00
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
(defun complete-with-action (action table string pred)
|
|
|
|
"Perform completion ACTION.
|
|
|
|
STRING is the string to complete.
|
|
|
|
TABLE is the completion table, which should not be a function.
|
|
|
|
PRED is a completion predicate.
|
|
|
|
ACTION can be one of nil, t or `lambda'."
|
2008-05-20 17:03:30 +00:00
|
|
|
(cond
|
|
|
|
((functionp table) (funcall table string pred action))
|
|
|
|
((eq (car-safe action) 'boundaries)
|
|
|
|
(cons 'boundaries (completion-boundaries string table pred (cdr action))))
|
|
|
|
(t
|
|
|
|
(funcall
|
|
|
|
(cond
|
|
|
|
((null action) 'try-completion)
|
|
|
|
((eq action t) 'all-completions)
|
|
|
|
(t 'test-completion))
|
|
|
|
string table pred))))
|
2008-04-11 22:28:02 +00:00
|
|
|
|
|
|
|
(defun completion-table-dynamic (fun)
|
|
|
|
"Use function FUN as a dynamic completion table.
|
|
|
|
FUN is called with one argument, the string for which completion is required,
|
2008-04-21 00:17:56 +00:00
|
|
|
and it should return an alist containing all the intended possible completions.
|
|
|
|
This alist may be a full list of possible completions so that FUN can ignore
|
|
|
|
the value of its argument. If completion is performed in the minibuffer,
|
|
|
|
FUN will be called in the buffer from which the minibuffer was entered.
|
2008-04-11 22:28:02 +00:00
|
|
|
|
2008-08-19 04:34:54 +00:00
|
|
|
The result of the `completion-table-dynamic' form is a function
|
2008-05-30 19:50:26 +00:00
|
|
|
that can be used as the COLLECTION argument to `try-completion' and
|
2008-04-21 00:17:56 +00:00
|
|
|
`all-completions'. See Info node `(elisp)Programmed Completion'."
|
2008-04-11 22:28:02 +00:00
|
|
|
(lexical-let ((fun fun))
|
|
|
|
(lambda (string pred action)
|
|
|
|
(with-current-buffer (let ((win (minibuffer-selected-window)))
|
|
|
|
(if (window-live-p win) (window-buffer win)
|
|
|
|
(current-buffer)))
|
|
|
|
(complete-with-action action (funcall fun string) string pred)))))
|
|
|
|
|
|
|
|
(defmacro lazy-completion-table (var fun)
|
|
|
|
"Initialize variable VAR as a lazy completion table.
|
|
|
|
If the completion table VAR is used for the first time (e.g., by passing VAR
|
|
|
|
as an argument to `try-completion'), the function FUN is called with no
|
|
|
|
arguments. FUN must return the completion table that will be stored in VAR.
|
|
|
|
If completion is requested in the minibuffer, FUN will be called in the buffer
|
|
|
|
from which the minibuffer was entered. The return value of
|
|
|
|
`lazy-completion-table' must be used to initialize the value of VAR.
|
|
|
|
|
|
|
|
You should give VAR a non-nil `risky-local-variable' property."
|
2008-04-11 23:42:25 +00:00
|
|
|
(declare (debug (symbolp lambda-expr)))
|
2008-04-11 22:28:02 +00:00
|
|
|
(let ((str (make-symbol "string")))
|
|
|
|
`(completion-table-dynamic
|
|
|
|
(lambda (,str)
|
|
|
|
(when (functionp ,var)
|
|
|
|
(setq ,var (,fun)))
|
|
|
|
,var))))
|
|
|
|
|
|
|
|
(defun completion-table-with-context (prefix table string pred action)
|
2008-04-19 03:23:15 +00:00
|
|
|
;; TODO: add `suffix' maybe?
|
2008-05-20 17:03:30 +00:00
|
|
|
;; Notice that `pred' may not be a function in some abusive cases.
|
2008-04-26 01:47:11 +00:00
|
|
|
(when (functionp pred)
|
|
|
|
(setq pred
|
|
|
|
(lexical-let ((pred pred))
|
|
|
|
;; Predicates are called differently depending on the nature of
|
|
|
|
;; the completion table :-(
|
|
|
|
(cond
|
|
|
|
((vectorp table) ;Obarray.
|
|
|
|
(lambda (sym) (funcall pred (concat prefix (symbol-name sym)))))
|
|
|
|
((hash-table-p table)
|
|
|
|
(lambda (s v) (funcall pred (concat prefix s))))
|
|
|
|
((functionp table)
|
|
|
|
(lambda (s) (funcall pred (concat prefix s))))
|
|
|
|
(t ;Lists and alists.
|
|
|
|
(lambda (s)
|
|
|
|
(funcall pred (concat prefix (if (consp s) (car s) s)))))))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(if (eq (car-safe action) 'boundaries)
|
|
|
|
(let* ((len (length prefix))
|
2008-05-23 01:58:15 +00:00
|
|
|
(bound (completion-boundaries string table pred (cdr action))))
|
|
|
|
(list* 'boundaries (+ (car bound) len) (cdr bound)))
|
2008-05-20 17:03:30 +00:00
|
|
|
(let ((comp (complete-with-action action table string pred)))
|
|
|
|
(cond
|
|
|
|
;; In case of try-completion, add the prefix.
|
|
|
|
((stringp comp) (concat prefix comp))
|
|
|
|
(t comp)))))
|
2008-04-11 22:28:02 +00:00
|
|
|
|
|
|
|
(defun completion-table-with-terminator (terminator table string pred action)
|
2009-10-21 20:03:57 +00:00
|
|
|
"Construct a completion table like TABLE but with an extra TERMINATOR.
|
|
|
|
This is meant to be called in a curried way by first passing TERMINATOR
|
|
|
|
and TABLE only (via `apply-partially').
|
|
|
|
TABLE is a completion table, and TERMINATOR is a string appended to TABLE's
|
|
|
|
completion if it is complete. TERMINATOR is also used to determine the
|
2009-10-22 16:14:49 +00:00
|
|
|
completion suffix's boundary.
|
|
|
|
TERMINATOR can also be a cons cell (TERMINATOR . TERMINATOR-REGEXP)
|
|
|
|
in which case TERMINATOR-REGEXP is a regular expression whose submatch
|
|
|
|
number 1 should match TERMINATOR. This is used when there is a need to
|
|
|
|
distinguish occurrences of the TERMINATOR strings which are really terminators
|
|
|
|
from others (e.g. escaped)."
|
2008-04-19 03:23:15 +00:00
|
|
|
(cond
|
2009-10-21 20:03:57 +00:00
|
|
|
((eq (car-safe action) 'boundaries)
|
|
|
|
(let* ((suffix (cdr action))
|
|
|
|
(bounds (completion-boundaries string table pred suffix))
|
2009-10-22 16:14:49 +00:00
|
|
|
(terminator-regexp (if (consp terminator)
|
|
|
|
(cdr terminator) (regexp-quote terminator)))
|
|
|
|
(max (string-match terminator-regexp suffix)))
|
2009-10-21 20:03:57 +00:00
|
|
|
(list* 'boundaries (car bounds)
|
|
|
|
(min (cdr bounds) (or max (length suffix))))))
|
2008-04-19 03:23:15 +00:00
|
|
|
((eq action nil)
|
|
|
|
(let ((comp (try-completion string table pred)))
|
2009-10-22 16:14:49 +00:00
|
|
|
(if (consp terminator) (setq terminator (car terminator)))
|
2008-04-14 15:10:36 +00:00
|
|
|
(if (eq comp t)
|
|
|
|
(concat string terminator)
|
|
|
|
(if (and (stringp comp)
|
2009-10-21 20:03:57 +00:00
|
|
|
;; FIXME: Try to avoid this second call, especially since
|
|
|
|
;; it may be very inefficient (because `comp' made us
|
|
|
|
;; jump to a new boundary, so we complete in that
|
|
|
|
;; boundary with an empty start string).
|
|
|
|
;; completion-boundaries might help.
|
2008-04-19 03:23:15 +00:00
|
|
|
(eq (try-completion comp table pred) t))
|
2008-04-14 15:10:36 +00:00
|
|
|
(concat comp terminator)
|
2008-04-19 03:23:15 +00:00
|
|
|
comp))))
|
2008-05-20 17:03:30 +00:00
|
|
|
((eq action t)
|
|
|
|
;; FIXME: We generally want the `try' and `all' behaviors to be
|
|
|
|
;; consistent so pcm can merge the `all' output to get the `try' output,
|
|
|
|
;; but that sometimes clashes with the need for `all' output to look
|
|
|
|
;; good in *Completions*.
|
2008-12-21 05:20:06 +00:00
|
|
|
;; (mapcar (lambda (s) (concat s terminator))
|
|
|
|
;; (all-completions string table pred))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(all-completions string table pred))
|
2008-04-19 03:23:15 +00:00
|
|
|
;; completion-table-with-terminator is always used for
|
|
|
|
;; "sub-completions" so it's only called if the terminator is missing,
|
|
|
|
;; in which case `test-completion' should return nil.
|
|
|
|
((eq action 'lambda) nil)))
|
|
|
|
|
|
|
|
(defun completion-table-with-predicate (table pred1 strict string pred2 action)
|
|
|
|
"Make a completion table equivalent to TABLE but filtered through PRED1.
|
2008-05-08 03:37:39 +00:00
|
|
|
PRED1 is a function of one argument which returns non-nil if and only if the
|
2008-04-19 03:23:15 +00:00
|
|
|
argument is an element of TABLE which should be considered for completion.
|
|
|
|
STRING, PRED2, and ACTION are the usual arguments to completion tables,
|
|
|
|
as described in `try-completion', `all-completions', and `test-completion'.
|
2008-04-21 19:02:54 +00:00
|
|
|
If STRICT is t, the predicate always applies; if nil it only applies if
|
|
|
|
it does not reduce the set of possible completions to nothing.
|
2008-04-19 03:23:15 +00:00
|
|
|
Note: TABLE needs to be a proper completion table which obeys predicates."
|
|
|
|
(cond
|
|
|
|
((and (not strict) (eq action 'lambda))
|
|
|
|
;; Ignore pred1 since it doesn't really have to apply anyway.
|
2008-04-19 03:34:02 +00:00
|
|
|
(test-completion string table pred2))
|
2008-04-19 03:23:15 +00:00
|
|
|
(t
|
|
|
|
(or (complete-with-action action table string
|
|
|
|
(if (null pred2) pred1
|
|
|
|
(lexical-let ((pred1 pred2) (pred2 pred2))
|
|
|
|
(lambda (x)
|
|
|
|
;; Call `pred1' first, so that `pred2'
|
|
|
|
;; really can't tell that `x' is in table.
|
|
|
|
(if (funcall pred1 x) (funcall pred2 x))))))
|
|
|
|
;; If completion failed and we're not applying pred1 strictly, try
|
|
|
|
;; again without pred1.
|
|
|
|
(and (not strict)
|
|
|
|
(complete-with-action action table string pred2))))))
|
2008-04-11 22:28:02 +00:00
|
|
|
|
2008-04-13 22:12:02 +00:00
|
|
|
(defun completion-table-in-turn (&rest tables)
|
|
|
|
"Create a completion table that tries each table in TABLES in turn."
|
2009-10-21 20:03:57 +00:00
|
|
|
;; FIXME: the boundaries may come from TABLE1 even when the completion list
|
|
|
|
;; is returned by TABLE2 (because TABLE1 returned an empty list).
|
2008-04-13 22:12:02 +00:00
|
|
|
(lexical-let ((tables tables))
|
2008-04-11 22:28:02 +00:00
|
|
|
(lambda (string pred action)
|
2008-04-13 22:12:02 +00:00
|
|
|
(completion--some (lambda (table)
|
|
|
|
(complete-with-action action table string pred))
|
|
|
|
tables))))
|
|
|
|
|
2008-04-19 03:23:15 +00:00
|
|
|
;; (defmacro complete-in-turn (a b) `(completion-table-in-turn ,a ,b))
|
|
|
|
;; (defmacro dynamic-completion-table (fun) `(completion-table-dynamic ,fun))
|
2008-04-13 22:12:02 +00:00
|
|
|
(define-obsolete-function-alias
|
|
|
|
'complete-in-turn 'completion-table-in-turn "23.1")
|
2008-04-19 03:23:15 +00:00
|
|
|
(define-obsolete-function-alias
|
|
|
|
'dynamic-completion-table 'completion-table-dynamic "23.1")
|
2008-04-11 22:28:02 +00:00
|
|
|
|
|
|
|
;;; Minibuffer completion
|
|
|
|
|
2008-04-09 19:33:56 +00:00
|
|
|
(defgroup minibuffer nil
|
|
|
|
"Controlling the behavior of the minibuffer."
|
|
|
|
:link '(custom-manual "(emacs)Minibuffer")
|
|
|
|
:group 'environment)
|
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(defun minibuffer-message (message &rest args)
|
|
|
|
"Temporarily display MESSAGE at the end of the minibuffer.
|
|
|
|
The text is displayed for `minibuffer-message-timeout' seconds,
|
|
|
|
or until the next input event arrives, whichever comes first.
|
|
|
|
Enclose MESSAGE in [...] if this is not yet the case.
|
|
|
|
If ARGS are provided, then pass MESSAGE through `format'."
|
2009-08-30 03:45:30 +00:00
|
|
|
(if (not (minibufferp (current-buffer)))
|
|
|
|
(progn
|
|
|
|
(if args
|
|
|
|
(apply 'message message args)
|
|
|
|
(message "%s" message))
|
|
|
|
(prog1 (sit-for (or minibuffer-message-timeout 1000000))
|
|
|
|
(message nil)))
|
|
|
|
;; Clear out any old echo-area message to make way for our new thing.
|
|
|
|
(message nil)
|
|
|
|
(setq message (if (and (null args) (string-match-p "\\` *\\[.+\\]\\'" message))
|
|
|
|
;; Make sure we can put-text-property.
|
|
|
|
(copy-sequence message)
|
|
|
|
(concat " [" message "]")))
|
|
|
|
(when args (setq message (apply 'format message args)))
|
|
|
|
(let ((ol (make-overlay (point-max) (point-max) nil t t))
|
|
|
|
;; A quit during sit-for normally only interrupts the sit-for,
|
|
|
|
;; but since minibuffer-message is used at the end of a command,
|
|
|
|
;; at a time when the command has virtually finished already, a C-g
|
|
|
|
;; should really cause an abort-recursive-edit instead (i.e. as if
|
|
|
|
;; the C-g had been typed at top-level). Binding inhibit-quit here
|
|
|
|
;; is an attempt to get that behavior.
|
|
|
|
(inhibit-quit t))
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(unless (zerop (length message))
|
|
|
|
;; The current C cursor code doesn't know to use the overlay's
|
|
|
|
;; marker's stickiness to figure out whether to place the cursor
|
|
|
|
;; before or after the string, so let's spoon-feed it the pos.
|
|
|
|
(put-text-property 0 1 'cursor t message))
|
|
|
|
(overlay-put ol 'after-string message)
|
|
|
|
(sit-for (or minibuffer-message-timeout 1000000)))
|
|
|
|
(delete-overlay ol)))))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
(defun minibuffer-completion-contents ()
|
|
|
|
"Return the user input in a minibuffer before point as a string.
|
|
|
|
That is what completion commands operate on."
|
|
|
|
(buffer-substring (field-beginning) (point)))
|
|
|
|
|
|
|
|
(defun delete-minibuffer-contents ()
|
|
|
|
"Delete all user input in a minibuffer.
|
|
|
|
If the current buffer is not a minibuffer, erase its entire contents."
|
2008-10-29 21:30:44 +00:00
|
|
|
;; We used to do `delete-field' here, but when file name shadowing
|
|
|
|
;; is on, the field doesn't cover the entire minibuffer contents.
|
|
|
|
(delete-region (minibuffer-prompt-end) (point-max)))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-04-09 19:33:56 +00:00
|
|
|
(defcustom completion-auto-help t
|
|
|
|
"Non-nil means automatically provide help for invalid completion input.
|
|
|
|
If the value is t the *Completion* buffer is displayed whenever completion
|
|
|
|
is requested but cannot be done.
|
|
|
|
If the value is `lazy', the *Completions* buffer is only displayed after
|
|
|
|
the second failed attempt to complete."
|
2008-04-09 21:18:25 +00:00
|
|
|
:type '(choice (const nil) (const t) (const lazy))
|
2008-04-09 19:33:56 +00:00
|
|
|
:group 'minibuffer)
|
|
|
|
|
2009-11-11 06:36:41 +00:00
|
|
|
(defconst completion-styles-alist
|
2009-09-01 19:49:34 +00:00
|
|
|
'((emacs21
|
|
|
|
completion-emacs21-try-completion completion-emacs21-all-completions
|
|
|
|
"Simple prefix-based completion.")
|
|
|
|
(emacs22
|
|
|
|
completion-emacs22-try-completion completion-emacs22-all-completions
|
|
|
|
"Prefix completion that only operates on the text before point.")
|
|
|
|
(basic
|
|
|
|
completion-basic-try-completion completion-basic-all-completions
|
|
|
|
"Completion of the prefix before point and the suffix after point.")
|
2008-04-26 01:47:11 +00:00
|
|
|
(partial-completion
|
2009-09-01 19:49:34 +00:00
|
|
|
completion-pcm-try-completion completion-pcm-all-completions
|
|
|
|
"Completion of multiple words, each one taken as a prefix.
|
|
|
|
E.g. M-x l-c-h can complete to list-command-history
|
|
|
|
and C-x C-f /u/m/s to /usr/monnier/src.")
|
|
|
|
(initials
|
|
|
|
completion-initials-try-completion completion-initials-all-completions
|
|
|
|
"Completion of acronyms and initialisms.
|
|
|
|
E.g. can complete M-x lch to list-command-history
|
|
|
|
and C-x C-f ~/sew to ~/src/emacs/work."))
|
2008-04-13 22:12:02 +00:00
|
|
|
"List of available completion styles.
|
2009-09-01 19:49:34 +00:00
|
|
|
Each element has the form (NAME TRY-COMPLETION ALL-COMPLETIONS DOC):
|
2008-04-26 12:58:13 +00:00
|
|
|
where NAME is the name that should be used in `completion-styles',
|
2009-09-01 19:49:34 +00:00
|
|
|
TRY-COMPLETION is the function that does the completion (it should
|
|
|
|
follow the same calling convention as `completion-try-completion'),
|
|
|
|
ALL-COMPLETIONS is the function that lists the completions (it should
|
|
|
|
follow the calling convention of `completion-all-completions'),
|
|
|
|
and DOC describes the way this style of completion works.")
|
2008-04-13 22:12:02 +00:00
|
|
|
|
2009-03-15 14:29:12 +00:00
|
|
|
(defcustom completion-styles '(basic partial-completion emacs22)
|
2009-08-18 19:11:41 +00:00
|
|
|
"List of completion styles to use.
|
|
|
|
The available styles are listed in `completion-styles-alist'."
|
2008-04-13 22:12:02 +00:00
|
|
|
:type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
|
|
|
|
completion-styles-alist)))
|
|
|
|
:group 'minibuffer
|
|
|
|
:version "23.1")
|
|
|
|
|
2008-04-23 21:01:31 +00:00
|
|
|
(defun completion-try-completion (string table pred point)
|
|
|
|
"Try to complete STRING using completion table TABLE.
|
|
|
|
Only the elements of table that satisfy predicate PRED are considered.
|
|
|
|
POINT is the position of point within STRING.
|
|
|
|
The return value can be either nil to indicate that there is no completion,
|
|
|
|
t to indicate that STRING is the only possible completion,
|
|
|
|
or a pair (STRING . NEWPOINT) of the completed result string together with
|
|
|
|
a new position for point."
|
2009-09-01 19:49:34 +00:00
|
|
|
(completion--some (lambda (style)
|
|
|
|
(funcall (nth 1 (assq style completion-styles-alist))
|
|
|
|
string table pred point))
|
|
|
|
completion-styles))
|
2008-04-13 22:12:02 +00:00
|
|
|
|
2008-04-23 21:01:31 +00:00
|
|
|
(defun completion-all-completions (string table pred point)
|
|
|
|
"List the possible completions of STRING in completion table TABLE.
|
|
|
|
Only the elements of table that satisfy predicate PRED are considered.
|
|
|
|
POINT is the position of point within STRING.
|
2008-04-26 12:58:13 +00:00
|
|
|
The return value is a list of completions and may contain the base-size
|
2008-04-23 21:01:31 +00:00
|
|
|
in the last `cdr'."
|
2009-08-30 03:45:30 +00:00
|
|
|
;; FIXME: We need to additionally return completion-extra-size (similar
|
|
|
|
;; to completion-base-size but for the text after point).
|
2009-09-01 19:49:34 +00:00
|
|
|
(completion--some (lambda (style)
|
|
|
|
(funcall (nth 2 (assq style completion-styles-alist))
|
|
|
|
string table pred point))
|
|
|
|
completion-styles))
|
2008-04-13 22:12:02 +00:00
|
|
|
|
2008-04-09 19:33:56 +00:00
|
|
|
(defun minibuffer--bitset (modified completions exact)
|
|
|
|
(logior (if modified 4 0)
|
|
|
|
(if completions 2 0)
|
|
|
|
(if exact 1 0)))
|
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
(defun completion--do-completion (&optional try-completion-function)
|
2008-04-09 03:34:19 +00:00
|
|
|
"Do the completion and return a summary of what happened.
|
2008-04-09 19:33:56 +00:00
|
|
|
M = completion was performed, the text was Modified.
|
|
|
|
C = there were available Completions.
|
|
|
|
E = after completion we now have an Exact match.
|
|
|
|
|
|
|
|
MCE
|
|
|
|
000 0 no possible completion
|
|
|
|
001 1 was already an exact and unique completion
|
|
|
|
010 2 no completion happened
|
|
|
|
011 3 was already an exact completion
|
|
|
|
100 4 ??? impossible
|
|
|
|
101 5 ??? impossible
|
|
|
|
110 6 some completion happened
|
|
|
|
111 7 completed to an exact completion"
|
|
|
|
(let* ((beg (field-beginning))
|
2008-04-23 21:01:31 +00:00
|
|
|
(end (field-end))
|
2008-04-21 19:02:54 +00:00
|
|
|
(string (buffer-substring beg end))
|
2008-04-23 21:01:31 +00:00
|
|
|
(comp (funcall (or try-completion-function
|
|
|
|
'completion-try-completion)
|
|
|
|
string
|
|
|
|
minibuffer-completion-table
|
|
|
|
minibuffer-completion-predicate
|
|
|
|
(- (point) beg))))
|
2008-04-09 03:34:19 +00:00
|
|
|
(cond
|
2008-04-23 21:01:31 +00:00
|
|
|
((null comp)
|
2009-08-19 02:15:19 +00:00
|
|
|
(minibuffer-hide-completions)
|
2008-04-09 19:33:56 +00:00
|
|
|
(ding) (minibuffer-message "No match") (minibuffer--bitset nil nil nil))
|
2009-08-18 19:11:41 +00:00
|
|
|
((eq t comp)
|
2009-08-19 02:15:19 +00:00
|
|
|
(minibuffer-hide-completions)
|
2009-08-18 19:11:41 +00:00
|
|
|
(goto-char (field-end))
|
|
|
|
(minibuffer--bitset nil nil t)) ;Exact and unique match.
|
2008-04-09 03:34:19 +00:00
|
|
|
(t
|
|
|
|
;; `completed' should be t if some completion was done, which doesn't
|
|
|
|
;; include simply changing the case of the entered string. However,
|
|
|
|
;; for appearance, the string is rewritten if the case changes.
|
2008-04-23 21:01:31 +00:00
|
|
|
(let* ((comp-pos (cdr comp))
|
|
|
|
(completion (car comp))
|
|
|
|
(completed (not (eq t (compare-strings completion nil nil
|
|
|
|
string nil nil t))))
|
2008-04-21 19:02:54 +00:00
|
|
|
(unchanged (eq t (compare-strings completion nil nil
|
|
|
|
string nil nil nil))))
|
2008-04-09 03:34:19 +00:00
|
|
|
(unless unchanged
|
2008-04-09 19:33:56 +00:00
|
|
|
|
|
|
|
;; Insert in minibuffer the chars we got.
|
2008-04-21 19:02:54 +00:00
|
|
|
(goto-char end)
|
|
|
|
(insert completion)
|
2008-04-30 03:41:39 +00:00
|
|
|
(delete-region beg end))
|
|
|
|
;; Move point.
|
|
|
|
(goto-char (+ beg comp-pos))
|
2008-04-09 19:33:56 +00:00
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(if (not (or unchanged completed))
|
|
|
|
;; The case of the string changed, but that's all. We're not sure
|
|
|
|
;; whether this is a unique completion or not, so try again using
|
|
|
|
;; the real case (this shouldn't recurse again, because the next
|
|
|
|
;; time try-completion will return either t or the exact string).
|
2008-04-21 19:02:54 +00:00
|
|
|
(completion--do-completion try-completion-function)
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
;; It did find a match. Do we match some possibility exactly now?
|
2008-04-23 21:01:31 +00:00
|
|
|
(let ((exact (test-completion completion
|
2008-04-09 03:34:19 +00:00
|
|
|
minibuffer-completion-table
|
|
|
|
minibuffer-completion-predicate)))
|
2009-08-19 02:15:19 +00:00
|
|
|
(if completed
|
|
|
|
;; We could also decide to refresh the completions,
|
|
|
|
;; if they're displayed (and assuming there are
|
|
|
|
;; completions left).
|
|
|
|
(minibuffer-hide-completions)
|
2008-04-09 19:33:56 +00:00
|
|
|
;; Show the completion table, if requested.
|
|
|
|
(cond
|
|
|
|
((not exact)
|
|
|
|
(if (case completion-auto-help
|
|
|
|
(lazy (eq this-command last-command))
|
|
|
|
(t completion-auto-help))
|
|
|
|
(minibuffer-completion-help)
|
|
|
|
(minibuffer-message "Next char not unique")))
|
2009-08-19 02:15:19 +00:00
|
|
|
;; If the last exact completion and this one were the same, it
|
|
|
|
;; means we've already given a "Next char not unique" message
|
|
|
|
;; and the user's hit TAB again, so now we give him help.
|
2008-04-09 19:33:56 +00:00
|
|
|
((eq this-command last-command)
|
|
|
|
(if completion-auto-help (minibuffer-completion-help)))))
|
|
|
|
|
|
|
|
(minibuffer--bitset completed t exact))))))))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
(defun minibuffer-complete ()
|
|
|
|
"Complete the minibuffer contents as far as possible.
|
|
|
|
Return nil if there is no valid completion, else t.
|
|
|
|
If no characters can be completed, display a list of possible completions.
|
|
|
|
If you repeat this command after it displayed such a list,
|
|
|
|
scroll the window of possible completions."
|
|
|
|
(interactive)
|
|
|
|
;; If the previous command was not this,
|
|
|
|
;; mark the completion buffer obsolete.
|
|
|
|
(unless (eq this-command last-command)
|
|
|
|
(setq minibuffer-scroll-window nil))
|
|
|
|
|
|
|
|
(let ((window minibuffer-scroll-window))
|
|
|
|
;; If there's a fresh completion window with a live buffer,
|
|
|
|
;; and this command is repeated, scroll that window.
|
|
|
|
(if (window-live-p window)
|
|
|
|
(with-current-buffer (window-buffer window)
|
|
|
|
(if (pos-visible-in-window-p (point-max) window)
|
|
|
|
;; If end is in view, scroll up to the beginning.
|
|
|
|
(set-window-start window (point-min) nil)
|
|
|
|
;; Else scroll down one screen.
|
|
|
|
(scroll-other-window))
|
|
|
|
nil)
|
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
(case (completion--do-completion)
|
2008-05-20 17:03:30 +00:00
|
|
|
(#b000 nil)
|
2009-08-18 19:11:41 +00:00
|
|
|
(#b001 (minibuffer-message "Sole completion")
|
2008-05-20 17:03:30 +00:00
|
|
|
t)
|
2009-08-18 19:11:41 +00:00
|
|
|
(#b011 (minibuffer-message "Complete, but not unique")
|
2008-05-20 17:03:30 +00:00
|
|
|
t)
|
|
|
|
(t t)))))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-05-21 20:52:44 +00:00
|
|
|
(defvar completion-all-sorted-completions nil)
|
|
|
|
(make-variable-buffer-local 'completion-all-sorted-completions)
|
|
|
|
|
|
|
|
(defun completion--flush-all-sorted-completions (&rest ignore)
|
|
|
|
(setq completion-all-sorted-completions nil))
|
|
|
|
|
|
|
|
(defun completion-all-sorted-completions ()
|
|
|
|
(or completion-all-sorted-completions
|
|
|
|
(let* ((start (field-beginning))
|
|
|
|
(end (field-end))
|
|
|
|
(all (completion-all-completions (buffer-substring start end)
|
|
|
|
minibuffer-completion-table
|
|
|
|
minibuffer-completion-predicate
|
|
|
|
(- (point) start)))
|
|
|
|
(last (last all))
|
|
|
|
(base-size (or (cdr last) 0)))
|
|
|
|
(when last
|
|
|
|
(setcdr last nil)
|
|
|
|
;; Prefer shorter completions.
|
|
|
|
(setq all (sort all (lambda (c1 c2) (< (length c1) (length c2)))))
|
|
|
|
;; Prefer recently used completions.
|
|
|
|
(let ((hist (symbol-value minibuffer-history-variable)))
|
|
|
|
(setq all (sort all (lambda (c1 c2)
|
|
|
|
(> (length (member c1 hist))
|
|
|
|
(length (member c2 hist)))))))
|
|
|
|
;; Cache the result. This is not just for speed, but also so that
|
|
|
|
;; repeated calls to minibuffer-force-complete can cycle through
|
|
|
|
;; all possibilities.
|
|
|
|
(add-hook 'after-change-functions
|
|
|
|
'completion--flush-all-sorted-completions nil t)
|
|
|
|
(setq completion-all-sorted-completions
|
|
|
|
(nconc all base-size))))))
|
|
|
|
|
|
|
|
(defun minibuffer-force-complete ()
|
|
|
|
"Complete the minibuffer to an exact match.
|
|
|
|
Repeated uses step through the possible completions."
|
|
|
|
(interactive)
|
|
|
|
;; FIXME: Need to deal with the extra-size issue here as well.
|
2009-10-21 20:03:57 +00:00
|
|
|
;; FIXME: ~/src/emacs/t<M-TAB>/lisp/minibuffer.el completes to
|
|
|
|
;; ~/src/emacs/trunk/ and throws away lisp/minibuffer.el.
|
2008-05-21 20:52:44 +00:00
|
|
|
(let* ((start (field-beginning))
|
|
|
|
(end (field-end))
|
|
|
|
(all (completion-all-sorted-completions)))
|
|
|
|
(if (not (consp all))
|
|
|
|
(minibuffer-message (if all "No more completions" "No completions"))
|
|
|
|
(goto-char end)
|
|
|
|
(insert (car all))
|
|
|
|
(delete-region (+ start (cdr (last all))) end)
|
|
|
|
;; If completing file names, (car all) may be a directory, so we'd now
|
|
|
|
;; have a new set of possible completions and might want to reset
|
|
|
|
;; completion-all-sorted-completions to nil, but we prefer not to,
|
|
|
|
;; so that repeated calls minibuffer-force-complete still cycle
|
|
|
|
;; through the previous possible completions.
|
2009-09-24 02:37:37 +00:00
|
|
|
(let ((last (last all)))
|
|
|
|
(setcdr last (cons (car all) (cdr last)))
|
|
|
|
(setq completion-all-sorted-completions (cdr all))))))
|
2008-05-21 20:52:44 +00:00
|
|
|
|
2008-11-29 18:07:15 +00:00
|
|
|
(defvar minibuffer-confirm-exit-commands
|
2008-11-29 21:41:30 +00:00
|
|
|
'(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
|
2008-11-29 18:07:15 +00:00
|
|
|
"A list of commands which cause an immediately following
|
|
|
|
`minibuffer-complete-and-exit' to ask for extra confirmation.")
|
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(defun minibuffer-complete-and-exit ()
|
2008-11-24 19:14:05 +00:00
|
|
|
"Exit if the minibuffer contains a valid completion.
|
|
|
|
Otherwise, try to complete the minibuffer contents. If
|
|
|
|
completion leads to a valid completion, a repetition of this
|
|
|
|
command will exit.
|
|
|
|
|
|
|
|
If `minibuffer-completion-confirm' is `confirm', do not try to
|
|
|
|
complete; instead, ask for confirmation and accept any input if
|
|
|
|
confirmed.
|
|
|
|
If `minibuffer-completion-confirm' is `confirm-after-completion',
|
|
|
|
do not try to complete; instead, ask for confirmation if the
|
2009-03-17 04:39:09 +00:00
|
|
|
preceding minibuffer command was a member of
|
|
|
|
`minibuffer-confirm-exit-commands', and accept the input
|
|
|
|
otherwise."
|
2008-04-09 03:34:19 +00:00
|
|
|
(interactive)
|
2008-04-21 19:02:54 +00:00
|
|
|
(let ((beg (field-beginning))
|
|
|
|
(end (field-end)))
|
|
|
|
(cond
|
|
|
|
;; Allow user to specify null string
|
|
|
|
((= beg end) (exit-minibuffer))
|
|
|
|
((test-completion (buffer-substring beg end)
|
|
|
|
minibuffer-completion-table
|
|
|
|
minibuffer-completion-predicate)
|
|
|
|
(when completion-ignore-case
|
|
|
|
;; Fixup case of the field, if necessary.
|
2008-04-22 10:20:05 +00:00
|
|
|
(let* ((string (buffer-substring beg end))
|
2008-04-21 19:02:54 +00:00
|
|
|
(compl (try-completion
|
|
|
|
string
|
|
|
|
minibuffer-completion-table
|
|
|
|
minibuffer-completion-predicate)))
|
|
|
|
(when (and (stringp compl)
|
|
|
|
;; If it weren't for this piece of paranoia, I'd replace
|
|
|
|
;; the whole thing with a call to do-completion.
|
2008-06-10 22:01:59 +00:00
|
|
|
;; This is important, e.g. when the current minibuffer's
|
|
|
|
;; content is a directory which only contains a single
|
|
|
|
;; file, so `try-completion' actually completes to
|
|
|
|
;; that file.
|
2008-04-21 19:02:54 +00:00
|
|
|
(= (length string) (length compl)))
|
2008-04-09 03:34:19 +00:00
|
|
|
(goto-char end)
|
|
|
|
(insert compl)
|
2008-04-21 19:02:54 +00:00
|
|
|
(delete-region beg end))))
|
|
|
|
(exit-minibuffer))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-11-24 19:14:05 +00:00
|
|
|
((eq minibuffer-completion-confirm 'confirm)
|
2008-04-21 19:02:54 +00:00
|
|
|
;; The user is permitted to exit with an input that's rejected
|
2008-11-24 19:14:05 +00:00
|
|
|
;; by test-completion, after confirming her choice.
|
2008-04-21 19:02:54 +00:00
|
|
|
(if (eq last-command this-command)
|
|
|
|
(exit-minibuffer)
|
|
|
|
(minibuffer-message "Confirm")
|
|
|
|
nil))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-11-24 19:14:05 +00:00
|
|
|
((eq minibuffer-completion-confirm 'confirm-after-completion)
|
|
|
|
;; Similar to the above, but only if trying to exit immediately
|
|
|
|
;; after typing TAB (this catches most minibuffer typos).
|
2008-11-29 18:07:15 +00:00
|
|
|
(if (memq last-command minibuffer-confirm-exit-commands)
|
2008-11-24 19:14:05 +00:00
|
|
|
(progn (minibuffer-message "Confirm")
|
|
|
|
nil)
|
|
|
|
(exit-minibuffer)))
|
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
(t
|
|
|
|
;; Call do-completion, but ignore errors.
|
|
|
|
(case (condition-case nil
|
|
|
|
(completion--do-completion)
|
|
|
|
(error 1))
|
2008-05-20 17:03:30 +00:00
|
|
|
((#b001 #b011) (exit-minibuffer))
|
|
|
|
(#b111 (if (not minibuffer-completion-confirm)
|
|
|
|
(exit-minibuffer)
|
|
|
|
(minibuffer-message "Confirm")
|
|
|
|
nil))
|
2008-04-21 19:02:54 +00:00
|
|
|
(t nil))))))
|
|
|
|
|
2008-04-23 21:01:31 +00:00
|
|
|
(defun completion--try-word-completion (string table predicate point)
|
|
|
|
(let ((comp (completion-try-completion string table predicate point)))
|
|
|
|
(if (not (consp comp))
|
|
|
|
comp
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
;; If completion finds next char not unique,
|
|
|
|
;; consider adding a space or a hyphen.
|
2008-04-23 21:01:31 +00:00
|
|
|
(when (= (length string) (length (car comp)))
|
2009-04-14 02:02:30 +00:00
|
|
|
;; Mark the added char with the `completion-word' property, so it
|
|
|
|
;; can be handled specially by completion styles such as
|
|
|
|
;; partial-completion.
|
|
|
|
;; We used to remove `partial-completion' from completion-styles
|
|
|
|
;; instead, but it was too blunt, leading to situations where SPC
|
|
|
|
;; was the only insertable char at point but minibuffer-complete-word
|
|
|
|
;; refused inserting it.
|
|
|
|
(let ((exts (mapcar (lambda (str) (propertize str 'completion-try-word t))
|
|
|
|
'(" " "-")))
|
2008-04-23 21:01:31 +00:00
|
|
|
(before (substring string 0 point))
|
|
|
|
(after (substring string point))
|
|
|
|
tem)
|
|
|
|
(while (and exts (not (consp tem)))
|
2008-04-21 19:02:54 +00:00
|
|
|
(setq tem (completion-try-completion
|
2008-04-23 21:01:31 +00:00
|
|
|
(concat before (pop exts) after)
|
|
|
|
table predicate (1+ point))))
|
|
|
|
(if (consp tem) (setq comp tem))))
|
2008-04-21 19:02:54 +00:00
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
;; Completing a single word is actually more difficult than completing
|
|
|
|
;; as much as possible, because we first have to find the "current
|
|
|
|
;; position" in `completion' in order to find the end of the word
|
|
|
|
;; we're completing. Normally, `string' is a prefix of `completion',
|
|
|
|
;; which makes it trivial to find the position, but with fancier
|
|
|
|
;; completion (plus env-var expansion, ...) `completion' might not
|
|
|
|
;; look anything like `string' at all.
|
2008-04-23 21:01:31 +00:00
|
|
|
(let* ((comppoint (cdr comp))
|
|
|
|
(completion (car comp))
|
|
|
|
(before (substring string 0 point))
|
|
|
|
(combined (concat before "\n" completion)))
|
|
|
|
;; Find in completion the longest text that was right before point.
|
|
|
|
(when (string-match "\\(.+\\)\n.*?\\1" combined)
|
|
|
|
(let* ((prefix (match-string 1 before))
|
|
|
|
;; We used non-greedy match to make `rem' as long as possible.
|
|
|
|
(rem (substring combined (match-end 0)))
|
|
|
|
;; Find in the remainder of completion the longest text
|
|
|
|
;; that was right after point.
|
|
|
|
(after (substring string point))
|
|
|
|
(suffix (if (string-match "\\`\\(.+\\).*\n.*\\1"
|
|
|
|
(concat after "\n" rem))
|
|
|
|
(match-string 1 after))))
|
|
|
|
;; The general idea is to try and guess what text was inserted
|
|
|
|
;; at point by the completion. Problem is: if we guess wrong,
|
|
|
|
;; we may end up treating as "added by completion" text that was
|
|
|
|
;; actually painfully typed by the user. So if we then cut
|
|
|
|
;; after the first word, we may throw away things the
|
|
|
|
;; user wrote. So let's try to be as conservative as possible:
|
|
|
|
;; only cut after the first word, if we're reasonably sure that
|
|
|
|
;; our guess is correct.
|
|
|
|
;; Note: a quick survey on emacs-devel seemed to indicate that
|
|
|
|
;; nobody actually cares about the "word-at-a-time" feature of
|
|
|
|
;; minibuffer-complete-word, whose real raison-d'être is that it
|
|
|
|
;; tries to add "-" or " ". One more reason to only cut after
|
|
|
|
;; the first word, if we're really sure we're right.
|
|
|
|
(when (and (or suffix (zerop (length after)))
|
|
|
|
(string-match (concat
|
|
|
|
;; Make submatch 1 as small as possible
|
|
|
|
;; to reduce the risk of cutting
|
|
|
|
;; valuable text.
|
|
|
|
".*" (regexp-quote prefix) "\\(.*?\\)"
|
|
|
|
(if suffix (regexp-quote suffix) "\\'"))
|
|
|
|
completion)
|
|
|
|
;; The new point in `completion' should also be just
|
|
|
|
;; before the suffix, otherwise something more complex
|
|
|
|
;; is going on, and we're not sure where we are.
|
|
|
|
(eq (match-end 1) comppoint)
|
|
|
|
;; (match-beginning 1)..comppoint is now the stretch
|
|
|
|
;; of text in `completion' that was completed at point.
|
|
|
|
(string-match "\\W" completion (match-beginning 1))
|
|
|
|
;; Is there really something to cut?
|
|
|
|
(> comppoint (match-end 0)))
|
|
|
|
;; Cut after the first word.
|
|
|
|
(let ((cutpos (match-end 0)))
|
|
|
|
(setq completion (concat (substring completion 0 cutpos)
|
|
|
|
(substring completion comppoint)))
|
|
|
|
(setq comppoint cutpos)))))
|
|
|
|
|
|
|
|
(cons completion comppoint)))))
|
2008-04-09 19:33:56 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun minibuffer-complete-word ()
|
|
|
|
"Complete the minibuffer contents at most a single word.
|
|
|
|
After one word is completed as much as possible, a space or hyphen
|
|
|
|
is added, provided that matches some possible completion.
|
|
|
|
Return nil if there is no valid completion, else t."
|
|
|
|
(interactive)
|
2008-04-21 19:02:54 +00:00
|
|
|
(case (completion--do-completion 'completion--try-word-completion)
|
2008-05-20 17:03:30 +00:00
|
|
|
(#b000 nil)
|
2009-08-18 19:11:41 +00:00
|
|
|
(#b001 (minibuffer-message "Sole completion")
|
2008-05-20 17:03:30 +00:00
|
|
|
t)
|
2009-08-18 19:11:41 +00:00
|
|
|
(#b011 (minibuffer-message "Complete, but not unique")
|
2008-05-20 17:03:30 +00:00
|
|
|
t)
|
|
|
|
(t t)))
|
2008-04-09 19:33:56 +00:00
|
|
|
|
2009-08-19 02:15:19 +00:00
|
|
|
(defface completions-annotations '((t :inherit italic))
|
|
|
|
"Face to use for annotations in the *Completions* buffer.")
|
|
|
|
|
2008-04-21 19:02:54 +00:00
|
|
|
(defun completion--insert-strings (strings)
|
2008-04-09 03:34:19 +00:00
|
|
|
"Insert a list of STRINGS into the current buffer.
|
|
|
|
Uses columns to keep the listing readable but compact.
|
|
|
|
It also eliminates runs of equal strings."
|
|
|
|
(when (consp strings)
|
|
|
|
(let* ((length (apply 'max
|
|
|
|
(mapcar (lambda (s)
|
|
|
|
(if (consp s)
|
2008-05-02 17:32:51 +00:00
|
|
|
(+ (string-width (car s))
|
|
|
|
(string-width (cadr s)))
|
|
|
|
(string-width s)))
|
2008-04-09 03:34:19 +00:00
|
|
|
strings)))
|
|
|
|
(window (get-buffer-window (current-buffer) 0))
|
|
|
|
(wwidth (if window (1- (window-width window)) 79))
|
|
|
|
(columns (min
|
|
|
|
;; At least 2 columns; at least 2 spaces between columns.
|
|
|
|
(max 2 (/ wwidth (+ 2 length)))
|
|
|
|
;; Don't allocate more columns than we can fill.
|
|
|
|
;; Windows can't show less than 3 lines anyway.
|
|
|
|
(max 1 (/ (length strings) 2))))
|
|
|
|
(colwidth (/ wwidth columns))
|
|
|
|
(column 0)
|
|
|
|
(laststring nil))
|
|
|
|
;; The insertion should be "sensible" no matter what choices were made
|
|
|
|
;; for the parameters above.
|
|
|
|
(dolist (str strings)
|
2009-01-21 21:20:55 +00:00
|
|
|
(unless (equal laststring str) ; Remove (consecutive) duplicates.
|
2008-04-09 03:34:19 +00:00
|
|
|
(setq laststring str)
|
2009-01-21 21:20:55 +00:00
|
|
|
(let ((length (if (consp str)
|
|
|
|
(+ (string-width (car str))
|
|
|
|
(string-width (cadr str)))
|
|
|
|
(string-width str))))
|
|
|
|
(unless (bolp)
|
|
|
|
(if (< wwidth (+ (max colwidth length) column))
|
|
|
|
;; No space for `str' at point, move to next line.
|
|
|
|
(progn (insert "\n") (setq column 0))
|
|
|
|
(insert " \t")
|
|
|
|
;; Leave the space unpropertized so that in the case we're
|
|
|
|
;; already past the goal column, there is still
|
|
|
|
;; a space displayed.
|
|
|
|
(set-text-properties (- (point) 1) (point)
|
|
|
|
;; We can't just set tab-width, because
|
|
|
|
;; completion-setup-function will kill all
|
|
|
|
;; local variables :-(
|
|
|
|
`(display (space :align-to ,column)))
|
|
|
|
nil))
|
|
|
|
(if (not (consp str))
|
|
|
|
(put-text-property (point) (progn (insert str) (point))
|
|
|
|
'mouse-face 'highlight)
|
|
|
|
(put-text-property (point) (progn (insert (car str)) (point))
|
|
|
|
'mouse-face 'highlight)
|
2009-08-19 02:15:19 +00:00
|
|
|
(add-text-properties (point) (progn (insert (cadr str)) (point))
|
|
|
|
'(mouse-face nil
|
|
|
|
face completions-annotations)))
|
2009-01-21 21:20:55 +00:00
|
|
|
;; Next column to align to.
|
|
|
|
(setq column (+ column
|
|
|
|
;; Round up to a whole number of columns.
|
|
|
|
(* colwidth (ceiling length colwidth))))))))))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-04-29 05:36:55 +00:00
|
|
|
(defvar completion-common-substring nil)
|
|
|
|
(make-obsolete-variable 'completion-common-substring nil "23.1")
|
2008-04-09 03:34:19 +00:00
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
(defvar completion-setup-hook nil
|
|
|
|
"Normal hook run at the end of setting up a completion list buffer.
|
|
|
|
When this hook is run, the current buffer is the one in which the
|
|
|
|
command to display the completion list buffer was run.
|
|
|
|
The completion list buffer is available as the value of `standard-output'.
|
2008-04-29 05:36:55 +00:00
|
|
|
See also `display-completion-list'.")
|
|
|
|
|
|
|
|
(defface completions-first-difference
|
|
|
|
'((t (:inherit bold)))
|
|
|
|
"Face put on the first uncommon character in completions in *Completions* buffer."
|
|
|
|
:group 'completion)
|
|
|
|
|
|
|
|
(defface completions-common-part
|
|
|
|
'((t (:inherit default)))
|
|
|
|
"Face put on the common prefix substring in completions in *Completions* buffer.
|
|
|
|
The idea of `completions-common-part' is that you can use it to
|
|
|
|
make the common parts less visible than normal, so that the rest
|
|
|
|
of the differing parts is, by contrast, slightly highlighted."
|
|
|
|
:group 'completion)
|
|
|
|
|
2008-12-21 05:20:06 +00:00
|
|
|
(defun completion-hilit-commonality (completions prefix-len base-size)
|
2008-04-29 05:36:55 +00:00
|
|
|
(when completions
|
2008-12-21 05:20:06 +00:00
|
|
|
(let ((com-str-len (- prefix-len (or base-size 0))))
|
2008-04-29 05:36:55 +00:00
|
|
|
(nconc
|
|
|
|
(mapcar
|
2008-05-02 17:02:52 +00:00
|
|
|
(lambda (elem)
|
|
|
|
(let ((str
|
|
|
|
;; Don't modify the string itself, but a copy, since the
|
|
|
|
;; the string may be read-only or used for other purposes.
|
|
|
|
;; Furthermore, since `completions' may come from
|
|
|
|
;; display-completion-list, `elem' may be a list.
|
|
|
|
(if (consp elem)
|
|
|
|
(car (setq elem (cons (copy-sequence (car elem))
|
|
|
|
(cdr elem))))
|
|
|
|
(setq elem (copy-sequence elem)))))
|
2009-01-06 04:17:04 +00:00
|
|
|
(put-text-property 0
|
|
|
|
;; If completion-boundaries returns incorrect
|
|
|
|
;; values, all-completions may return strings
|
|
|
|
;; that don't contain the prefix.
|
|
|
|
(min com-str-len (length str))
|
2008-05-02 17:02:52 +00:00
|
|
|
'font-lock-face 'completions-common-part
|
|
|
|
str)
|
|
|
|
(if (> (length str) com-str-len)
|
|
|
|
(put-text-property com-str-len (1+ com-str-len)
|
|
|
|
'font-lock-face 'completions-first-difference
|
|
|
|
str)))
|
|
|
|
elem)
|
2008-04-29 05:36:55 +00:00
|
|
|
completions)
|
|
|
|
base-size))))
|
2008-04-11 22:28:02 +00:00
|
|
|
|
2008-08-15 00:10:03 +00:00
|
|
|
(defun display-completion-list (completions &optional common-substring)
|
2008-04-09 03:34:19 +00:00
|
|
|
"Display the list of completions, COMPLETIONS, using `standard-output'.
|
|
|
|
Each element may be just a symbol or string
|
|
|
|
or may be a list of two strings to be printed as if concatenated.
|
|
|
|
If it is a list of two strings, the first is the actual completion
|
|
|
|
alternative, the second serves as annotation.
|
|
|
|
`standard-output' must be a buffer.
|
|
|
|
The actual completion alternatives, as inserted, are given `mouse-face'
|
|
|
|
properties of `highlight'.
|
|
|
|
At the end, this runs the normal hook `completion-setup-hook'.
|
|
|
|
It can find the completion buffer in `standard-output'.
|
2008-08-14 23:44:41 +00:00
|
|
|
|
2008-08-18 19:59:38 +00:00
|
|
|
The obsolete optional arg COMMON-SUBSTRING, if non-nil, should be a string
|
2008-08-14 23:44:41 +00:00
|
|
|
specifying a common substring for adding the faces
|
|
|
|
`completions-first-difference' and `completions-common-part' to
|
2008-08-15 00:10:03 +00:00
|
|
|
the completions buffer."
|
2008-04-29 05:36:55 +00:00
|
|
|
(if common-substring
|
|
|
|
(setq completions (completion-hilit-commonality
|
2008-12-21 05:20:06 +00:00
|
|
|
completions (length common-substring)
|
|
|
|
;; We don't know the base-size.
|
|
|
|
nil)))
|
2008-04-09 03:34:19 +00:00
|
|
|
(if (not (bufferp standard-output))
|
|
|
|
;; This *never* (ever) happens, so there's no point trying to be clever.
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((standard-output (current-buffer))
|
|
|
|
(completion-setup-hook nil))
|
2008-08-15 00:10:03 +00:00
|
|
|
(display-completion-list completions common-substring))
|
2008-04-09 03:34:19 +00:00
|
|
|
(princ (buffer-string)))
|
|
|
|
|
2009-10-15 01:50:17 +00:00
|
|
|
(with-current-buffer standard-output
|
|
|
|
(goto-char (point-max))
|
|
|
|
(if (null completions)
|
|
|
|
(insert "There are no possible completions of what you have typed.")
|
|
|
|
(insert "Possible completions are:\n")
|
|
|
|
(completion--insert-strings completions))))
|
2008-04-13 22:12:02 +00:00
|
|
|
|
2008-04-29 05:36:55 +00:00
|
|
|
;; The hilit used to be applied via completion-setup-hook, so there
|
|
|
|
;; may still be some code that uses completion-common-substring.
|
2008-08-14 23:44:41 +00:00
|
|
|
(with-no-warnings
|
|
|
|
(let ((completion-common-substring common-substring))
|
|
|
|
(run-hooks 'completion-setup-hook)))
|
2008-04-09 03:34:19 +00:00
|
|
|
nil)
|
|
|
|
|
2009-08-30 03:45:30 +00:00
|
|
|
(defvar completion-annotate-function
|
|
|
|
nil
|
|
|
|
;; Note: there's a lot of scope as for when to add annotations and
|
|
|
|
;; what annotations to add. E.g. completing-help.el allowed adding
|
|
|
|
;; the first line of docstrings to M-x completion. But there's
|
|
|
|
;; a tension, since such annotations, while useful at times, can
|
|
|
|
;; actually drown the useful information.
|
|
|
|
;; So completion-annotate-function should be used parsimoniously, or
|
|
|
|
;; else only used upon a user's request (e.g. we could add a command
|
|
|
|
;; to completion-list-mode to add annotations to the current
|
|
|
|
;; completions).
|
|
|
|
"Function to add annotations in the *Completions* buffer.
|
|
|
|
The function takes a completion and should either return nil, or a string that
|
|
|
|
will be displayed next to the completion. The function can access the
|
|
|
|
completion table and predicates via `minibuffer-completion-table' and related
|
|
|
|
variables.")
|
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(defun minibuffer-completion-help ()
|
|
|
|
"Display a list of possible completions of the current minibuffer contents."
|
|
|
|
(interactive)
|
|
|
|
(message "Making completion list...")
|
2009-10-15 01:50:17 +00:00
|
|
|
(let* ((start (field-beginning))
|
|
|
|
(string (field-string))
|
2008-04-21 19:02:54 +00:00
|
|
|
(completions (completion-all-completions
|
2008-04-09 03:34:19 +00:00
|
|
|
string
|
|
|
|
minibuffer-completion-table
|
2008-04-23 21:01:31 +00:00
|
|
|
minibuffer-completion-predicate
|
|
|
|
(- (point) (field-beginning)))))
|
2008-04-09 03:34:19 +00:00
|
|
|
(message nil)
|
|
|
|
(if (and completions
|
2008-04-13 22:12:02 +00:00
|
|
|
(or (consp (cdr completions))
|
|
|
|
(not (equal (car completions) string))))
|
2008-04-09 03:34:19 +00:00
|
|
|
(with-output-to-temp-buffer "*Completions*"
|
2008-04-13 22:12:02 +00:00
|
|
|
(let* ((last (last completions))
|
|
|
|
(base-size (cdr last)))
|
|
|
|
;; Remove the base-size tail because `sort' requires a properly
|
|
|
|
;; nil-terminated list.
|
|
|
|
(when last (setcdr last nil))
|
2009-08-30 03:45:30 +00:00
|
|
|
(setq completions (sort completions 'string-lessp))
|
|
|
|
(when completion-annotate-function
|
|
|
|
(setq completions
|
|
|
|
(mapcar (lambda (s)
|
|
|
|
(let ((ann
|
|
|
|
(funcall completion-annotate-function s)))
|
|
|
|
(if ann (list s ann) s)))
|
|
|
|
completions)))
|
2009-10-15 01:50:17 +00:00
|
|
|
(with-current-buffer standard-output
|
|
|
|
(set (make-local-variable 'completion-base-position)
|
|
|
|
;; FIXME: We should provide the END part as well, but
|
|
|
|
;; currently completion-all-completions does not give
|
|
|
|
;; us the necessary information.
|
|
|
|
(list (+ start base-size) nil)))
|
|
|
|
(display-completion-list completions)))
|
2008-04-09 03:34:19 +00:00
|
|
|
|
|
|
|
;; If there are no completions, or if the current input is already the
|
|
|
|
;; only possible completion, then hide (previous&stale) completions.
|
2009-11-12 23:10:01 +00:00
|
|
|
(minibuffer-hide-completions)
|
2008-04-09 03:34:19 +00:00
|
|
|
(ding)
|
|
|
|
(minibuffer-message
|
|
|
|
(if completions "Sole completion" "No completions")))
|
|
|
|
nil))
|
|
|
|
|
2009-08-19 02:15:19 +00:00
|
|
|
(defun minibuffer-hide-completions ()
|
|
|
|
"Get rid of an out-of-date *Completions* buffer."
|
|
|
|
;; FIXME: We could/should use minibuffer-scroll-window here, but it
|
|
|
|
;; can also point to the minibuffer-parent-window, so it's a bit tricky.
|
|
|
|
(let ((win (get-buffer-window "*Completions*" 0)))
|
|
|
|
(if win (with-selected-window win (bury-buffer)))))
|
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(defun exit-minibuffer ()
|
|
|
|
"Terminate this minibuffer argument."
|
|
|
|
(interactive)
|
|
|
|
;; If the command that uses this has made modifications in the minibuffer,
|
|
|
|
;; we don't want them to cause deactivation of the mark in the original
|
|
|
|
;; buffer.
|
|
|
|
;; A better solution would be to make deactivate-mark buffer-local
|
|
|
|
;; (or to turn it into a list of buffers, ...), but in the mean time,
|
|
|
|
;; this should do the trick in most cases.
|
2008-04-09 19:33:56 +00:00
|
|
|
(setq deactivate-mark nil)
|
2008-04-09 03:34:19 +00:00
|
|
|
(throw 'exit nil))
|
|
|
|
|
|
|
|
(defun self-insert-and-exit ()
|
|
|
|
"Terminate minibuffer input."
|
|
|
|
(interactive)
|
2009-01-09 04:44:15 +00:00
|
|
|
(if (characterp last-command-event)
|
2008-04-09 03:34:19 +00:00
|
|
|
(call-interactively 'self-insert-command)
|
|
|
|
(ding))
|
|
|
|
(exit-minibuffer))
|
|
|
|
|
2009-11-19 03:12:51 +00:00
|
|
|
(defvar completion-in-region-functions nil
|
|
|
|
"Wrapper hook around `complete-in-region'.
|
|
|
|
The functions on this special hook are called with 5 arguments:
|
|
|
|
NEXT-FUN START END COLLECTION PREDICATE.
|
|
|
|
NEXT-FUN is a function of four arguments (START END COLLECTION PREDICATE)
|
|
|
|
that performs the default operation. The other four argument are like
|
|
|
|
the ones passed to `complete-in-region'. The functions on this hook
|
|
|
|
are expected to perform completion on START..END using COLLECTION
|
|
|
|
and PREDICATE, either by calling NEXT-FUN or by doing it themselves.")
|
|
|
|
|
|
|
|
(defun completion-in-region (start end collection &optional predicate)
|
|
|
|
"Complete the text between START and END using COLLECTION.
|
|
|
|
Point needs to be somewhere between START and END."
|
|
|
|
;; FIXME: some callers need to setup completion-ignore-case,
|
|
|
|
;; completion-ignored-extensions. The latter can be embedded in the
|
|
|
|
;; completion tables, but the first cannot (actually, maybe it should).
|
|
|
|
(assert (<= start (point)) (<= (point) end))
|
|
|
|
;; FIXME: undisplay the *Completions* buffer once the completion is done.
|
|
|
|
(with-wrapper-hook
|
|
|
|
completion-in-region-functions (start end collection predicate)
|
|
|
|
(let ((minibuffer-completion-table collection)
|
|
|
|
(minibuffer-completion-predicate predicate)
|
|
|
|
(ol (make-overlay start end nil nil t)))
|
|
|
|
(overlay-put ol 'field 'completion)
|
|
|
|
(unwind-protect
|
|
|
|
(call-interactively 'minibuffer-complete)
|
|
|
|
(delete-overlay ol)))))
|
2008-06-05 05:44:12 +00:00
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
(let ((map minibuffer-local-map))
|
|
|
|
(define-key map "\C-g" 'abort-recursive-edit)
|
|
|
|
(define-key map "\r" 'exit-minibuffer)
|
|
|
|
(define-key map "\n" 'exit-minibuffer))
|
|
|
|
|
|
|
|
(let ((map minibuffer-local-completion-map))
|
|
|
|
(define-key map "\t" 'minibuffer-complete)
|
2008-05-21 20:52:44 +00:00
|
|
|
;; M-TAB is already abused for many other purposes, so we should find
|
|
|
|
;; another binding for it.
|
|
|
|
;; (define-key map "\e\t" 'minibuffer-force-complete)
|
2008-05-20 17:03:30 +00:00
|
|
|
(define-key map " " 'minibuffer-complete-word)
|
|
|
|
(define-key map "?" 'minibuffer-completion-help))
|
|
|
|
|
|
|
|
(let ((map minibuffer-local-must-match-map))
|
|
|
|
(define-key map "\r" 'minibuffer-complete-and-exit)
|
|
|
|
(define-key map "\n" 'minibuffer-complete-and-exit))
|
|
|
|
|
|
|
|
(let ((map minibuffer-local-filename-completion-map))
|
|
|
|
(define-key map " " nil))
|
2008-06-05 05:44:12 +00:00
|
|
|
(let ((map minibuffer-local-filename-must-match-map))
|
2008-05-20 17:03:30 +00:00
|
|
|
(define-key map " " nil))
|
|
|
|
|
|
|
|
(let ((map minibuffer-local-ns-map))
|
|
|
|
(define-key map " " 'exit-minibuffer)
|
|
|
|
(define-key map "\t" 'exit-minibuffer)
|
|
|
|
(define-key map "?" 'self-insert-and-exit))
|
|
|
|
|
|
|
|
;;; Completion tables.
|
|
|
|
|
2008-04-10 03:12:49 +00:00
|
|
|
(defun minibuffer--double-dollars (str)
|
|
|
|
(replace-regexp-in-string "\\$" "$$" str))
|
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
(defun completion--make-envvar-table ()
|
|
|
|
(mapcar (lambda (enventry)
|
2009-01-14 02:29:52 +00:00
|
|
|
(substring enventry 0 (string-match-p "=" enventry)))
|
2008-04-11 22:28:02 +00:00
|
|
|
process-environment))
|
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
(defconst completion--embedded-envvar-re
|
|
|
|
(concat "\\(?:^\\|[^$]\\(?:\\$\\$\\)*\\)"
|
|
|
|
"$\\([[:alnum:]_]*\\|{\\([^}]*\\)\\)\\'"))
|
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
(defun completion--embedded-envvar-table (string pred action)
|
2009-10-24 00:46:17 +00:00
|
|
|
"Completion table for envvars embedded in a string.
|
|
|
|
The envvar syntax (and escaping) rules followed by this table are the
|
|
|
|
same as `substitute-in-file-name'."
|
|
|
|
;; We ignore `pred', because the predicates passed to us via
|
|
|
|
;; read-file-name-internal are not 100% correct and fail here:
|
|
|
|
;; e.g. we get predicates like file-directory-p there, whereas the filename
|
|
|
|
;; completed needs to be passed through substitute-in-file-name before it
|
|
|
|
;; can be passed to file-directory-p.
|
2009-10-21 20:03:57 +00:00
|
|
|
(when (string-match completion--embedded-envvar-re string)
|
|
|
|
(let* ((beg (or (match-beginning 2) (match-beginning 1)))
|
|
|
|
(table (completion--make-envvar-table))
|
|
|
|
(prefix (substring string 0 beg)))
|
2009-10-24 00:46:17 +00:00
|
|
|
(cond
|
|
|
|
((eq action 'lambda)
|
|
|
|
;; This table is expected to be used in conjunction with some
|
|
|
|
;; other table that provides the "main" completion. Let the
|
|
|
|
;; other table handle the test-completion case.
|
|
|
|
nil)
|
|
|
|
((eq (car-safe action) 'boundaries)
|
2009-10-21 20:03:57 +00:00
|
|
|
;; Only return boundaries if there's something to complete,
|
|
|
|
;; since otherwise when we're used in
|
|
|
|
;; completion-table-in-turn, we could return boundaries and
|
|
|
|
;; let some subsequent table return a list of completions.
|
|
|
|
;; FIXME: Maybe it should rather be fixed in
|
|
|
|
;; completion-table-in-turn instead, but it's difficult to
|
|
|
|
;; do it efficiently there.
|
2009-10-24 00:46:17 +00:00
|
|
|
(when (try-completion (substring string beg) table nil)
|
2009-10-21 20:03:57 +00:00
|
|
|
;; Compute the boundaries of the subfield to which this
|
|
|
|
;; completion applies.
|
|
|
|
(let ((suffix (cdr action)))
|
|
|
|
(list* 'boundaries
|
|
|
|
(or (match-beginning 2) (match-beginning 1))
|
|
|
|
(when (string-match "[^[:alnum:]_]" suffix)
|
2009-10-24 00:46:17 +00:00
|
|
|
(match-beginning 0))))))
|
|
|
|
(t
|
2008-05-20 17:03:30 +00:00
|
|
|
(if (eq (aref string (1- beg)) ?{)
|
|
|
|
(setq table (apply-partially 'completion-table-with-terminator
|
|
|
|
"}" table)))
|
2009-08-30 03:45:30 +00:00
|
|
|
;; Even if file-name completion is case-insensitive, we want
|
|
|
|
;; envvar completion to be case-sensitive.
|
|
|
|
(let ((completion-ignore-case nil))
|
|
|
|
(completion-table-with-context
|
2009-10-24 00:46:17 +00:00
|
|
|
prefix table (substring string beg) nil action)))))))
|
2008-04-13 01:49:17 +00:00
|
|
|
|
2009-10-21 20:03:57 +00:00
|
|
|
(defun completion-file-name-table (string pred action)
|
|
|
|
"Completion table for file names."
|
|
|
|
(ignore-errors
|
2008-05-20 17:03:30 +00:00
|
|
|
(cond
|
|
|
|
((eq (car-safe action) 'boundaries)
|
2008-05-23 01:58:15 +00:00
|
|
|
(let ((start (length (file-name-directory string)))
|
2009-01-14 02:29:52 +00:00
|
|
|
(end (string-match-p "/" (cdr action))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(list* 'boundaries start end)))
|
2008-05-30 19:50:26 +00:00
|
|
|
|
2009-10-21 20:03:57 +00:00
|
|
|
((eq action 'lambda)
|
|
|
|
(if (zerop (length string))
|
|
|
|
nil ;Not sure why it's here, but it probably doesn't harm.
|
|
|
|
(funcall (or pred 'file-exists-p) string)))
|
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
(t
|
2009-10-21 20:03:57 +00:00
|
|
|
(let* ((name (file-name-nondirectory string))
|
|
|
|
(specdir (file-name-directory string))
|
|
|
|
(realdir (or specdir default-directory)))
|
2008-04-13 01:49:17 +00:00
|
|
|
|
2008-04-10 03:12:49 +00:00
|
|
|
(cond
|
|
|
|
((null action)
|
2009-10-21 20:03:57 +00:00
|
|
|
(let ((comp (file-name-completion name realdir pred)))
|
|
|
|
(if (stringp comp)
|
|
|
|
(concat specdir comp)
|
|
|
|
comp)))
|
2008-04-13 01:49:17 +00:00
|
|
|
|
2008-04-10 03:12:49 +00:00
|
|
|
((eq action t)
|
2008-12-21 05:20:06 +00:00
|
|
|
(let ((all (file-name-all-completions name realdir)))
|
2008-04-13 22:12:02 +00:00
|
|
|
|
|
|
|
;; Check the predicate, if necessary.
|
2009-10-21 20:03:57 +00:00
|
|
|
(unless (memq pred '(nil file-exists-p))
|
2008-04-10 03:12:49 +00:00
|
|
|
(let ((comp ())
|
|
|
|
(pred
|
2009-10-21 20:03:57 +00:00
|
|
|
(if (eq pred 'file-directory-p)
|
2008-04-10 03:12:49 +00:00
|
|
|
;; Brute-force speed up for directory checking:
|
|
|
|
;; Discard strings which don't end in a slash.
|
|
|
|
(lambda (s)
|
|
|
|
(let ((len (length s)))
|
|
|
|
(and (> len 0) (eq (aref s (1- len)) ?/))))
|
|
|
|
;; Must do it the hard (and slow) way.
|
2009-10-21 20:03:57 +00:00
|
|
|
pred)))
|
|
|
|
(let ((default-directory (expand-file-name realdir)))
|
2008-04-10 03:12:49 +00:00
|
|
|
(dolist (tem all)
|
|
|
|
(if (funcall pred tem) (push tem comp))))
|
2008-04-13 22:12:02 +00:00
|
|
|
(setq all (nreverse comp))))
|
|
|
|
|
2009-10-21 20:03:57 +00:00
|
|
|
all))))))))
|
|
|
|
|
|
|
|
(defvar read-file-name-predicate nil
|
|
|
|
"Current predicate used by `read-file-name-internal'.")
|
|
|
|
(make-obsolete-variable 'read-file-name-predicate
|
|
|
|
"use the regular PRED argument" "23.2")
|
|
|
|
|
|
|
|
(defun completion--file-name-table (string pred action)
|
|
|
|
"Internal subroutine for `read-file-name'. Do not call this.
|
|
|
|
This is a completion table for file names, like `completion-file-name-table'
|
|
|
|
except that it passes the file name through `substitute-in-file-name'."
|
|
|
|
(cond
|
|
|
|
((eq (car-safe action) 'boundaries)
|
|
|
|
;; For the boundaries, we can't really delegate to
|
|
|
|
;; completion-file-name-table and then fix them up, because it
|
|
|
|
;; would require us to track the relationship between `str' and
|
|
|
|
;; `string', which is difficult. And in any case, if
|
|
|
|
;; substitute-in-file-name turns "fo-$TO-ba" into "fo-o/b-ba", there's
|
|
|
|
;; no way for us to return proper boundaries info, because the
|
|
|
|
;; boundary is not (yet) in `string'.
|
|
|
|
(let ((start (length (file-name-directory string)))
|
|
|
|
(end (string-match-p "/" (cdr action))))
|
|
|
|
(list* 'boundaries start end)))
|
2008-04-10 03:12:49 +00:00
|
|
|
|
|
|
|
(t
|
2009-10-21 20:03:57 +00:00
|
|
|
(let* ((default-directory
|
|
|
|
(if (stringp pred)
|
|
|
|
;; It used to be that `pred' was abused to pass `dir'
|
|
|
|
;; as an argument.
|
|
|
|
(prog1 (file-name-as-directory (expand-file-name pred))
|
|
|
|
(setq pred nil))
|
|
|
|
default-directory))
|
|
|
|
(str (condition-case nil
|
|
|
|
(substitute-in-file-name string)
|
|
|
|
(error string)))
|
|
|
|
(comp (completion-file-name-table
|
|
|
|
str (or pred read-file-name-predicate) action)))
|
|
|
|
|
|
|
|
(cond
|
|
|
|
((stringp comp)
|
|
|
|
;; Requote the $s before returning the completion.
|
|
|
|
(minibuffer--double-dollars comp))
|
|
|
|
((and (null action) comp
|
|
|
|
;; Requote the $s before checking for changes.
|
|
|
|
(setq str (minibuffer--double-dollars str))
|
|
|
|
(not (string-equal string str)))
|
|
|
|
;; If there's no real completion, but substitute-in-file-name
|
|
|
|
;; changed the string, then return the new string.
|
|
|
|
str)
|
|
|
|
(t comp))))))
|
2008-04-10 03:12:49 +00:00
|
|
|
|
2008-04-11 22:28:02 +00:00
|
|
|
(defalias 'read-file-name-internal
|
2008-04-13 01:49:17 +00:00
|
|
|
(completion-table-in-turn 'completion--embedded-envvar-table
|
2008-04-14 15:10:36 +00:00
|
|
|
'completion--file-name-table)
|
2008-04-11 22:28:02 +00:00
|
|
|
"Internal subroutine for `read-file-name'. Do not call this.")
|
2008-04-10 03:12:49 +00:00
|
|
|
|
2008-04-23 18:19:57 +00:00
|
|
|
(defvar read-file-name-function nil
|
|
|
|
"If this is non-nil, `read-file-name' does its work by calling this function.")
|
|
|
|
|
|
|
|
(defcustom read-file-name-completion-ignore-case
|
2008-07-31 21:07:11 +00:00
|
|
|
(if (memq system-type '(ms-dos windows-nt darwin cygwin))
|
2008-04-23 18:19:57 +00:00
|
|
|
t nil)
|
|
|
|
"Non-nil means when reading a file name completion ignores case."
|
|
|
|
:group 'minibuffer
|
|
|
|
:type 'boolean
|
|
|
|
:version "22.1")
|
|
|
|
|
|
|
|
(defcustom insert-default-directory t
|
|
|
|
"Non-nil means when reading a filename start with default dir in minibuffer.
|
|
|
|
|
|
|
|
When the initial minibuffer contents show a name of a file or a directory,
|
|
|
|
typing RETURN without editing the initial contents is equivalent to typing
|
|
|
|
the default file name.
|
|
|
|
|
|
|
|
If this variable is non-nil, the minibuffer contents are always
|
|
|
|
initially non-empty, and typing RETURN without editing will fetch the
|
|
|
|
default name, if one is provided. Note however that this default name
|
|
|
|
is not necessarily the same as initial contents inserted in the minibuffer,
|
|
|
|
if the initial contents is just the default directory.
|
|
|
|
|
|
|
|
If this variable is nil, the minibuffer often starts out empty. In
|
|
|
|
that case you may have to explicitly fetch the next history element to
|
|
|
|
request the default name; typing RETURN without editing will leave
|
|
|
|
the minibuffer empty.
|
|
|
|
|
|
|
|
For some commands, exiting with an empty minibuffer has a special meaning,
|
|
|
|
such as making the current buffer visit no file in the case of
|
|
|
|
`set-visited-file-name'."
|
|
|
|
:group 'minibuffer
|
|
|
|
:type 'boolean)
|
|
|
|
|
2008-04-24 05:46:17 +00:00
|
|
|
;; Not always defined, but only called if next-read-file-uses-dialog-p says so.
|
|
|
|
(declare-function x-file-dialog "xfns.c"
|
|
|
|
(prompt dir &optional default-filename mustmatch only-dir-p))
|
|
|
|
|
2008-04-23 18:19:57 +00:00
|
|
|
(defun read-file-name (prompt &optional dir default-filename mustmatch initial predicate)
|
|
|
|
"Read file name, prompting with PROMPT and completing in directory DIR.
|
|
|
|
Value is not expanded---you must call `expand-file-name' yourself.
|
|
|
|
Default name to DEFAULT-FILENAME if user exits the minibuffer with
|
|
|
|
the same non-empty string that was inserted by this function.
|
|
|
|
(If DEFAULT-FILENAME is omitted, the visited file name is used,
|
2009-11-10 00:54:45 +00:00
|
|
|
except that if INITIAL is specified, that combined with DIR is used.
|
|
|
|
If DEFAULT-FILENAME is a list of file names, the first file name is used.)
|
2008-04-23 18:19:57 +00:00
|
|
|
If the user exits with an empty minibuffer, this function returns
|
|
|
|
an empty string. (This can only happen if the user erased the
|
|
|
|
pre-inserted contents or if `insert-default-directory' is nil.)
|
2009-03-16 03:17:48 +00:00
|
|
|
|
|
|
|
Fourth arg MUSTMATCH can take the following values:
|
|
|
|
- nil means that the user can exit with any input.
|
|
|
|
- t means that the user is not allowed to exit unless
|
|
|
|
the input is (or completes to) an existing file.
|
|
|
|
- `confirm' means that the user can exit with any input, but she needs
|
|
|
|
to confirm her choice if the input is not an existing file.
|
|
|
|
- `confirm-after-completion' means that the user can exit with any
|
|
|
|
input, but she needs to confirm her choice if she called
|
|
|
|
`minibuffer-complete' right before `minibuffer-complete-and-exit'
|
|
|
|
and the input is not an existing file.
|
|
|
|
- anything else behaves like t except that typing RET does not exit if it
|
|
|
|
does non-null completion.
|
|
|
|
|
2008-04-23 18:19:57 +00:00
|
|
|
Fifth arg INITIAL specifies text to start with.
|
2009-03-16 03:17:48 +00:00
|
|
|
|
2008-04-23 18:19:57 +00:00
|
|
|
If optional sixth arg PREDICATE is non-nil, possible completions and
|
|
|
|
the resulting file name must satisfy (funcall PREDICATE NAME).
|
|
|
|
DIR should be an absolute directory name. It defaults to the value of
|
|
|
|
`default-directory'.
|
|
|
|
|
2009-03-16 03:17:48 +00:00
|
|
|
If this command was invoked with the mouse, use a graphical file
|
|
|
|
dialog if `use-dialog-box' is non-nil, and the window system or X
|
2009-11-02 02:06:36 +00:00
|
|
|
toolkit in use provides a file dialog box, and DIR is not a
|
|
|
|
remote file. For graphical file dialogs, any the special values
|
|
|
|
of MUSTMATCH; `confirm' and `confirm-after-completion' are
|
|
|
|
treated as equivalent to nil.
|
2008-04-23 18:19:57 +00:00
|
|
|
|
|
|
|
See also `read-file-name-completion-ignore-case'
|
|
|
|
and `read-file-name-function'."
|
|
|
|
(unless dir (setq dir default-directory))
|
|
|
|
(unless (file-name-absolute-p dir) (setq dir (expand-file-name dir)))
|
|
|
|
(unless default-filename
|
|
|
|
(setq default-filename (if initial (expand-file-name initial dir)
|
|
|
|
buffer-file-name)))
|
|
|
|
;; If dir starts with user's homedir, change that to ~.
|
|
|
|
(setq dir (abbreviate-file-name dir))
|
|
|
|
;; Likewise for default-filename.
|
2008-04-23 18:37:50 +00:00
|
|
|
(if default-filename
|
2009-11-10 00:54:45 +00:00
|
|
|
(setq default-filename
|
|
|
|
(if (consp default-filename)
|
|
|
|
(mapcar 'abbreviate-file-name default-filename)
|
|
|
|
(abbreviate-file-name default-filename))))
|
2008-04-23 18:19:57 +00:00
|
|
|
(let ((insdef (cond
|
|
|
|
((and insert-default-directory (stringp dir))
|
|
|
|
(if initial
|
|
|
|
(cons (minibuffer--double-dollars (concat dir initial))
|
|
|
|
(length (minibuffer--double-dollars dir)))
|
|
|
|
(minibuffer--double-dollars dir)))
|
|
|
|
(initial (cons (minibuffer--double-dollars initial) 0)))))
|
|
|
|
|
|
|
|
(if read-file-name-function
|
|
|
|
(funcall read-file-name-function
|
|
|
|
prompt dir default-filename mustmatch initial predicate)
|
2008-04-23 18:37:50 +00:00
|
|
|
(let ((completion-ignore-case read-file-name-completion-ignore-case)
|
2008-04-23 18:19:57 +00:00
|
|
|
(minibuffer-completing-file-name t)
|
2009-10-21 20:03:57 +00:00
|
|
|
(pred (or predicate 'file-exists-p))
|
2008-04-23 18:19:57 +00:00
|
|
|
(add-to-history nil))
|
|
|
|
|
|
|
|
(let* ((val
|
2009-11-02 02:06:36 +00:00
|
|
|
(if (or (not (next-read-file-uses-dialog-p))
|
|
|
|
;; Graphical file dialogs can't handle remote
|
|
|
|
;; files (Bug#99).
|
|
|
|
(file-remote-p dir))
|
2008-04-23 18:37:50 +00:00
|
|
|
;; We used to pass `dir' to `read-file-name-internal' by
|
|
|
|
;; abusing the `predicate' argument. It's better to
|
|
|
|
;; just use `default-directory', but in order to avoid
|
|
|
|
;; changing `default-directory' in the current buffer,
|
|
|
|
;; we don't let-bind it.
|
|
|
|
(lexical-let ((dir (file-name-as-directory
|
|
|
|
(expand-file-name dir))))
|
|
|
|
(minibuffer-with-setup-hook
|
|
|
|
(lambda () (setq default-directory dir))
|
|
|
|
(completing-read prompt 'read-file-name-internal
|
2009-10-21 20:03:57 +00:00
|
|
|
pred mustmatch insdef
|
|
|
|
'file-name-history default-filename)))
|
2009-03-09 13:31:23 +00:00
|
|
|
;; If DEFAULT-FILENAME not supplied and DIR contains
|
|
|
|
;; a file name, split it.
|
2009-08-02 14:56:04 +00:00
|
|
|
(let ((file (file-name-nondirectory dir))
|
|
|
|
;; When using a dialog, revert to nil and non-nil
|
|
|
|
;; interpretation of mustmatch. confirm options
|
|
|
|
;; need to be interpreted as nil, otherwise
|
|
|
|
;; it is impossible to create new files using
|
|
|
|
;; dialogs with the default settings.
|
|
|
|
(dialog-mustmatch
|
2009-10-21 20:03:57 +00:00
|
|
|
(not (memq mustmatch
|
|
|
|
'(nil confirm confirm-after-completion)))))
|
2009-03-09 13:31:23 +00:00
|
|
|
(when (and (not default-filename)
|
|
|
|
(not (zerop (length file))))
|
2008-04-23 18:19:57 +00:00
|
|
|
(setq default-filename file)
|
|
|
|
(setq dir (file-name-directory dir)))
|
2009-11-10 00:54:45 +00:00
|
|
|
(when default-filename
|
|
|
|
(setq default-filename
|
|
|
|
(expand-file-name (if (consp default-filename)
|
|
|
|
(car default-filename)
|
|
|
|
default-filename)
|
|
|
|
dir)))
|
2008-04-23 18:19:57 +00:00
|
|
|
(setq add-to-history t)
|
2009-08-02 14:56:04 +00:00
|
|
|
(x-file-dialog prompt dir default-filename
|
|
|
|
dialog-mustmatch
|
2008-04-23 18:19:57 +00:00
|
|
|
(eq predicate 'file-directory-p)))))
|
|
|
|
|
|
|
|
(replace-in-history (eq (car-safe file-name-history) val)))
|
|
|
|
;; If completing-read returned the inserted default string itself
|
|
|
|
;; (rather than a new string with the same contents),
|
|
|
|
;; it has to mean that the user typed RET with the minibuffer empty.
|
|
|
|
;; In that case, we really want to return ""
|
|
|
|
;; so that commands such as set-visited-file-name can distinguish.
|
2009-11-10 00:54:45 +00:00
|
|
|
(when (consp default-filename)
|
|
|
|
(setq default-filename (car default-filename)))
|
2008-04-23 18:19:57 +00:00
|
|
|
(when (eq val default-filename)
|
|
|
|
;; In this case, completing-read has not added an element
|
|
|
|
;; to the history. Maybe we should.
|
|
|
|
(if (not replace-in-history)
|
|
|
|
(setq add-to-history t))
|
|
|
|
(setq val ""))
|
|
|
|
(unless val (error "No file name specified"))
|
|
|
|
|
|
|
|
(if (and default-filename
|
|
|
|
(string-equal val (if (consp insdef) (car insdef) insdef)))
|
|
|
|
(setq val default-filename))
|
|
|
|
(setq val (substitute-in-file-name val))
|
|
|
|
|
|
|
|
(if replace-in-history
|
|
|
|
;; Replace what Fcompleting_read added to the history
|
2009-10-18 22:25:36 +00:00
|
|
|
;; with what we will actually return. As an exception,
|
|
|
|
;; if that's the same as the second item in
|
|
|
|
;; file-name-history, it's really a repeat (Bug#4657).
|
2008-04-23 18:19:57 +00:00
|
|
|
(let ((val1 (minibuffer--double-dollars val)))
|
|
|
|
(if history-delete-duplicates
|
|
|
|
(setcdr file-name-history
|
|
|
|
(delete val1 (cdr file-name-history))))
|
2009-10-18 22:25:36 +00:00
|
|
|
(if (string= val1 (cadr file-name-history))
|
|
|
|
(pop file-name-history)
|
|
|
|
(setcar file-name-history val1)))
|
2008-04-23 18:19:57 +00:00
|
|
|
(if add-to-history
|
|
|
|
;; Add the value to the history--but not if it matches
|
|
|
|
;; the last value already there.
|
|
|
|
(let ((val1 (minibuffer--double-dollars val)))
|
|
|
|
(unless (and (consp file-name-history)
|
|
|
|
(equal (car file-name-history) val1))
|
|
|
|
(setq file-name-history
|
|
|
|
(cons val1
|
|
|
|
(if history-delete-duplicates
|
|
|
|
(delete val1 file-name-history)
|
|
|
|
file-name-history)))))))
|
|
|
|
val)))))
|
|
|
|
|
2008-04-22 19:47:13 +00:00
|
|
|
(defun internal-complete-buffer-except (&optional buffer)
|
|
|
|
"Perform completion on all buffers excluding BUFFER.
|
2009-02-13 10:35:40 +00:00
|
|
|
BUFFER nil or omitted means use the current buffer.
|
2008-04-22 19:47:13 +00:00
|
|
|
Like `internal-complete-buffer', but removes BUFFER from the completion list."
|
|
|
|
(lexical-let ((except (if (stringp buffer) buffer (buffer-name buffer))))
|
|
|
|
(apply-partially 'completion-table-with-predicate
|
|
|
|
'internal-complete-buffer
|
|
|
|
(lambda (name)
|
|
|
|
(not (equal (if (consp name) (car name) name) except)))
|
|
|
|
nil)))
|
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
;;; Old-style completion, used in Emacs-21 and Emacs-22.
|
2008-04-23 21:01:31 +00:00
|
|
|
|
|
|
|
(defun completion-emacs21-try-completion (string table pred point)
|
|
|
|
(let ((completion (try-completion string table pred)))
|
|
|
|
(if (stringp completion)
|
|
|
|
(cons completion (length completion))
|
|
|
|
completion)))
|
|
|
|
|
|
|
|
(defun completion-emacs21-all-completions (string table pred point)
|
2008-04-29 05:36:55 +00:00
|
|
|
(completion-hilit-commonality
|
2008-06-10 22:01:59 +00:00
|
|
|
(all-completions string table pred)
|
2008-12-21 05:20:06 +00:00
|
|
|
(length string)
|
|
|
|
(car (completion-boundaries string table pred ""))))
|
2008-04-23 21:01:31 +00:00
|
|
|
|
|
|
|
(defun completion-emacs22-try-completion (string table pred point)
|
|
|
|
(let ((suffix (substring string point))
|
|
|
|
(completion (try-completion (substring string 0 point) table pred)))
|
|
|
|
(if (not (stringp completion))
|
|
|
|
completion
|
|
|
|
;; Merge a trailing / in completion with a / after point.
|
|
|
|
;; We used to only do it for word completion, but it seems to make
|
|
|
|
;; sense for all completions.
|
2008-04-26 01:47:11 +00:00
|
|
|
;; Actually, claiming this feature was part of Emacs-22 completion
|
|
|
|
;; is pushing it a bit: it was only done in minibuffer-completion-word,
|
|
|
|
;; which was (by default) not bound during file completion, where such
|
|
|
|
;; slashes are most likely to occur.
|
|
|
|
(if (and (not (zerop (length completion)))
|
|
|
|
(eq ?/ (aref completion (1- (length completion))))
|
2008-04-23 21:01:31 +00:00
|
|
|
(not (zerop (length suffix)))
|
|
|
|
(eq ?/ (aref suffix 0)))
|
2008-04-26 01:47:11 +00:00
|
|
|
;; This leaves point after the / .
|
|
|
|
(setq suffix (substring suffix 1)))
|
2008-04-23 21:01:31 +00:00
|
|
|
(cons (concat completion suffix) (length completion)))))
|
|
|
|
|
|
|
|
(defun completion-emacs22-all-completions (string table pred point)
|
2008-12-21 05:20:06 +00:00
|
|
|
(let ((beforepoint (substring string 0 point)))
|
|
|
|
(completion-hilit-commonality
|
|
|
|
(all-completions beforepoint table pred)
|
|
|
|
point
|
|
|
|
(car (completion-boundaries beforepoint table pred "")))))
|
2008-04-23 21:01:31 +00:00
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
;;; Basic completion.
|
|
|
|
|
|
|
|
(defun completion--merge-suffix (completion point suffix)
|
|
|
|
"Merge end of COMPLETION with beginning of SUFFIX.
|
|
|
|
Simple generalization of the \"merge trailing /\" done in Emacs-22.
|
|
|
|
Return the new suffix."
|
|
|
|
(if (and (not (zerop (length suffix)))
|
|
|
|
(string-match "\\(.+\\)\n\\1" (concat completion "\n" suffix)
|
|
|
|
;; Make sure we don't compress things to less
|
|
|
|
;; than we started with.
|
|
|
|
point)
|
|
|
|
;; Just make sure we didn't match some other \n.
|
|
|
|
(eq (match-end 1) (length completion)))
|
|
|
|
(substring suffix (- (match-end 1) (match-beginning 1)))
|
|
|
|
;; Nothing to merge.
|
|
|
|
suffix))
|
|
|
|
|
2008-04-26 01:47:11 +00:00
|
|
|
(defun completion-basic-try-completion (string table pred point)
|
2008-06-10 22:01:59 +00:00
|
|
|
(let* ((beforepoint (substring string 0 point))
|
|
|
|
(afterpoint (substring string point))
|
2008-06-26 02:48:56 +00:00
|
|
|
(bounds (completion-boundaries beforepoint table pred afterpoint)))
|
|
|
|
(if (zerop (cdr bounds))
|
|
|
|
;; `try-completion' may return a subtly different result
|
|
|
|
;; than `all+merge', so try to use it whenever possible.
|
|
|
|
(let ((completion (try-completion beforepoint table pred)))
|
|
|
|
(if (not (stringp completion))
|
|
|
|
completion
|
|
|
|
(cons
|
|
|
|
(concat completion
|
|
|
|
(completion--merge-suffix completion point afterpoint))
|
|
|
|
(length completion))))
|
|
|
|
(let* ((suffix (substring afterpoint (cdr bounds)))
|
|
|
|
(prefix (substring beforepoint 0 (car bounds)))
|
|
|
|
(pattern (delete
|
|
|
|
"" (list (substring beforepoint (car bounds))
|
|
|
|
'point
|
|
|
|
(substring afterpoint 0 (cdr bounds)))))
|
|
|
|
(all (completion-pcm--all-completions prefix pattern table pred)))
|
|
|
|
(if minibuffer-completing-file-name
|
|
|
|
(setq all (completion-pcm--filename-try-filter all)))
|
|
|
|
(completion-pcm--merge-try pattern all prefix suffix)))))
|
|
|
|
|
|
|
|
(defun completion-basic-all-completions (string table pred point)
|
|
|
|
(let* ((beforepoint (substring string 0 point))
|
|
|
|
(afterpoint (substring string point))
|
|
|
|
(bounds (completion-boundaries beforepoint table pred afterpoint))
|
|
|
|
(suffix (substring afterpoint (cdr bounds)))
|
|
|
|
(prefix (substring beforepoint 0 (car bounds)))
|
|
|
|
(pattern (delete
|
|
|
|
"" (list (substring beforepoint (car bounds))
|
|
|
|
'point
|
|
|
|
(substring afterpoint 0 (cdr bounds)))))
|
|
|
|
(all (completion-pcm--all-completions prefix pattern table pred)))
|
2008-12-21 05:20:06 +00:00
|
|
|
(completion-hilit-commonality all point (car bounds))))
|
2008-04-23 21:01:31 +00:00
|
|
|
|
2008-04-26 01:47:11 +00:00
|
|
|
;;; Partial-completion-mode style completion.
|
|
|
|
|
2009-08-19 02:15:19 +00:00
|
|
|
(defvar completion-pcm--delim-wild-regex nil
|
|
|
|
"Regular expression matching delimiters controlling the partial-completion.
|
|
|
|
Typically, this regular expression simply matches a delimiter, meaning
|
|
|
|
that completion can add something at (match-beginning 0), but if it has
|
|
|
|
a submatch 1, then completion can add something at (match-end 1).
|
|
|
|
This is used when the delimiter needs to be of size zero (e.g. the transition
|
|
|
|
from lowercase to uppercase characters).")
|
2008-04-26 01:47:11 +00:00
|
|
|
|
|
|
|
(defun completion-pcm--prepare-delim-re (delims)
|
|
|
|
(setq completion-pcm--delim-wild-regex (concat "[" delims "*]")))
|
|
|
|
|
|
|
|
(defcustom completion-pcm-word-delimiters "-_. "
|
|
|
|
"A string of characters treated as word delimiters for completion.
|
|
|
|
Some arcane rules:
|
|
|
|
If `]' is in this string, it must come first.
|
|
|
|
If `^' is in this string, it must not come first.
|
|
|
|
If `-' is in this string, it must come first or right after `]'.
|
|
|
|
In other words, if S is this string, then `[S]' must be a valid Emacs regular
|
|
|
|
expression (not containing character ranges like `a-z')."
|
|
|
|
:set (lambda (symbol value)
|
|
|
|
(set-default symbol value)
|
|
|
|
;; Refresh other vars.
|
|
|
|
(completion-pcm--prepare-delim-re value))
|
|
|
|
:initialize 'custom-initialize-reset
|
2008-04-26 12:58:13 +00:00
|
|
|
:group 'minibuffer
|
2008-04-26 01:47:11 +00:00
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
(defun completion-pcm--pattern-trivial-p (pattern)
|
2009-01-06 04:17:04 +00:00
|
|
|
(and (stringp (car pattern))
|
|
|
|
;; It can be followed by `point' and "" and still be trivial.
|
|
|
|
(let ((trivial t))
|
|
|
|
(dolist (elem (cdr pattern))
|
|
|
|
(unless (member elem '(point ""))
|
|
|
|
(setq trivial nil)))
|
|
|
|
trivial)))
|
2008-04-26 01:47:11 +00:00
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
(defun completion-pcm--string->pattern (string &optional point)
|
|
|
|
"Split STRING into a pattern.
|
2008-04-26 01:47:11 +00:00
|
|
|
A pattern is a list where each element is either a string
|
|
|
|
or a symbol chosen among `any', `star', `point'."
|
2008-05-20 17:03:30 +00:00
|
|
|
(if (and point (< point (length string)))
|
|
|
|
(let ((prefix (substring string 0 point))
|
|
|
|
(suffix (substring string point)))
|
2008-04-26 01:47:11 +00:00
|
|
|
(append (completion-pcm--string->pattern prefix)
|
|
|
|
'(point)
|
|
|
|
(completion-pcm--string->pattern suffix)))
|
|
|
|
(let ((pattern nil)
|
|
|
|
(p 0)
|
|
|
|
(p0 0))
|
2008-04-26 12:58:13 +00:00
|
|
|
|
2009-08-19 02:15:19 +00:00
|
|
|
(while (and (setq p (string-match completion-pcm--delim-wild-regex
|
|
|
|
string p))
|
2009-04-14 02:02:30 +00:00
|
|
|
;; If the char was added by minibuffer-complete-word, then
|
|
|
|
;; don't treat it as a delimiter, otherwise "M-x SPC"
|
|
|
|
;; ends up inserting a "-" rather than listing
|
|
|
|
;; all completions.
|
|
|
|
(not (get-text-property p 'completion-try-word string)))
|
2009-08-19 02:15:19 +00:00
|
|
|
;; Usually, completion-pcm--delim-wild-regex matches a delimiter,
|
|
|
|
;; meaning that something can be added *before* it, but it can also
|
|
|
|
;; match a prefix and postfix, in which case something can be added
|
|
|
|
;; in-between (e.g. match [[:lower:]][[:upper:]]).
|
|
|
|
;; This is determined by the presence of a submatch-1 which delimits
|
|
|
|
;; the prefix.
|
|
|
|
(if (match-end 1) (setq p (match-end 1)))
|
2008-05-20 17:03:30 +00:00
|
|
|
(push (substring string p0 p) pattern)
|
|
|
|
(if (eq (aref string p) ?*)
|
2008-04-26 01:47:11 +00:00
|
|
|
(progn
|
|
|
|
(push 'star pattern)
|
|
|
|
(setq p0 (1+ p)))
|
|
|
|
(push 'any pattern)
|
|
|
|
(setq p0 p))
|
|
|
|
(incf p))
|
|
|
|
|
|
|
|
;; An empty string might be erroneously added at the beginning.
|
|
|
|
;; It should be avoided properly, but it's so easy to remove it here.
|
2008-05-20 17:03:30 +00:00
|
|
|
(delete "" (nreverse (cons (substring string p0) pattern))))))
|
2008-04-26 01:47:11 +00:00
|
|
|
|
|
|
|
(defun completion-pcm--pattern->regex (pattern &optional group)
|
2008-05-20 17:03:30 +00:00
|
|
|
(let ((re
|
2009-08-30 03:45:30 +00:00
|
|
|
(concat "\\`"
|
|
|
|
(mapconcat
|
|
|
|
(lambda (x)
|
|
|
|
(case x
|
2008-09-03 14:09:49 +00:00
|
|
|
((star any point)
|
|
|
|
(if (if (consp group) (memq x group) group)
|
2009-08-30 03:45:30 +00:00
|
|
|
"\\(.*?\\)" ".*?"))
|
|
|
|
(t (regexp-quote x))))
|
|
|
|
pattern
|
2008-09-03 14:09:49 +00:00
|
|
|
""))))
|
2008-05-20 17:03:30 +00:00
|
|
|
;; Avoid pathological backtracking.
|
|
|
|
(while (string-match "\\.\\*\\?\\(?:\\\\[()]\\)*\\(\\.\\*\\?\\)" re)
|
|
|
|
(setq re (replace-match "" t t re 1)))
|
|
|
|
re))
|
2008-04-26 01:47:11 +00:00
|
|
|
|
2008-05-20 17:03:30 +00:00
|
|
|
(defun completion-pcm--all-completions (prefix pattern table pred)
|
2008-04-26 01:47:11 +00:00
|
|
|
"Find all completions for PATTERN in TABLE obeying PRED.
|
2008-04-26 12:58:13 +00:00
|
|
|
PATTERN is as returned by `completion-pcm--string->pattern'."
|
2008-12-21 05:20:06 +00:00
|
|
|
;; (assert (= (car (completion-boundaries prefix table pred ""))
|
|
|
|
;; (length prefix)))
|
2008-04-26 01:47:11 +00:00
|
|
|
;; Find an initial list of possible completions.
|
|
|
|
(if (completion-pcm--pattern-trivial-p pattern)
|
|
|
|
|
|
|
|
;; Minibuffer contains no delimiters -- simple case!
|
2008-12-21 05:20:06 +00:00
|
|
|
(all-completions (concat prefix (car pattern)) table pred)
|
2008-04-26 12:58:13 +00:00
|
|
|
|
2008-04-26 01:47:11 +00:00
|
|
|
;; Use all-completions to do an initial cull. This is a big win,
|
|
|
|
;; since all-completions is written in C!
|
|
|
|
(let* (;; Convert search pattern to a standard regular expression.
|
|
|
|
(regex (completion-pcm--pattern->regex pattern))
|
2008-09-03 14:09:49 +00:00
|
|
|
(case-fold-search completion-ignore-case)
|
|
|
|
(completion-regexp-list (cons regex completion-regexp-list))
|
2008-04-26 01:47:11 +00:00
|
|
|
(compl (all-completions
|
2008-05-20 17:03:30 +00:00
|
|
|
(concat prefix (if (stringp (car pattern)) (car pattern) ""))
|
2008-12-21 05:20:06 +00:00
|
|
|
table pred)))
|
2008-04-26 01:47:11 +00:00
|
|
|
(if (not (functionp table))
|
|
|
|
;; The internal functions already obeyed completion-regexp-list.
|
|
|
|
compl
|
2008-09-03 14:09:49 +00:00
|
|
|
(let ((poss ()))
|
2008-04-26 01:47:11 +00:00
|
|
|
(dolist (c compl)
|
2009-01-14 02:29:52 +00:00
|
|
|
(when (string-match-p regex c) (push c poss)))
|
2008-04-26 01:47:11 +00:00
|
|
|
poss)))))
|
|
|
|
|
2008-04-29 06:00:21 +00:00
|
|
|
(defun completion-pcm--hilit-commonality (pattern completions)
|
|
|
|
(when completions
|
|
|
|
(let* ((re (completion-pcm--pattern->regex pattern '(point)))
|
2009-01-06 04:17:04 +00:00
|
|
|
(case-fold-search completion-ignore-case))
|
2008-04-29 06:00:21 +00:00
|
|
|
;; Remove base-size during mapcar, and add it back later.
|
2009-01-06 04:17:04 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (str)
|
|
|
|
;; Don't modify the string itself.
|
|
|
|
(setq str (copy-sequence str))
|
|
|
|
(unless (string-match re str)
|
|
|
|
(error "Internal error: %s does not match %s" re str))
|
|
|
|
(let ((pos (or (match-beginning 1) (match-end 0))))
|
|
|
|
(put-text-property 0 pos
|
|
|
|
'font-lock-face 'completions-common-part
|
|
|
|
str)
|
|
|
|
(if (> (length str) pos)
|
|
|
|
(put-text-property pos (1+ pos)
|
|
|
|
'font-lock-face 'completions-first-difference
|
|
|
|
str)))
|
|
|
|
str)
|
|
|
|
completions))))
|
2008-04-29 06:00:21 +00:00
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
(defun completion-pcm--find-all-completions (string table pred point
|
|
|
|
&optional filter)
|
|
|
|
"Find all completions for STRING at POINT in TABLE, satisfying PRED.
|
|
|
|
POINT is a position inside STRING.
|
|
|
|
FILTER is a function applied to the return value, that can be used, e.g. to
|
|
|
|
filter out additional entries (because TABLE migth not obey PRED)."
|
|
|
|
(unless filter (setq filter 'identity))
|
2008-05-23 01:58:15 +00:00
|
|
|
(let* ((beforepoint (substring string 0 point))
|
|
|
|
(afterpoint (substring string point))
|
|
|
|
(bounds (completion-boundaries beforepoint table pred afterpoint))
|
|
|
|
(prefix (substring beforepoint 0 (car bounds)))
|
|
|
|
(suffix (substring afterpoint (cdr bounds)))
|
2008-05-20 17:03:30 +00:00
|
|
|
firsterror)
|
2008-05-23 01:58:15 +00:00
|
|
|
(setq string (substring string (car bounds) (+ point (cdr bounds))))
|
|
|
|
(let* ((relpoint (- point (car bounds)))
|
|
|
|
(pattern (completion-pcm--string->pattern string relpoint))
|
2008-05-20 17:03:30 +00:00
|
|
|
(all (condition-case err
|
2008-06-10 22:01:59 +00:00
|
|
|
(funcall filter
|
|
|
|
(completion-pcm--all-completions
|
|
|
|
prefix pattern table pred))
|
2008-05-20 17:03:30 +00:00
|
|
|
(error (unless firsterror (setq firsterror err)) nil))))
|
|
|
|
(when (and (null all)
|
|
|
|
(> (car bounds) 0)
|
|
|
|
(null (ignore-errors (try-completion prefix table pred))))
|
|
|
|
;; The prefix has no completions at all, so we should try and fix
|
|
|
|
;; that first.
|
|
|
|
(let ((substring (substring prefix 0 -1)))
|
|
|
|
(destructuring-bind (subpat suball subprefix subsuffix)
|
|
|
|
(completion-pcm--find-all-completions
|
2008-06-10 22:01:59 +00:00
|
|
|
substring table pred (length substring) filter)
|
2008-05-20 17:03:30 +00:00
|
|
|
(let ((sep (aref prefix (1- (length prefix))))
|
|
|
|
;; Text that goes between the new submatches and the
|
|
|
|
;; completion substring.
|
|
|
|
(between nil))
|
|
|
|
;; Eliminate submatches that don't end with the separator.
|
|
|
|
(dolist (submatch (prog1 suball (setq suball ())))
|
|
|
|
(when (eq sep (aref submatch (1- (length submatch))))
|
|
|
|
(push submatch suball)))
|
|
|
|
(when suball
|
|
|
|
;; Update the boundaries and corresponding pattern.
|
|
|
|
;; We assume that all submatches result in the same boundaries
|
|
|
|
;; since we wouldn't know how to merge them otherwise anyway.
|
2008-05-23 01:58:15 +00:00
|
|
|
;; FIXME: COMPLETE REWRITE!!!
|
|
|
|
(let* ((newbeforepoint
|
|
|
|
(concat subprefix (car suball)
|
|
|
|
(substring string 0 relpoint)))
|
|
|
|
(leftbound (+ (length subprefix) (length (car suball))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(newbounds (completion-boundaries
|
2008-05-23 01:58:15 +00:00
|
|
|
newbeforepoint table pred afterpoint)))
|
|
|
|
(unless (or (and (eq (cdr bounds) (cdr newbounds))
|
|
|
|
(eq (car newbounds) leftbound))
|
2008-05-20 17:03:30 +00:00
|
|
|
;; Refuse new boundaries if they step over
|
|
|
|
;; the submatch.
|
2008-05-23 01:58:15 +00:00
|
|
|
(< (car newbounds) leftbound))
|
2008-05-20 17:03:30 +00:00
|
|
|
;; The new completed prefix does change the boundaries
|
|
|
|
;; of the completed substring.
|
2008-05-23 01:58:15 +00:00
|
|
|
(setq suffix (substring afterpoint (cdr newbounds)))
|
|
|
|
(setq string
|
|
|
|
(concat (substring newbeforepoint (car newbounds))
|
|
|
|
(substring afterpoint 0 (cdr newbounds))))
|
|
|
|
(setq between (substring newbeforepoint leftbound
|
2008-05-20 17:03:30 +00:00
|
|
|
(car newbounds)))
|
|
|
|
(setq pattern (completion-pcm--string->pattern
|
2008-05-23 01:58:15 +00:00
|
|
|
string
|
|
|
|
(- (length newbeforepoint)
|
|
|
|
(car newbounds)))))
|
2008-05-20 17:03:30 +00:00
|
|
|
(dolist (submatch suball)
|
|
|
|
(setq all (nconc (mapcar
|
|
|
|
(lambda (s) (concat submatch between s))
|
2008-06-10 22:01:59 +00:00
|
|
|
(funcall filter
|
|
|
|
(completion-pcm--all-completions
|
|
|
|
(concat subprefix submatch between)
|
|
|
|
pattern table pred)))
|
2008-05-20 17:03:30 +00:00
|
|
|
all)))
|
2008-05-22 04:26:41 +00:00
|
|
|
;; FIXME: This can come in handy for try-completion,
|
|
|
|
;; but isn't right for all-completions, since it lists
|
|
|
|
;; invalid completions.
|
|
|
|
;; (unless all
|
|
|
|
;; ;; Even though we found expansions in the prefix, none
|
|
|
|
;; ;; leads to a valid completion.
|
|
|
|
;; ;; Let's keep the expansions, tho.
|
|
|
|
;; (dolist (submatch suball)
|
|
|
|
;; (push (concat submatch between newsubstring) all)))
|
|
|
|
))
|
2008-05-20 17:03:30 +00:00
|
|
|
(setq pattern (append subpat (list 'any (string sep))
|
|
|
|
(if between (list between)) pattern))
|
|
|
|
(setq prefix subprefix)))))
|
|
|
|
(if (and (null all) firsterror)
|
|
|
|
(signal (car firsterror) (cdr firsterror))
|
|
|
|
(list pattern all prefix suffix)))))
|
|
|
|
|
2008-04-26 01:47:11 +00:00
|
|
|
(defun completion-pcm-all-completions (string table pred point)
|
2008-05-20 17:03:30 +00:00
|
|
|
(destructuring-bind (pattern all &optional prefix suffix)
|
|
|
|
(completion-pcm--find-all-completions string table pred point)
|
2008-05-29 20:46:35 +00:00
|
|
|
(when all
|
|
|
|
(nconc (completion-pcm--hilit-commonality pattern all)
|
|
|
|
(length prefix)))))
|
2008-04-26 01:47:11 +00:00
|
|
|
|
|
|
|
(defun completion-pcm--merge-completions (strs pattern)
|
|
|
|
"Extract the commonality in STRS, with the help of PATTERN."
|
2009-10-14 15:10:09 +00:00
|
|
|
;; When completing while ignoring case, we want to try and avoid
|
|
|
|
;; completing "fo" to "foO" when completing against "FOO" (bug#4219).
|
|
|
|
;; So we try and make sure that the string we return is all made up
|
|
|
|
;; of text from the completions rather than part from the
|
|
|
|
;; completions and part from the input.
|
|
|
|
;; FIXME: This reduces the problems of inconsistent capitalization
|
|
|
|
;; but it doesn't fully fix it: we may still end up completing
|
|
|
|
;; "fo-ba" to "foo-BAR" or "FOO-bar" when completing against
|
|
|
|
;; '("foo-barr" "FOO-BARD").
|
2008-04-26 01:47:11 +00:00
|
|
|
(cond
|
|
|
|
((null (cdr strs)) (list (car strs)))
|
|
|
|
(t
|
|
|
|
(let ((re (completion-pcm--pattern->regex pattern 'group))
|
|
|
|
(ccs ())) ;Chopped completions.
|
|
|
|
|
|
|
|
;; First chop each string into the parts corresponding to each
|
|
|
|
;; non-constant element of `pattern', using regexp-matching.
|
|
|
|
(let ((case-fold-search completion-ignore-case))
|
|
|
|
(dolist (str strs)
|
|
|
|
(unless (string-match re str)
|
|
|
|
(error "Internal error: %s doesn't match %s" str re))
|
|
|
|
(let ((chopped ())
|
2009-10-14 15:10:09 +00:00
|
|
|
(last 0)
|
|
|
|
(i 1)
|
|
|
|
next)
|
|
|
|
(while (setq next (match-end i))
|
|
|
|
(push (substring str last next) chopped)
|
|
|
|
(setq last next)
|
2008-04-26 01:47:11 +00:00
|
|
|
(setq i (1+ i)))
|
|
|
|
;; Add the text corresponding to the implicit trailing `any'.
|
2009-10-14 15:10:09 +00:00
|
|
|
(push (substring str last) chopped)
|
2008-04-26 01:47:11 +00:00
|
|
|
(push (nreverse chopped) ccs))))
|
|
|
|
|
|
|
|
;; Then for each of those non-constant elements, extract the
|
|
|
|
;; commonality between them.
|
2009-10-14 15:10:09 +00:00
|
|
|
(let ((res ())
|
|
|
|
(fixed ""))
|
|
|
|
;; Make the implicit trailing `any' explicit.
|
2008-04-26 01:47:11 +00:00
|
|
|
(dolist (elem (append pattern '(any)))
|
|
|
|
(if (stringp elem)
|
2009-10-14 15:10:09 +00:00
|
|
|
(setq fixed (concat fixed elem))
|
2008-04-26 01:47:11 +00:00
|
|
|
(let ((comps ()))
|
|
|
|
(dolist (cc (prog1 ccs (setq ccs nil)))
|
|
|
|
(push (car cc) comps)
|
|
|
|
(push (cdr cc) ccs))
|
2009-10-14 15:10:09 +00:00
|
|
|
;; Might improve the likelihood to avoid choosing
|
|
|
|
;; different capitalizations in different parts.
|
|
|
|
;; In practice, it doesn't seem to make any difference.
|
|
|
|
(setq ccs (nreverse ccs))
|
|
|
|
(let* ((prefix (try-completion fixed comps))
|
|
|
|
(unique (or (and (eq prefix t) (setq prefix fixed))
|
2008-04-26 01:47:11 +00:00
|
|
|
(eq t (try-completion prefix comps)))))
|
|
|
|
(unless (equal prefix "") (push prefix res))
|
|
|
|
;; If there's only one completion, `elem' is not useful
|
|
|
|
;; any more: it can only match the empty string.
|
|
|
|
;; FIXME: in some cases, it may be necessary to turn an
|
|
|
|
;; `any' into a `star' because the surrounding context has
|
|
|
|
;; changed such that string->pattern wouldn't add an `any'
|
|
|
|
;; here any more.
|
2009-10-14 15:10:09 +00:00
|
|
|
(unless unique (push elem res))
|
|
|
|
(setq fixed "")))))
|
2008-04-26 01:47:11 +00:00
|
|
|
;; We return it in reverse order.
|
|
|
|
res)))))
|
|
|
|
|
|
|
|
(defun completion-pcm--pattern->string (pattern)
|
|
|
|
(mapconcat (lambda (x) (cond
|
|
|
|
((stringp x) x)
|
|
|
|
((eq x 'star) "*")
|
|
|
|
((eq x 'any) "")
|
|
|
|
((eq x 'point) "")))
|
|
|
|
pattern
|
|
|
|
""))
|
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
;; We want to provide the functionality of `try', but we use `all'
|
|
|
|
;; and then merge it. In most cases, this works perfectly, but
|
|
|
|
;; if the completion table doesn't consider the same completions in
|
|
|
|
;; `try' as in `all', then we have a problem. The most common such
|
|
|
|
;; case is for filename completion where completion-ignored-extensions
|
|
|
|
;; is only obeyed by the `try' code. We paper over the difference
|
|
|
|
;; here. Note that it is not quite right either: if the completion
|
|
|
|
;; table uses completion-table-in-turn, this filtering may take place
|
|
|
|
;; too late to correctly fallback from the first to the
|
|
|
|
;; second alternative.
|
|
|
|
(defun completion-pcm--filename-try-filter (all)
|
|
|
|
"Filter to adjust `all' file completion to the behavior of `try'."
|
2008-04-26 01:47:11 +00:00
|
|
|
(when all
|
2008-06-10 22:01:59 +00:00
|
|
|
(let ((try ())
|
|
|
|
(re (concat "\\(?:\\`\\.\\.?/\\|"
|
|
|
|
(regexp-opt completion-ignored-extensions)
|
|
|
|
"\\)\\'")))
|
|
|
|
(dolist (f all)
|
2009-01-14 02:29:52 +00:00
|
|
|
(unless (string-match-p re f) (push f try)))
|
2008-06-10 22:01:59 +00:00
|
|
|
(or try all))))
|
2009-01-14 02:29:52 +00:00
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
|
|
|
|
(defun completion-pcm--merge-try (pattern all prefix suffix)
|
|
|
|
(cond
|
|
|
|
((not (consp all)) all)
|
|
|
|
((and (not (consp (cdr all))) ;Only one completion.
|
|
|
|
;; Ignore completion-ignore-case here.
|
|
|
|
(equal (completion-pcm--pattern->string pattern) (car all)))
|
|
|
|
t)
|
|
|
|
(t
|
2008-04-26 01:47:11 +00:00
|
|
|
(let* ((mergedpat (completion-pcm--merge-completions all pattern))
|
2008-04-30 03:41:39 +00:00
|
|
|
;; `mergedpat' is in reverse order. Place new point (by
|
|
|
|
;; order of preference) either at the old point, or at
|
|
|
|
;; the last place where there's something to choose, or
|
|
|
|
;; at the very end.
|
|
|
|
(pointpat (or (memq 'point mergedpat) (memq 'any mergedpat)
|
2008-04-30 04:48:27 +00:00
|
|
|
mergedpat))
|
2008-04-30 03:41:39 +00:00
|
|
|
;; New pos from the start.
|
2008-04-26 01:47:11 +00:00
|
|
|
(newpos (length (completion-pcm--pattern->string pointpat)))
|
2008-04-30 03:41:39 +00:00
|
|
|
;; Do it afterwards because it changes `pointpat' by sideeffect.
|
2008-04-26 01:47:11 +00:00
|
|
|
(merged (completion-pcm--pattern->string (nreverse mergedpat))))
|
2008-06-10 22:01:59 +00:00
|
|
|
|
|
|
|
(setq suffix (completion--merge-suffix merged newpos suffix))
|
2008-05-20 17:03:30 +00:00
|
|
|
(cons (concat prefix merged suffix) (+ newpos (length prefix)))))))
|
2008-04-26 01:47:11 +00:00
|
|
|
|
2008-06-10 22:01:59 +00:00
|
|
|
(defun completion-pcm-try-completion (string table pred point)
|
|
|
|
(destructuring-bind (pattern all prefix suffix)
|
|
|
|
(completion-pcm--find-all-completions
|
|
|
|
string table pred point
|
|
|
|
(if minibuffer-completing-file-name
|
|
|
|
'completion-pcm--filename-try-filter))
|
|
|
|
(completion-pcm--merge-try pattern all prefix suffix)))
|
|
|
|
|
2009-09-01 19:49:34 +00:00
|
|
|
;;; Initials completion
|
|
|
|
;; Complete /ums to /usr/monnier/src or lch to list-command-history.
|
|
|
|
|
|
|
|
(defun completion-initials-expand (str table pred)
|
|
|
|
(unless (or (zerop (length str))
|
2009-09-02 03:09:10 +00:00
|
|
|
(string-match completion-pcm--delim-wild-regex str))
|
2009-09-01 19:49:34 +00:00
|
|
|
(let ((bounds (completion-boundaries str table pred "")))
|
|
|
|
(if (zerop (car bounds))
|
|
|
|
(mapconcat 'string str "-")
|
|
|
|
;; If there's a boundary, it's trickier. The main use-case
|
|
|
|
;; we consider here is file-name completion. We'd like
|
|
|
|
;; to expand ~/eee to ~/e/e/e and /eee to /e/e/e.
|
|
|
|
;; But at the same time, we don't want /usr/share/ae to expand
|
|
|
|
;; to /usr/share/a/e just because we mistyped "ae" for "ar",
|
|
|
|
;; so we probably don't want initials to touch anything that
|
|
|
|
;; looks like /usr/share/foo. As a heuristic, we just check that
|
|
|
|
;; the text before the boundary char is at most 1 char.
|
|
|
|
;; This allows both ~/eee and /eee and not much more.
|
|
|
|
;; FIXME: It sadly also disallows the use of ~/eee when that's
|
|
|
|
;; embedded within something else (e.g. "(~/eee" in Info node
|
|
|
|
;; completion or "ancestor:/eee" in bzr-revision completion).
|
|
|
|
(when (< (car bounds) 3)
|
|
|
|
(let ((sep (substring str (1- (car bounds)) (car bounds))))
|
|
|
|
;; FIXME: the above string-match checks the whole string, whereas
|
|
|
|
;; we end up only caring about the after-boundary part.
|
|
|
|
(concat (substring str 0 (car bounds))
|
|
|
|
(mapconcat 'string (substring str (car bounds)) sep))))))))
|
|
|
|
|
|
|
|
(defun completion-initials-all-completions (string table pred point)
|
|
|
|
(let ((newstr (completion-initials-expand string table pred)))
|
|
|
|
(when newstr
|
|
|
|
(completion-pcm-all-completions newstr table pred (length newstr)))))
|
|
|
|
|
|
|
|
(defun completion-initials-try-completion (string table pred point)
|
|
|
|
(let ((newstr (completion-initials-expand string table pred)))
|
|
|
|
(when newstr
|
|
|
|
(completion-pcm-try-completion newstr table pred (length newstr)))))
|
|
|
|
|
2008-04-26 01:47:11 +00:00
|
|
|
|
2008-04-09 03:34:19 +00:00
|
|
|
(provide 'minibuffer)
|
2008-04-18 02:46:47 +00:00
|
|
|
|
|
|
|
;; arch-tag: ef8a0a15-1080-4790-a754-04017c02f08f
|
2008-04-09 03:34:19 +00:00
|
|
|
;;; minibuffer.el ends here
|