From: Lars Ingebrigtsen Date: Sun, 14 Jul 2019 16:37:55 +0000 (+0200) Subject: Revert "Make describe-face also output the version information" X-Git-Tag: emacs-27.0.90~1913 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=636dc37c70abf3c41261d035e06e2713070ce8cd;p=emacs.git Revert "Make describe-face also output the version information" This reverts commit a7aae1473c1aed7758b550a23cda61ee17668e23. The patch broke the build. --- diff --git a/lisp/faces.el b/lisp/faces.el index c3ef7dcb0f7..f9e8c6c58b8 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -25,8 +25,6 @@ ;;; Code: -(require 'subr-x) - (defcustom term-file-prefix (purecopy "term/") "If non-nil, Emacs startup performs terminal-specific initialization. It does this by: (load (concat term-file-prefix (getenv \"TERM\"))) @@ -1418,8 +1416,6 @@ argument, prompt for a regular expression using `read-regexp'." (dolist (face (face-list)) (copy-face face face frame disp-frame))))) -(declare-function describe-variable-custom-version-info "help-fns" - (variable &optional type)) (defun describe-face (face &optional frame) "Display the properties of face FACE on FRAME. @@ -1432,7 +1428,6 @@ If FRAME is omitted or nil, use the selected frame." (interactive (list (read-face-name "Describe face" (or (face-at-point t) 'default) t))) - (require 'help-fns) (let* ((attrs '((:family . "Family") (:foundry . "Foundry") (:width . "Width") @@ -1529,11 +1524,7 @@ If FRAME is omitted or nil, use the selected frame." (re-search-backward ": \\([^:]+\\)" nil t) (help-xref-button 1 'help-face attr))) (insert "\n"))))) - (terpri) - (when-let ((version-info (describe-variable-custom-version-info - f 'face))) - (insert version-info)) - (terpri))))))) + (terpri))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 0b5c547d6b0..39f701ae2a8 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -860,15 +860,14 @@ If ANY-SYMBOL is non-nil, don't insist the symbol be bound." (and (or any-symbol (boundp sym)) sym))))) 0))) -(defun describe-variable-custom-version-info (variable &optional type) +(defun describe-variable-custom-version-info (variable) (let ((custom-version (get variable 'custom-version)) (cpv (get variable 'custom-package-version)) - (type (or type "variable")) (output nil)) (if custom-version (setq output - (format "This %s was introduced, or its default value was changed, in\nversion %s of Emacs.\n" - type custom-version)) + (format "This variable was introduced, or its default value was changed, in\nversion %s of Emacs.\n" + custom-version)) (when cpv (let* ((package (car-safe cpv)) (version (if (listp (cdr-safe cpv)) @@ -878,11 +877,11 @@ If ANY-SYMBOL is non-nil, don't insist the symbol be bound." (emacsv (cdr (assoc version pkg-versions)))) (if (and package version) (setq output - (format (concat "This %s was introduced, or its default value was changed, in\nversion %s of the %s package" + (format (concat "This variable was introduced, or its default value was changed, in\nversion %s of the %s package" (if emacsv (format " that is part of Emacs %s" emacsv)) ".\n") - type version package)))))) + version package)))))) output)) ;;;###autoload