aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorAlan Mackenzie2022-01-22 11:02:50 +0000
committerAlan Mackenzie2022-01-22 11:02:50 +0000
commit14d64a8adcc866deecd758b898e8ef2d836b354a (patch)
tree83cff9669e266f8e283ccb8cd7518e909240f1e1 /lisp/faces.el
parentbdd9b5b8a0d37dd09ee530c1dab3a44bee09e0f8 (diff)
parentebe334cdc234de2897263aed4c05ac7088c11857 (diff)
downloademacs-scratch/correct-warning-pos.tar.gz
emacs-scratch/correct-warning-pos.zip
Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el10
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index df099787698..bb9b1e979fa 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1107,6 +1107,16 @@ returned. Otherwise, DEFAULT is returned verbatim."
1107 (let ((prompt (if default 1107 (let ((prompt (if default
1108 (format-prompt prompt default) 1108 (format-prompt prompt default)
1109 (format "%s: " prompt))) 1109 (format "%s: " prompt)))
1110 (completion-extra-properties
1111 '(:affixation-function
1112 (lambda (faces)
1113 (mapcar
1114 (lambda (face)
1115 (list (concat (propertize "SAMPLE" 'face face)
1116 "\t")
1117 ""
1118 face))
1119 faces))))
1110 aliasfaces nonaliasfaces faces) 1120 aliasfaces nonaliasfaces faces)
1111 ;; Build up the completion tables. 1121 ;; Build up the completion tables.
1112 (mapatoms (lambda (s) 1122 (mapatoms (lambda (s)