mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

* minibuffer.el (completion-hilit-commonality): Revert 2014-03-01 short-cut,

Browse source 
which changed the return value.

Fixes: debbugs:16933
This commit is contained in:
Glenn Morris 2014-03-04 09:01:37 -08:00
parent f604dfdc36
commit 3106d59bce
2 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-04 Glenn Morris <rgm@gnu.org>
* minibuffer.el (completion-hilit-commonality):
Revert 2014-03-01 short-cut, which changed the return value. (Bug#16933)
2014-03-04 Juanma Barranquero <lekktu@gmail.com>
* hilit-chg.el (hilit-chg-unload-function): New function.

58
lisp/minibuffer.el
View file

@ -1597,36 +1597,34 @@ This adds the face `completions-common-part' to the first
It returns a list with font-lock properties applied to each element,
and with BASE-SIZE appended as the last element."
(when completions
(if (zerop prefix-len)
completions
(let ((com-str-len (- prefix-len (or base-size 0))))
(nconc
(mapcar
(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)))))
(font-lock-prepend-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))
'face 'completions-common-part str)
(if (> (length str) com-str-len)
(font-lock-prepend-text-property com-str-len (1+ com-str-len)
'face
'completions-first-difference
str)))
elem)
completions)
base-size)))))
(let ((com-str-len (- prefix-len (or base-size 0))))
(nconc
(mapcar
(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)))))
(font-lock-prepend-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))
'face 'completions-common-part str)
(if (> (length str) com-str-len)
(font-lock-prepend-text-property com-str-len (1+ com-str-len)
'face
'completions-first-difference
str)))
elem)
completions)
base-size))))
(defun display-completion-list (completions &optional common-substring)
"Display the list of completions, COMPLETIONS, using `standard-output'.