[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 5f0e30be2e 8/9: Remove compatibility functions
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sweeprolog 5f0e30be2e 8/9: Remove compatibility functions for buttonizing text. |
Date: |
Fri, 18 Aug 2023 04:00:18 -0400 (EDT) |
branch: elpa/sweeprolog
commit 5f0e30be2ee76c23729fd69ad12caa55e858d404
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
Remove compatibility functions for buttonizing text.
* sweeprolog.el (sweeprolog-render-html-span)
(sweeprolog-render-html-a)
(sweeprolog--describe-module)
(sweeprolog--describe-predicate): Use 'buttonize' and
'buttonize-region' instead of...
(sweeprolog--buttonize, sweeprolog--buttonize-region): Removed.
---
sweeprolog.el | 47 +++++++++--------------------------------------
1 file changed, 9 insertions(+), 38 deletions(-)
diff --git a/sweeprolog.el b/sweeprolog.el
index 0968365411..2036a03678 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -1471,9 +1471,9 @@ resulting list even when found in the current clause."
(save-excursion
(goto-char beg)
(save-match-data
- (while (search-forward-regexp (rx bow (or "_" upper)
- (* alnum))
- end t)
+ (while (re-search-forward (rx bow (or "_" upper)
+ (* alnum))
+ end t)
(unless (nth 8 (syntax-ppss))
(let ((match (match-string-no-properties 0)))
(unless (or (member match exclude)
@@ -5190,35 +5190,6 @@ accordingly."
(interactive)
(view-file (expand-file-name "NEWS.org" sweeprolog--directory)))
-(defun sweeprolog--buttonize (string callback data)
- (if (fboundp 'buttonize)
- (buttonize string callback data)
- (if (fboundp 'button-buttonize)
- (button-buttonize string callback data)
- (propertize string
- 'face 'button
- 'button t
- 'follow-link t
- 'category t
- 'button-data data
- 'keymap button-map
- 'action callback))))
-
-(defun sweeprolog--buttonize-region (start end callback data)
- (if (fboundp 'buttonize-region)
- (buttonize-region start end callback data)
- (add-text-properties start end
- (list 'font-lock-face 'button
- 'mouse-face 'highlight
- 'help-echo nil
- 'button t
- 'follow-link t
- 'category t
- 'button-data data
- 'keymap button-map
- 'action callback))
- (add-face-text-property start end 'button t)))
-
(defun sweeprolog-render-html-span (dom)
(if (string= "fn-text" (dom-attr dom 'class))
(progn (insert " ")
@@ -5239,7 +5210,7 @@ accordingly."
"/"
(one-or-more digit) eos)
target)
- (sweeprolog--buttonize-region start
+ (buttonize-region start
(point)
#'sweeprolog-describe-predicate
target)))
@@ -5251,14 +5222,14 @@ accordingly."
(let ((dir (file-name-directory path))
(base (file-name-base path)))
(when (string= dir "/pldoc/doc/_SWI_/library/")
- (sweeprolog--buttonize-region start
+ (buttonize-region start
(point)
#'find-file
(concat "library(" base ")")))))
((string= path "/pldoc/man")
(pcase (url-parse-query-string query)
(`(("predicate" ,pred))
- (sweeprolog--buttonize-region start
+ (buttonize-region start
(point)
#'sweeprolog-describe-predicate
pred))))))))))
@@ -5297,10 +5268,10 @@ accordingly."
:type 'swi-prolog-module
:file path))
(if page
- (insert (sweeprolog--buttonize mod #'sweeprolog-find-module
mod)
+ (insert (buttonize mod #'sweeprolog-find-module mod)
" is a SWI-Prolog module.\n\n"
page)
- (insert (sweeprolog--buttonize mod #'sweeprolog-find-module
mod)
+ (insert (buttonize mod #'sweeprolog-find-module mod)
" is an undocumented SWI-Prolog module.")))
(insert mod " is not documented as a SWI-Prolog module."))))))
@@ -5369,7 +5340,7 @@ accordingly."
(list :symbol (intern pred)
:type 'swi-prolog-predicate
:file path))
- (insert (sweeprolog--buttonize pred
#'sweeprolog-find-predicate pred)
+ (insert (buttonize pred #'sweeprolog-find-predicate pred)
(if page
(concat " is a SWI-Prolog predicate.\n\n"
page)
- [nongnu] elpa/sweeprolog updated (2eaa3a2653 -> be195d894f), ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog 750aa2aff8 1/9: * sweeprolog.el: Require 'compat', ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog 209ac59d71 3/9: Use 'defvar-keymap' to define keymap variables., ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog b2470c020b 2/9: Use 'natnum' custom type, ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog ed2733e721 4/9: Use 'process-lines-handling-status'., ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog 226db0bd13 5/9: Use 'format-prompt'., ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog be195d894f 9/9: Announce Compat dependency and bump version to 0.23.0, ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog e8fa3f0ed5 6/9: Prefer 'pos-bol/eol' over 'line-beginning/end-position'., ELPA Syncer, 2023/08/18
- [nongnu] elpa/sweeprolog 5f0e30be2e 8/9: Remove compatibility functions for buttonizing text.,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog 03cfe0c924 7/9: Use 'without-restriction'., ELPA Syncer, 2023/08/18