Added ?P and ?s to the list of known item types.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 7b41911..e94b3a3 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -76,6 +76,8 @@
     (?p elpher-get-image-node "img" elpher-image)
     (?I elpher-get-image-node "img" elpher-image)
     (?d elpher-get-node-download "doc" elpher-binary)
+    (?P elpher-get-node-download "doc" elpher-binary)
+    (?s elpher-get-node-download "snd" elpher-binary)
     (?h elpher-get-url-node "url" elpher-url)
     (bookmarks elpher-get-bookmarks-node "#" elpher-index)
     (start elpher-get-start-node "#" elpher-index))
@@ -760,7 +762,7 @@ calls, as is necessary if the match is performed by `string-match'."
            " - RET/mouse-1: open item under cursor\n"
            " - m: select an item on current page by name (autocompletes)\n"
            " - u: return to previous page\n"
-           " - O: visit the root menu of the current server\n"
+           " - o/O: visit different selector or the root menu of the current server\n"
            " - g: go to a particular gopher address\n"
            " - i/I: info on item under cursor or current page\n"
            " - c/C: copy URL representation of item under cursor or current page\n"
@@ -791,7 +793,11 @@ calls, as is necessary if the match is performed by `string-match'."
                                    (info "(elpher)"))
                          'follow-link t
                          'help-echo help-string))
-   (insert " for full documentation. **")
+   (insert " for the full documentation. **\n")
+   (insert (propertize
+            (concat "  (This should be available if you have installed Elpher using\n"
+                    "   MELPA. Otherwise you will have to install the manual yourself.)")
+            'face 'shadow))
    (elpher-restore-pos)))
 
 ;; Bookmarks page node retrieval
@@ -910,6 +916,19 @@ host, selector and port."
     (switch-to-buffer "*elpher*")
     (elpher-visit-node node)))
 
+(defun elpher-go-current ()
+  "Go to a particular site read from the minibuffer, initialized with the current URL."
+  (interactive)
+  (let ((address (elpher-node-address elpher-current-node)))
+    (if (elpher-address-special-p address)
+        (error "Command not valid for this page")
+      (let ((url (read-string "URL: " (elpher-get-address-url address))))
+        (if (string-match elpher-url-regex url)
+            (let ((new-node (elpher-make-node-from-matched-url url)))
+              (unless (equal (elpher-node-address new-node) address)
+                (elpher-visit-node new-node)))
+          (error "Could not parse URL %s" url))))))
+
 (defun elpher-redraw ()
   "Redraw current page."
   (interactive)
@@ -1165,6 +1184,7 @@ host, selector and port."
     (define-key map (kbd "u") 'elpher-back)
     (define-key map (kbd "O") 'elpher-root-dir)
     (define-key map (kbd "g") 'elpher-go)
+    (define-key map (kbd "o") 'elpher-go-current)
     (define-key map (kbd "r") 'elpher-redraw)
     (define-key map (kbd "R") 'elpher-reload)
     (define-key map (kbd "T") 'elpher-toggle-tls)
@@ -1190,6 +1210,7 @@ host, selector and port."
         (kbd "u") 'elpher-back
         (kbd "O") 'elpher-root-dir
         (kbd "g") 'elpher-go
+        (kbd "o") 'elpher-go-current
         (kbd "r") 'elpher-redraw
         (kbd "R") 'elpher-reload
         (kbd "T") 'elpher-toggle-tls