Commit fc21ed03 authored by Karl Heuer's avatar Karl Heuer
Browse files

(PC-do-completion): Remove text properties from

completions; also use string-equal instead of equal.
parent 086eac13
...@@ -409,7 +409,9 @@ of `minibuffer-completion-table' and the minibuffer contents.") ...@@ -409,7 +409,9 @@ of `minibuffer-completion-table' and the minibuffer contents.")
(setq p compl) (setq p compl)
(while p (while p
(and (string-match regex (car p)) (and (string-match regex (car p))
(setq poss (cons (car p) poss))) (progn
(set-text-properties 0 (length (car p)) '() (car p))
(setq poss (cons (car p) poss))))
(setq p (cdr p))))) (setq p (cdr p)))))
;; Now we have a list of possible completions ;; Now we have a list of possible completions
...@@ -463,7 +465,7 @@ of `minibuffer-completion-table' and the minibuffer contents.") ...@@ -463,7 +465,7 @@ of `minibuffer-completion-table' and the minibuffer contents.")
;; Is the actual string one of the possible completions? ;; Is the actual string one of the possible completions?
(setq p (and (not (eq mode 'help)) poss)) (setq p (and (not (eq mode 'help)) poss))
(while (and p (while (and p
(not (equal (car p) basestr))) (not (string-equal (car p) basestr)))
(setq p (cdr p))) (setq p (cdr p)))
(and p (null mode) (and p (null mode)
(PC-temp-minibuffer-message " [Complete, but not unique]")) (PC-temp-minibuffer-message " [Complete, but not unique]"))
...@@ -507,8 +509,7 @@ of `minibuffer-completion-table' and the minibuffer contents.") ...@@ -507,8 +509,7 @@ of `minibuffer-completion-table' and the minibuffer contents.")
(delete-char 1) (delete-char 1)
(setq end (1- end)))) (setq end (1- end))))
(setq improved t)) (setq improved t))
;; Use format to discard text properties. (insert (substring prefix i (1+ i)))
(insert (format "%s" (substring prefix i (1+ i))))
(setq end (1+ end))) (setq end (1+ end)))
(setq i (1+ i))) (setq i (1+ i)))
(or pt (equal (point) beg) (or pt (equal (point) beg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment