The Lambda Lab
/
projects
/
elpher.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed grammar in readme.
[elpher.git]
/
elpher.el
diff --git
a/elpher.el
b/elpher.el
index
12ef1c8
..
25acb24
100644
(file)
--- a/
elpher.el
+++ b/
elpher.el
@@
-116,48
+116,44
@@
;; Face customizations
(defface elpher-index
;; Face customizations
(defface elpher-index
- '((((background dark)) :foreground "deep sky blue")
- (((background light)) :foreground "blue"))
- "Face used for index records.")
+ '((t :inherit org-drawer))
+ "Face used for directory type directory records.")
(defface elpher-text
(defface elpher-text
- '((((background dark)) :foreground "white")
- (((background light)) :weight bold))
- "Face used for text records.")
+ '((t :inherit org-tag))
+ "Face used for text type directory records.")
-(defface elpher-info '()
- "Face used for info records.")
+(defface elpher-info
+ '((t :inherit org-default))
+ "Face used for info type directory records.")
(defface elpher-image
(defface elpher-image
- '((((background dark)) :foreground "green")
- (t :foreground "dark green"))
- "Face used for image records.")
+ '((t :inherit org-level-4))
+ "Face used for image type directory records.")
(defface elpher-search
(defface elpher-search
- '((((background light)) :foreground "orange")
- (((background dark)) :foreground "dark orange"))
- "Face used for search records.")
+ '((t :inherit org-level-5))
+ "Face used for search type directory records.")
(defface elpher-url
(defface elpher-url
- '((((background dark)) :foreground "yellow")
- (((background light)) :foreground "dark red"))
- "Face used for url records.")
+ '((t :inherit org-level-6))
+ "Face used for url type directory records.")
(defface elpher-binary
(defface elpher-binary
- '((t :
foreground "magenta"
))
- "Face used for binary records.")
+ '((t :
inherit org-level-7
))
+ "Face used for binary
type directory
records.")
(defface elpher-unknown
(defface elpher-unknown
- '((t :
foreground "red"
))
- "Face used for
unknown recor
d types.")
+ '((t :
inherit org-warning
))
+ "Face used for
directory records with unknown/unsupporte
d types.")
(defface elpher-margin-key
(defface elpher-margin-key
- '((
((background dark)) :foreground "white"
))
- "Face used for margin key.")
+ '((
t :inherit org-tag
))
+ "Face used for
directory
margin key.")
(defface elpher-margin-brackets
(defface elpher-margin-brackets
- '((t :
foreground "blue"
))
- "Face used for brackets around margin key.")
+ '((t :
inherit org-special-keyword
))
+ "Face used for brackets around
directory
margin key.")
;; Other customizations
;; Other customizations
@@
-292,7
+288,9
@@
content and cursor position fields of the node."
(defun elpher-insert-index (string)
"Insert the index corresponding to STRING into the current buffer."
(defun elpher-insert-index (string)
"Insert the index corresponding to STRING into the current buffer."
- (dolist (line (split-string string "\r\n"))
+ ;; Should be able to split directly on CRLF, but some non-conformant
+ ;; LF-only servers sadly exist, hence the following.
+ (dolist (line (split-string (replace-regexp-in-string "\r" "" string) "\n"))
(unless (= (length line) 0)
(elpher-insert-index-record line))))
(unless (= (length line) 0)
(elpher-insert-index-record line))))
@@
-330,13
+328,13
@@
content and cursor position fields of the node."
getter)
'action #'elpher-click-link
'follow-link t
getter)
'action #'elpher-click-link
'follow-link t
- 'help-echo (format "mouse-1, RET: open
%s
on %s port %s"
+ 'help-echo (format "mouse-1, RET: open
'%s'
on %s port %s"
selector host port)))
(pcase type
selector host port)))
(pcase type
- (?i (elpher-insert-margin) ; Information
+ (?i (elpher-insert-margin) ;
;
Information
(insert (propertize display-string
'face 'elpher-info)))
(insert (propertize display-string
'face 'elpher-info)))
- (?h (elpher-insert-margin "W") ; Web link
+ (?h (elpher-insert-margin "W") ;
;
Web link
(let ((url (elt (split-string selector "URL:") 1)))
(insert-text-button display-string
'face 'elpher-url
(let ((url (elt (split-string selector "URL:") 1)))
(insert-text-button display-string
'face 'elpher-url
@@
-344,7
+342,7
@@
content and cursor position fields of the node."
'action #'elpher-click-url
'follow-link t
'help-echo (format "mouse-1, RET: open url %s" url))))
'action #'elpher-click-url
'follow-link t
'help-echo (format "mouse-1, RET: open url %s" url))))
- (?.) ; Occurs at end of index, can safely ignore.
+ (?.) ;
;
Occurs at end of index, can safely ignore.
(tp (elpher-insert-margin (concat (char-to-string tp) "?"))
(insert (propertize display-string
'face 'elpher-unknown-face)))))
(tp (elpher-insert-margin (concat (char-to-string tp) "?"))
(insert (propertize display-string
'face 'elpher-unknown-face)))))
@@
-438,7
+436,7
@@
The result is stored as a string in the variable ‘elpher-selector-string’."
getter)
'action #'elpher-click-link
'follow-link t
getter)
'action #'elpher-click-link
'follow-link t
- 'help-echo (format "mouse-1, RET: open
%s
on %s port %s"
+ 'help-echo (format "mouse-1, RET: open
'%s'
on %s port %s"
selector host port)))
(make-text-button (match-beginning 0)
(match-end 0)
selector host port)))
(make-text-button (match-beginning 0)
(match-end 0)
@@
-680,7
+678,7
@@
The result is stored as a string in the variable ‘elpher-selector-string’."
(let* ((link-map (elpher-build-link-map)))
(if link-map
(let ((key (let ((completion-ignore-case t))
(let* ((link-map (elpher-build-link-map)))
(if link-map
(let ((key (let ((completion-ignore-case t))
- (completing-read "
Menu item
: " link-map nil t))))
+ (completing-read "
Directory entry/link (tab to autocomplete)
: " link-map nil t))))
(if (and key (> (length key) 0))
(let ((b (cdr (assoc key link-map))))
(goto-char (button-start b))
(if (and key (> (length key) 0))
(let ((b (cdr (assoc key link-map))))
(goto-char (button-start b))