;; Author: Tim Vaughan <tgvaughan@gmail.com>
;; Created: 11 April 2019
-;; Version: 2.1.1
+;; Version: 2.2.0
;; Keywords: comm gopher
;; Homepage: https://github.com/tgvaughan/elpher
;; Package-Requires: ((emacs "26"))
;;; Global constants
;;
-(defconst elpher-version "2.1.1"
+(defconst elpher-version "2.2.0"
"Current version of elpher.")
(defconst elpher-margin-width 6
"Retrieve port from ADDRESS object."
(if (symbolp address)
nil)
- (or (> (url-port address) 0)
- (and (or (equal (url-type address) "gopher")
- (equal (url-type address) "gophers"))
- 70)
- (and (equal (url-type address) "gemini")
- 1965)))
+ (if (> (url-port address) 0)
+ (url-port address)
+ (or (and (or (equal (url-type address) "gopher")
+ (equal (url-type address) "gophers"))
+ 70)
+ (and (equal (url-type address) "gemini")
+ 1965))))
(defun elpher-address-special-p (address)
"Return non-nil if ADDRESS object is special (e.g. start page, bookmarks page)."
(defun elpher-update-header ()
"If `elpher-use-header' is true, display current node info in window header."
(if elpher-use-header
- (setq header-line-format (elpher-node-display-string elpher-current-node))))
+ (let* ((display-string (elpher-node-display-string elpher-current-node))
+ (address (elpher-node-address elpher-current-node))
+ (url-string (if (elpher-address-special-p address)
+ ""
+ (concat " - " (elpher-address-to-url address) ""))))
+ (setq header-line-format (list display-string url-string)))))
(defmacro elpher-with-clean-buffer (&rest args)
"Evaluate ARGS with a clean *elpher* buffer as current."