Removed "tab" instruction (is wrong if helm-mode is acive)

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 6049d0d..ed1ab29 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -187,15 +187,15 @@ use as the start page."
 
 (defun elpher-address-selector (address)
   "Retrieve selector from ADDRESS."
-  (car address))
+  (elt address 0))
 
 (defun elpher-address-host (address)
   "Retrieve host from ADDRESS."
-  (cadr address))
+  (elt address 1))
 
 (defun elpher-address-port (address)
   "Retrieve port from ADDRESS."
-  (caddr address))
+  (elt address 2))
 
 ;; Node
 
@@ -323,7 +323,7 @@ content and cursor position fields of the node."
     (if type-map-entry
         (let ((getter (car type-map-entry))
               (margin-code (cadr type-map-entry))
-              (face (caddr type-map-entry)))
+              (face (elt type-map-entry 2)))
           (elpher-insert-margin margin-code)
           (insert-text-button display-string
                               'face face
@@ -622,13 +622,15 @@ The result is stored as a string in the variable ‘elpher-selector-string’."
   (push-button))
 
 (defun elpher-go ()
-  "Go to a particular gopher site."
+  "Go to a particular gopher site read from the minibuffer.
+The site may be specified via a URL or explicitly in terms of
+host, selector and port."
   (interactive)
   (let ((node
          (let ((host-or-url (read-string "Gopher host or URL: ")))
            (if (string-match elpher-url-regex host-or-url)
                (if (not (string= (downcase (match-string 1 host-or-url)) "gopher"))
-                   (error "Only gopher URLs acceptable.")
+                   (error "Only gopher URLs acceptable")
                  (let* ((host (match-string 2 host-or-url))
                         (port (if (match-string 3 host-or-url)
                                   (string-to-number (substring (match-string 3 host-or-url) 1))
@@ -710,7 +712,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))
-                     (completing-read "Directory entry/link (tab to autocomplete): "
+                     (completing-read "Directory item/link: "
                                       link-map nil t))))
           (if (and key (> (length key) 0))
               (let ((b (cdr (assoc key link-map))))