-;; complete.el -- partial completion mechanism plus other goodies.
+;;; complete.el -- partial completion mechanism plus other goodies
;; Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
+;; Keywords: abbrev
;; Version: 2.02
;; Special thanks to Hallvard Furuseth for his many ideas and contributions.
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-;; Commentary:
+;;; Commentary:
;; Extended completion for the Emacs minibuffer.
;;
;; is supported in include file names.
-;; Code:
+;;; Code:
(defvar PC-meta-flag t
"*If nil, TAB does normal Emacs completion and M-TAB does Partial Completion.
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 legal Emacs regular expression
-(not containing character ranges like `a-z').")
+\(not containing character ranges like `a-z').")
(defvar PC-first-char 'x
(if (or (eq flag 'complete)
(not minibuffer-completion-confirm))
(exit-minibuffer)
- (PC-temp-minibuffer-message " (Confirm)"))))))
+ (PC-temp-minibuffer-message " [Confirm]"))))))
(defun PC-completion-help ()
(filename (memq table '(read-file-name-internal
read-directory-name-internal)))
(dirname nil)
+ dirlength
(str (buffer-substring beg end))
(incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str)))
(ambig nil)
(PC-is-complete-p str table pred))
'complete
+ ;; Record how many characters at the beginning are not included
+ ;; in completion.
+ (setq dirlength
+ (if filename
+ (length (file-name-directory str))
+ 0))
+
;; Do substitutions in directory names
(and filename
(not (equal str (setq p (substitute-in-file-name str))))
(PC-do-completion 'word))
(beep)
(PC-temp-minibuffer-message (if ambig
- " (Ambiguous dir name)"
+ " [Ambiguous dir name]"
(if (eq mode 'help)
- " (No completions)"
- " (No match)")))
+ " [No completions]"
+ " [No match]")))
nil))
;; More than one valid completion found
(while (and p
(not (equal (car p) basestr)))
(setq p (cdr p)))
- (if p
-
- (progn
- (if (null mode)
- (PC-temp-minibuffer-message " (Complete, but not unique)"))
- t)
+ (and p (null mode)
+ (PC-temp-minibuffer-message " [Complete, but not unique]"))
+ (if (and p
+ (not (and (null mode)
+ (eq this-command last-command))))
+ t
;; If ambiguous, try for a partial completion
(let ((improved nil)
(delete-char 1)
(setq end (1- end))))
(setq improved t))
- (insert (substring prefix i (1+ i)))
+ ;; Use format to discard text properties.
+ (insert (format "%s" (substring prefix i (1+ i))))
(setq end (1+ end)))
(setq i (1+ i)))
(or pt (equal (point) beg)
;; If totally ambiguous, display a list of completions
(if (or completion-auto-help
(eq mode 'help))
- (with-output-to-temp-buffer " *Completions*"
- (display-completion-list (sort helpposs 'string-lessp)))
- (PC-temp-minibuffer-message " (Next char not unique)"))
+ (with-output-to-temp-buffer "*Completions*"
+ (display-completion-list (sort helpposs 'string-lessp))
+ (save-excursion
+ (set-buffer standard-output)
+ ;; Record which part of the buffer we are completing
+ ;; so that choosing a completion from the list
+ ;; knows how much old text to replace.
+ (setq completion-base-size dirlength)))
+ (PC-temp-minibuffer-message " [Next char not unique]"))
nil)))))
;; Only one possible completion
(t
(if (equal basestr (car poss))
(if (null mode)
- (PC-temp-minibuffer-message " (Sole completion)"))
+ (PC-temp-minibuffer-message " [Sole completion]"))
(delete-region beg end)
- (insert (if filename
- (substitute-in-file-name (concat dirname (car poss)))
- (car poss))))
+ (insert (format "%s"
+ (if filename
+ (substitute-in-file-name (concat dirname (car poss)))
+ (car poss)))))
t)))))