[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7cd2ba9484 2/3: Remove Emacs 22 compat code from htmlfontify.el
From: |
Stefan Kangas |
Subject: |
master 7cd2ba9484 2/3: Remove Emacs 22 compat code from htmlfontify.el |
Date: |
Sat, 14 May 2022 12:01:57 -0400 (EDT) |
branch: master
commit 7cd2ba94847acce703d7e0fbf30a6bdf86cdc760
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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 9ea27f2465..a809e61da7 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