Commit 636dc37c authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Revert "Make describe-face also output the version information"

This reverts commit a7aae147.

The patch broke the build.
parent 0c450e09
Pipeline #2433 failed with stage
......@@ -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)))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
......
......@@ -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
......
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