summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2022-08-12 15:07:18 +0200
committerJonas Bernoulli <jonas@bernoul.li>2024-07-06 17:37:23 +0200
commitf74612686b468069849ab36d1c49229312f3434e (patch)
treed2cb53b6a412a06e02175c8054b898a54250c7be
parent67f727855895050aca3bcf37066e804dc8f307de (diff)
downloadgeiser-f74612686b468069849ab36d1c49229312f3434e.tar.gz
geiser-f74612686b468069849ab36d1c49229312f3434e.tar.bz2
Buttons live in their own namespace
`geiser-doc--xbutton' will be tackled in the next commit.
-rw-r--r--elisp/geiser-doc.el6
-rw-r--r--elisp/geiser-edit.el6
-rw-r--r--elisp/geiser-image.el4
-rw-r--r--elisp/geiser-xref.el4
4 files changed, 10 insertions, 10 deletions
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 2ebe39b..4c04cd6 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -149,14 +149,14 @@ value if the default action should be skipped.")
(let ((link (button-get button 'geiser-link)))
(when link (geiser-doc--follow-link link))))
-(define-button-type 'geiser-doc--button
+(define-button-type 'geiser-doc
'action 'geiser-doc--button-action
'follow-link t)
(defun geiser-doc--make-module-button (beg end module impl)
(let ((link (geiser-doc--make-link nil module impl))
(help (format "Help for module %s" module)))
- (make-text-button beg end :type 'geiser-doc--button
+ (make-text-button beg end :type 'geiser-doc
'face 'geiser-font-lock-doc-link
'geiser-link link
'help-echo help)))
@@ -171,7 +171,7 @@ value if the default action should be skipped.")
(if target (format "%s in " target) "")
(or module "<unknown>"))))
(insert-text-button text
- :type 'geiser-doc--button
+ :type 'geiser-doc
'face 'geiser-font-lock-doc-link
'geiser-link link
'help-echo help)))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 54f6c62..0d47cbe 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -164,7 +164,7 @@ or following links in error buffers.")
;;; Links
-(define-button-type 'geiser-edit--button
+(define-button-type 'geiser-edit
'action 'geiser-edit--button-action
'face 'geiser-font-lock-error-link
'follow-link t)
@@ -176,7 +176,7 @@ or following links in error buffers.")
(defun geiser-edit--make-link (beg end file line col &optional method)
(make-button beg end
- :type 'geiser-edit--button
+ :type 'geiser-edit
'geiser-method method
'geiser-location
(geiser-edit--make-location 'error file line col)
@@ -210,7 +210,7 @@ or following links in error buffers.")
(while (> n 0)
(let ((b (ignore-errors (funcall nxt 1))))
(unless b (setq n 0))
- (when (and b (eq (button-type b) 'geiser-edit--button))
+ (when (and b (eq (button-type b) 'geiser-edit))
(setq n (- n 1))
(when (<= n 0)
(setq found t)
diff --git a/elisp/geiser-image.el b/elisp/geiser-image.el
index fc2c49d..8476954 100644
--- a/elisp/geiser-image.el
+++ b/elisp/geiser-image.el
@@ -76,13 +76,13 @@ images in `geiser-image--cache-dir'."
(let ((file (button-get button 'geiser-image-file)))
(when (file-exists-p file) (geiser-image--display file))))
-(define-button-type 'geiser-image--button
+(define-button-type 'geiser-image
'action 'geiser-image--button-action
'follow-link t)
(defun geiser-image--insert-button (file)
(insert-text-button "[image]"
- :type 'geiser-image--button
+ :type 'geiser-image
'face 'geiser-font-lock-image-button
'geiser-image-file file
'help-echo "Click to display image"))
diff --git a/elisp/geiser-xref.el b/elisp/geiser-xref.el
index 8f982ff..aa64f17 100644
--- a/elisp/geiser-xref.el
+++ b/elisp/geiser-xref.el
@@ -61,7 +61,7 @@
;;; Ref button:
-(define-button-type 'geiser-xref--button
+(define-button-type 'geiser-xref
'action 'geiser-xref--button-action
'face 'geiser-font-lock-xref-link
'follow-link t)
@@ -85,7 +85,7 @@
(insert " - ")
(if (stringp file)
(insert-text-button signature-txt
- :type 'geiser-xref--button
+ :type 'geiser-xref
'location location
'name (car signature)
'help-echo (format "%s in %s"