'action #'elopher-click-link
'follow-link t
'help-echo help-string))
- (?7 (elopher-insert-margin "S")
+ (?7 (elopher-insert-margin "S") ; Query
(insert-text-button display-string
'face elopher-search-face
'elopher-node (elopher-make-node elopher-current-node
'action #'elopher-click-link
'follow-link t
'help-echo help-string))
- (?h (elopher-insert-margin "W")
+ (?h (elopher-insert-margin "W") ; Web link
(let ((url (elt (split-string selector "URL:") 1)))
(insert-text-button display-string
'face elopher-http-face
;; Text retrieval
(defun elopher-process-text (string)
- (let ((chopped-str (replace-regexp-in-string "\r\n\.\r\n$" "\r\n" string)))
- (replace-regexp-in-string "\r" "" chopped-str)))
+ (let* ((chopped-str (replace-regexp-in-string "\r\n\.\r\n$" "\r\n" string))
+ (cleaned-str (replace-regexp-in-string "\r" "" chopped-str)))
+ (elopher-buttonify-urls cleaned-str)))
+
+(defvar elopher-url-regex "\\https?://\\([a-z.\-]+\\)\\([^ \r\n\t(),]*\\)")
+
+(defun elopher-buttonify-urls (string)
+ (with-temp-buffer
+ (insert string)
+ (goto-char (point-min))
+ (while (re-search-forward elopher-url-regex nil t)
+ (let ((url (match-string 0)))
+ (make-text-button (match-beginning 0)
+ (match-end 0)
+ 'elopher-url url
+ 'action #'elopher-click-url
+ 'follow-link t
+ 'help-echo (format "mouse-1, RET: open url %s" url))))
+ (buffer-string)))
(defun elopher-get-text-node ()
(let ((content (elopher-node-content elopher-current-node))
(defun elopher-get-node-download ()
(let* ((address (elopher-node-address elopher-current-node))
(selector (elopher-address-selector address)))
- (unwind-protect
- (let* ((filename-proposal (file-name-nondirectory selector))
- (filename (read-file-name "Save file as: "
- nil nil nil
- (if (> (length filename-proposal) 0)
- filename-proposal
- "gopher.file"))))
- (message "Downloading...")
- (setq elopher-download-filename filename)
- (elopher-get-selector address
- (lambda (proc event)
- (let ((coding-system-for-write 'binary))
- (with-temp-file elopher-download-filename
- (insert elopher-selector-string)))
+ (elopher-visit-parent-node) ; Do first in case of non-local exits.
+ (let* ((filename-proposal (file-name-nondirectory selector))
+ (filename (read-file-name "Save file as: "
+ nil nil nil
+ (if (> (length filename-proposal) 0)
+ filename-proposal
+ "gopher.file"))))
+ (message "Downloading...")
+ (setq elopher-download-filename filename)
+ (elopher-get-selector address
+ (lambda (proc event)
+ (let ((coding-system-for-write 'binary))
+ (with-temp-file elopher-download-filename
+ (insert elopher-selector-string)
(message (format "Download complate, saved to file %s."
- elopher-download-filename)))))
- (elopher-visit-parent-node))))
-
+ elopher-download-filename)))))))))
+
;;; Navigation procedures
;;