diff options
Diffstat (limited to 'lisp/htmlfontify.el')
| -rw-r--r-- | lisp/htmlfontify.el | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 115f67c9560..dbcc152c15d 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -77,11 +77,10 @@ ;; Changes: moved to changelog (CHANGES) file. ;;; Code: + (eval-when-compile (require 'cl-lib)) (require 'cus-edit) -(require 'htmlfontify-loaddefs) - (defconst htmlfontify-version 0.21) (defconst hfy-meta-tags @@ -363,7 +362,7 @@ the etags output on stdout. Two canned commands are provided - they drive Emacs's etags and exuberant-ctags' etags respectively." :tag "etags-command" - :type (let ((clist (list '(string)))) + :type (let ((clist (list '(string) '(const :tag "None" nil)))) (dolist (C hfy-etags-cmd-alist) (push (list 'const :tag (car C) (cdr C)) clist)) (cons 'choice clist))) @@ -1156,14 +1155,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 @@ -1253,8 +1244,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) @@ -2307,10 +2298,6 @@ See also `hfy-load-tags-cache'." (interactive "D source directory: ") (hfy-load-tags-cache (directory-file-name srcdir))) -;;(defun hfy-test-read-args (foo bar) -;; (interactive "D source directory: \nD target directory: ") -;; (message "foo: %S\nbar: %S" foo bar)) - (defun hfy-save-kill-buffers (buffer-list &optional dstdir) (dolist (B buffer-list) (set-buffer B) @@ -2412,6 +2399,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 |