Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/help-fns.el (help--symbol-class): Concat chars for all namespaces.

Browse source 
Since Emacs Lisp is more than Lisp-2, separately output letters
for each namespace: functions, variables, faces, classes.
Use non-letter characters for additional properties
such as advice, obsolete, local.
(help--symbol-completion-table-affixation): Use format "%-4s".
https://lists.gnu.org/archive/html/emacs-devel/2021-06/msg00524.html
This commit is contained in:
Juri Linkov 2021-06-17 23:19:30 +03:00
parent 45acbe6d62
commit fe1b72d216
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lisp/help-fns.el
View file

@ -130,23 +130,25 @@ with the current prefix. The files are chosen according to
"Return symbol class characters for symbol S."
(when (stringp s)
(setq s (intern-soft s)))
(cond ((commandp s)
"c") ; command
((eq (car-safe (symbol-function s)) 'macro)
"m") ; macro
((fboundp s)
"f") ; function
((custom-variable-p s)
"u") ; user option
((boundp s)
"v") ; variable
((facep s)
"a") ; fAce
((and (fboundp 'cl-find-class)
(cl-find-class s))
"t") ; CL type
(" ") ; something else
))
(concat
(when (fboundp s)
(concat
(cond
((commandp s) "c")
((eq (car-safe (symbol-function s)) 'macro) "m")
(t "f"))
(and (let ((flist (indirect-function s)))
(advice--p (if (eq 'macro (car-safe flist)) (cdr flist) flist)))
"!")
(and (get s 'byte-obsolete-info) "-")))
(when (boundp s)
(concat
(if (custom-variable-p s) "u" "v")
(and (local-variable-if-set-p s) "'")
(and (ignore-errors (not (equal (symbol-value s) (default-value s)))) "*")
(and (get s 'byte-obsolete-variable) "-")))
(and (facep s) "a")
(and (fboundp 'cl-find-class) (cl-find-class s) "t")))
(defun help--symbol-completion-table-affixation (completions)
(mapcar (lambda (c)
@ -154,7 +156,7 @@ with the current prefix. The files are chosen according to
(doc (condition-case nil (documentation s) (error nil)))
(doc (and doc (substring doc 0 (string-match "\n" doc)))))
(list c (propertize
(concat (help--symbol-class s) " ") ; prefix separator
(format "%-4s" (help--symbol-class s))
'face 'completions-annotations)
(if doc (propertize (format " -- %s" doc)
'face 'completions-annotations)