From 7cd2ba94847acce703d7e0fbf30a6bdf86cdc760 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 13 May 2022 23:50:43 +0200 Subject: [PATCH] Remove Emacs 22 compat code from htmlfontify.el * lisp/htmlfontify.el (hfy-prop-invisible-p): Redefine as obsolete function alias for invisible-p. Update all callers. --- lisp/htmlfontify.el | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 9ea27f24653..a809e61da73 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1157,14 +1157,6 @@ The default handler is `hfy-face-to-css-default'. See also `hfy-face-to-style'.") -(defalias 'hfy-prop-invisible-p - (if (fboundp 'invisible-p) #'invisible-p - (lambda (prop) - "Is text property PROP an active invisibility property?" - (or (and (eq buffer-invisibility-spec t) prop) - (or (memq prop buffer-invisibility-spec) - (assq prop buffer-invisibility-spec)))))) - (defun hfy-find-invisible-ranges () "Return a list of (start-point . end-point) cons cells of invisible regions." (save-excursion @@ -1254,8 +1246,8 @@ return a `defface' style list of face properties instead of a face symbol." (when face-name (setq base-face face-name)) (dolist (P overlay-data) (let ((iprops (cadr (memq 'invisible P)))) ;FIXME: plist-get? - ;;(message "(hfy-prop-invisible-p %S)" iprops) - (when (and iprops (hfy-prop-invisible-p iprops)) + ;;(message "(invisible-p %S)" iprops) + (when (and iprops (invisible-p iprops)) (setq extra-props (cons :invisible (cons t extra-props))) )) (let ((fprops (cadr (or (memq 'face P) @@ -2409,6 +2401,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'." (declare (obsolete seq-intersection "28.1")) (nreverse (seq-intersection set-a set-b #'eq))) +(define-obsolete-function-alias 'hfy-prop-invisible-p #'invisible-p "29.1") + (provide 'htmlfontify) ;;; htmlfontify.el ends here -- 2.39.2