Renamed package.
authorTim Vaughan <tgvaughan@gmail.com>
Sun, 28 Apr 2019 11:03:39 +0000 (13:03 +0200)
committerTim Vaughan <tgvaughan@gmail.com>
Sun, 28 Apr 2019 11:03:39 +0000 (13:03 +0200)
README.md
elpher.el [moved from elopher.el with 54% similarity]

index 81ec229..0764114 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Elopher
+# Elpher
 
-Elopher aims to provide a full-featured gopher client for GNU Emacs.
+Elpher aims to provide a full-featured gopher client for GNU Emacs.
 It supports:
 - simple keyboard and mouse-driven browsing,
 - caching of visited sites,
@@ -8,9 +8,9 @@ It supports:
 - direct visualisation of image files,
 - clickable web and gopher links in plain text.
 
-Elopher is still under development.  Planned features include:
+Elpher is still under development.  Planned features include:
 - (m)enu key support, similar to the emacs info browser,
-- support for multiple Elopher buffers.
+- support for multiple Elpher buffers.
 
 Keep the non-web internet alive!
 
@@ -20,6 +20,6 @@ Installation instructions will be added soon.
 
 ## Licence
 
-Elopher is free software and is distributed under the terms of version
+Elpher is free software and is distributed under the terms of version
 3 the GNU General Public License, which can be found in the file named
 COPYING.
similarity index 54%
rename from elopher.el
rename to elpher.el
index 7e45cab..141ab77 100644 (file)
+++ b/elpher.el
@@ -1,4 +1,4 @@
-;;; elopher.el --- elisp gopher client
+;;; elpher.el --- elisp gopher client
 
 ;;; Commentary:
 
@@ -9,19 +9,19 @@
 ;;; Global constants
 ;;
 
-(defconst elopher-version "1.0.0"
-  "Current version of elopher.")
+(defconst elpher-version "1.0.0"
+  "Current version of elpher.")
 
-(defconst elopher-margin-width 6
+(defconst elpher-margin-width 6
   "Width of left-hand margin used when rendering indicies.")
 
-(defconst elopher-start-index
+(defconst elpher-start-index
   (mapconcat
    'identity
    (list "i\tfake\tfake\t1"
          "i--------------------------------------------\tfake\tfake\t1"
-         "i          Elopher Gopher Client             \tfake\tfake\t1"
-         (format "i              version %s\tfake\tfake\t1" elopher-version)
+         "i          Elpher Gopher Client             \tfake\tfake\t1"
+         (format "i              version %s\tfake\tfake\t1" elpher-version)
          "i--------------------------------------------\tfake\tfake\t1"
          "i\tfake\tfake\t1"
          "iBasic usage:\tfake\tfake\t1"
          "7Veronica-2 Gopher Search Engine\t/v2/vs\tgopher.floodgap.com\t70"
          ".")
    "\r\n")
-  "Source for elopher start page.")
+  "Source for elpher start page.")
 
 
 ;;; Customization group
 ;;
 
-(defgroup elopher nil
+(defgroup elpher nil
   "A gopher client."
   :group 'applications)
 
-(defface elopher-index
+(defface elpher-index
   '((((background dark)) :foreground "deep sky blue")
     (((background light)) :foreground "blue"))
   "Face used for index records.")
 
-(defface elopher-text
+(defface elpher-text
   '((((background dark)) :foreground "white")
     (((background light)) :weight bold))
   "Face used for text records.")
 
-(defface elopher-info '()
+(defface elpher-info '()
   "Face used for info records.")
 
-(defface elopher-image
+(defface elpher-image
   '((((background dark)) :foreground "green")
     (t :foreground "dark green"))
   "Face used for image records.")
 
-(defface elopher-search
+(defface elpher-search
   '((((background light)) :foreground "orange")
     (((background dark)) :foreground "dark orange"))
   "Face used for search records.")
 
-(defface elopher-url
+(defface elpher-url
   '((((background dark)) :foreground "yellow")
     (((background light)) :foreground "dark red"))
   "Face used for url records.")
 
-(defface elopher-binary
+(defface elpher-binary
   '((t :foreground "magenta"))
   "Face used for binary records.")
 
-(defface elopher-unknown
+(defface elpher-unknown
   '((t :foreground "red"))
   "Face used for unknown record types.")
 
-(defface elopher-margin-key
+(defface elpher-margin-key
   '((((background dark)) :foreground "white"))
   "Face used for margin key.")
 
-(defface elopher-margin-brackets
+(defface elpher-margin-brackets
   '((t :foreground "blue"))
   "Face used for brackets around margin key.")
 
-(defcustom elopher-open-urls-with-eww nil
+(defcustom elpher-open-urls-with-eww nil
   "If non-nil, open URL selectors using eww.
 Otherwise, use the system browser via the BROWSE-URL function."
   :type '(boolean))
@@ -109,25 +109,25 @@ Otherwise, use the system browser via the BROWSE-URL function."
 
 ;; Address
 
-(defun elopher-make-address (selector host port)
+(defun elpher-make-address (selector host port)
   "Create an address of a gopher object with SELECTOR, HOST and PORT."
   (list selector host port))
 
-(defun elopher-address-selector (address)
+(defun elpher-address-selector (address)
   "Retrieve selector from ADDRESS."
   (car address))
 
-(defun elopher-address-host (address)
+(defun elpher-address-host (address)
   "Retrieve host from ADDRESS."
   (cadr address))
 
-(defun elopher-address-port (address)
+(defun elpher-address-port (address)
   "Retrieve port from ADDRESS."
   (caddr address))
 
 ;; Node
 
-(defun elopher-make-node (parent address getter &optional content pos)
+(defun elpher-make-node (parent address getter &optional content pos)
   "Create a node in the gopher page hierarchy.
 
 PARENT specifies the parent of the node, ADDRESS specifies the address of
@@ -138,66 +138,66 @@ The optional arguments CONTENT and POS can be used to fill the cached
 content and cursor position fields of the node."
   (list parent address getter content pos))
 
-(defun elopher-node-parent (node)
+(defun elpher-node-parent (node)
   "Retrieve the parent node of NODE."
   (elt node 0))
 
-(defun elopher-node-address (node)
+(defun elpher-node-address (node)
   "Retrieve the address of NODE."
   (elt node 1))
 
-(defun elopher-node-getter (node)
+(defun elpher-node-getter (node)
   "Retrieve the preferred getter function of NODE."
   (elt node 2))
 
-(defun elopher-node-content (node)
+(defun elpher-node-content (node)
   "Retrieve the cached content of NODE, or nil if none exists."
   (elt node 3))
 
-(defun elopher-node-pos (node)
+(defun elpher-node-pos (node)
   "Retrieve the cached cursor position for NODE, or nil if none exists."
   (elt node 4))
 
-(defun elopher-set-node-content (node content)
+(defun elpher-set-node-content (node content)
   "Set the content cache of NODE to CONTENT."
   (setcar (nthcdr 3 node) content))
 
-(defun elopher-set-node-pos (node pos)
+(defun elpher-set-node-pos (node pos)
   "Set the cursor position cache of NODE to POS."
   (setcar (nthcdr 4 node) pos))
 
 ;; Node graph traversal
 
-(defvar elopher-current-node)
+(defvar elpher-current-node)
 
-(defun elopher-visit-node (node &optional getter)
+(defun elpher-visit-node (node &optional getter)
   "Visit NODE using its own getter or GETTER, if non-nil."
-  (elopher-save-pos)
-  (elopher-process-cleanup)
-  (setq elopher-current-node node)
+  (elpher-save-pos)
+  (elpher-process-cleanup)
+  (setq elpher-current-node node)
   (if getter
       (funcall getter)
-    (funcall (elopher-node-getter node))))
+    (funcall (elpher-node-getter node))))
 
-(defun elopher-visit-parent-node ()
+(defun elpher-visit-parent-node ()
   "Visit the parent of the current node."
-  (let ((parent-node (elopher-node-parent elopher-current-node)))
+  (let ((parent-node (elpher-node-parent elpher-current-node)))
     (when parent-node
-      (elopher-visit-node parent-node))))
+      (elpher-visit-node parent-node))))
       
-(defun elopher-reload-current-node ()
+(defun elpher-reload-current-node ()
   "Reload the current node, discarding any existing cached content."
-  (elopher-set-node-content elopher-current-node nil)
-  (elopher-visit-node elopher-current-node))
+  (elpher-set-node-content elpher-current-node nil)
+  (elpher-visit-node elpher-current-node))
 
-(defun elopher-save-pos ()
+(defun elpher-save-pos ()
   "Save the current position of point to the current node."
-  (when elopher-current-node
-    (elopher-set-node-pos elopher-current-node (point))))
+  (when elpher-current-node
+    (elpher-set-node-pos elpher-current-node (point))))
 
-(defun elopher-restore-pos ()
+(defun elpher-restore-pos ()
   "Restore the position of point to that cached in the current node."
-  (let ((pos (elopher-node-pos elopher-current-node)))
+  (let ((pos (elpher-node-pos elpher-current-node)))
     (if pos
         (goto-char pos)
       (goto-char (point-min)))))
@@ -205,11 +205,11 @@ content and cursor position fields of the node."
 ;;; Buffer preparation
 ;;
 
-(defmacro elopher-with-clean-buffer (&rest args)
-  "Evaluate ARGS with a clean *elopher* buffer as current."
+(defmacro elpher-with-clean-buffer (&rest args)
+  "Evaluate ARGS with a clean *elpher* buffer as current."
   (list 'progn
-        '(switch-to-buffer "*elopher*")
-        '(elopher-mode)
+        '(switch-to-buffer "*elpher*")
+        '(elpher-mode)
         (append (list 'let '((inhibit-read-only t))
                       '(erase-buffer))
                 args)))
@@ -217,37 +217,37 @@ content and cursor position fields of the node."
 ;;; Index rendering
 ;;
 
-(defun elopher-insert-index (string)
+(defun elpher-insert-index (string)
   "Insert the index corresponding to STRING into the current buffer."
   (dolist (line (split-string string "\r\n"))
     (unless (= (length line) 0)
-      (elopher-insert-index-record line))))
+      (elpher-insert-index-record line))))
 
-(defun elopher-insert-margin (&optional type-name)
+(defun elpher-insert-margin (&optional type-name)
   "Insert index margin, optionally containing the TYPE-NAME, into the current buffer."
   (if type-name
       (progn
-        (insert (format (concat "%" (number-to-string (- elopher-margin-width 1)) "s")
+        (insert (format (concat "%" (number-to-string (- elpher-margin-width 1)) "s")
                         (concat
-                         (propertize "[" 'face 'elopher-margin-brackets)
-                         (propertize type-name 'face 'elopher-margin-key)
-                         (propertize "]" 'face 'elopher-margin-brackets))))
+                         (propertize "[" 'face 'elpher-margin-brackets)
+                         (propertize type-name 'face 'elpher-margin-key)
+                         (propertize "]" 'face 'elpher-margin-brackets))))
         (insert " "))
-    (insert (make-string elopher-margin-width ?\s))))
-
-(defvar elopher-type-map
-  '((?0 elopher-get-text-node "T" elopher-text)
-    (?1 elopher-get-index-node "/" elopher-index)
-    (?g elopher-get-image-node "im" elopher-image)
-    (?p elopher-get-image-node "im" elopher-image)
-    (?I elopher-get-image-node "im" elopher-image)
-    (?4 elopher-get-node-download "B" elopher-binary)
-    (?5 elopher-get-node-download "B" elopher-binary)
-    (?9 elopher-get-node-download "B" elopher-binary)
-    (?7 elopher-get-search-node "?" elopher-search))
+    (insert (make-string elpher-margin-width ?\s))))
+
+(defvar elpher-type-map
+  '((?0 elpher-get-text-node "T" elpher-text)
+    (?1 elpher-get-index-node "/" elpher-index)
+    (?g elpher-get-image-node "im" elpher-image)
+    (?p elpher-get-image-node "im" elpher-image)
+    (?I elpher-get-image-node "im" elpher-image)
+    (?4 elpher-get-node-download "B" elpher-binary)
+    (?5 elpher-get-node-download "B" elpher-binary)
+    (?9 elpher-get-node-download "B" elpher-binary)
+    (?7 elpher-get-search-node "?" elpher-search))
   "Association list from types to getters, margin codes and index faces.")
 
-(defun elopher-insert-index-record (line)
+(defun elpher-insert-index-record (line)
   "Insert the index record corresponding to LINE into the current buffer."
   (let* ((type (elt line 0))
          (fields (split-string (substring line 1) "\t"))
@@ -255,107 +255,107 @@ content and cursor position fields of the node."
          (selector (elt fields 1))
          (host (elt fields 2))
          (port (elt fields 3))
-         (address (elopher-make-address selector host port))
-         (type-map-entry (alist-get type elopher-type-map)))
+         (address (elpher-make-address selector host port))
+         (type-map-entry (alist-get type elpher-type-map)))
     (if type-map-entry
         (let ((getter (car type-map-entry))
               (margin-code (cadr type-map-entry))
               (face (caddr type-map-entry)))
-          (elopher-insert-margin margin-code)
+          (elpher-insert-margin margin-code)
           (insert-text-button display-string
                               'face face
-                              'elopher-node (elopher-make-node elopher-current-node
+                              'elpher-node (elpher-make-node elpher-current-node
                                                                address
                                                                getter)
-                              'action #'elopher-click-link
+                              'action #'elpher-click-link
                               'follow-link t
                               'help-echo (format "mouse-1, RET: open %s on %s port %s"
                                                  selector host port)))
       (pcase type
-        (?i (elopher-insert-margin) ; Information
+        (?i (elpher-insert-margin) ; Information
             (insert (propertize display-string
-                                'face 'elopher-info)))
-        (?h (elopher-insert-margin "W") ; Web link
+                                'face 'elpher-info)))
+        (?h (elpher-insert-margin "W") ; Web link
             (let ((url (elt (split-string selector "URL:") 1)))
               (insert-text-button display-string
-                                  'face 'elopher-url
-                                  'elopher-url url
-                                  'action #'elopher-click-url
+                                  'face 'elpher-url
+                                  'elpher-url 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.
-        (tp (elopher-insert-margin (concat (char-to-string tp) "?"))
+        (tp (elpher-insert-margin (concat (char-to-string tp) "?"))
             (insert (propertize display-string
-                                'face 'elopher-unknown-face)))))
+                                'face 'elpher-unknown-face)))))
     (insert "\n")))
 
 
 ;;; Selector retrieval (all kinds)
 ;;
 
-(defun elopher-process-cleanup ()
-  "Immediately shut down any extant elopher process."
-  (let ((p (get-process "elopher-process")))
+(defun elpher-process-cleanup ()
+  "Immediately shut down any extant elpher process."
+  (let ((p (get-process "elpher-process")))
     (if p (delete-process p))))
 
-(defvar elopher-selector-string)
+(defvar elpher-selector-string)
 
-(defun elopher-get-selector (address after)
+(defun elpher-get-selector (address after)
   "Retrieve selector specified by ADDRESS, then execute AFTER.
-The result is stored as a string in the variable elopher-selector-string."
-  (setq elopher-selector-string "")
+The result is stored as a string in the variable elpher-selector-string."
+  (setq elpher-selector-string "")
   (make-network-process
-   :name "elopher-process"
-   :host (elopher-address-host address)
-   :service (elopher-address-port address)
+   :name "elpher-process"
+   :host (elpher-address-host address)
+   :service (elpher-address-port address)
    :filter (lambda (proc string)
-             (setq elopher-selector-string (concat elopher-selector-string string)))
+             (setq elpher-selector-string (concat elpher-selector-string string)))
    :sentinel after)
-  (process-send-string "elopher-process"
-                       (concat (elopher-address-selector address) "\n")))
+  (process-send-string "elpher-process"
+                       (concat (elpher-address-selector address) "\n")))
 
 ;; Index retrieval
 
-(defun elopher-get-index-node ()
+(defun elpher-get-index-node ()
   "Getter which retrieves the current node contents as an index."
-  (let ((content (elopher-node-content elopher-current-node))
-        (address (elopher-node-address elopher-current-node)))
+  (let ((content (elpher-node-content elpher-current-node))
+        (address (elpher-node-address elpher-current-node)))
     (if content
         (progn
-          (elopher-with-clean-buffer
+          (elpher-with-clean-buffer
            (insert content))
-          (elopher-restore-pos))
+          (elpher-restore-pos))
       (if address
           (progn
-            (elopher-with-clean-buffer
+            (elpher-with-clean-buffer
              (insert "LOADING DIRECTORY..."))
-            (elopher-get-selector address
+            (elpher-get-selector address
                                   (lambda (proc event)
                                     (unless (string-prefix-p "deleted" event)
-                                      (elopher-with-clean-buffer
-                                       (elopher-insert-index elopher-selector-string))
-                                      (elopher-restore-pos)
-                                      (elopher-set-node-content elopher-current-node
+                                      (elpher-with-clean-buffer
+                                       (elpher-insert-index elpher-selector-string))
+                                      (elpher-restore-pos)
+                                      (elpher-set-node-content elpher-current-node
                                                                 (buffer-string))))))
         (progn
-          (elopher-with-clean-buffer
-           (elopher-insert-index elopher-start-index))
-          (elopher-restore-pos)
-          (elopher-set-node-content elopher-current-node
+          (elpher-with-clean-buffer
+           (elpher-insert-index elpher-start-index))
+          (elpher-restore-pos)
+          (elpher-set-node-content elpher-current-node
                                     (buffer-string)))))))
 
 ;; Text retrieval
 
-(defconst elopher-url-regex
+(defconst elpher-url-regex
   "\\(https?\\|gopher\\)://\\([a-zA-Z0-9.\-]+\\)\\(?3::[0-9]+\\)?\\(?4:/[^ \r\n\t(),]*\\)?"
-  "Regexp used to locate and buttinofy URLs in text files loaded by elopher.")
+  "Regexp used to locate and buttinofy URLs in text files loaded by elpher.")
 
-(defun elopher-buttonify-urls (string)
+(defun elpher-buttonify-urls (string)
   "Turn substrings which look like urls in STRING into clickable buttons."
   (with-temp-buffer
     (insert string)
     (goto-char (point-min))
-    (while (re-search-forward elopher-url-regex nil t)
+    (while (re-search-forward elpher-url-regex nil t)
       (let ((url (match-string 0))
             (protocol (downcase (match-string 1))))
         (if (string= protocol "gopher")
@@ -368,144 +368,144 @@ The result is stored as a string in the variable elopher-selector-string."
                    (selector (if (> (length type-and-selector) 1)
                                  (substring type-and-selector 2)
                                ""))
-                   (address (elopher-make-address selector host port))
-                   (getter (car (alist-get type elopher-type-map))))
+                   (address (elpher-make-address selector host port))
+                   (getter (car (alist-get type elpher-type-map))))
               (make-text-button (match-beginning 0)
                                 (match-end 0)
-                                'elopher-node (elopher-make-node elopher-current-node
+                                'elpher-node (elpher-make-node elpher-current-node
                                                                  address
                                                                  getter)
-                                'action #'elopher-click-link
+                                'action #'elpher-click-link
                                 'follow-link t
                                 'help-echo (format "mouse-1, RET: open %s on %s port %s"
                                                    selector host port)))
           (make-text-button (match-beginning 0)
                             (match-end 0)
-                            'elopher-url url
-                            'action #'elopher-click-url
+                            'elpher-url url
+                            'action #'elpher-click-url
                             'follow-link t
                             'help-echo (format "mouse-1, RET: open url %s" url)))))
     (buffer-string)))
 
-(defun elopher-process-text (string)
+(defun elpher-process-text (string)
   "Remove CRs and trailing period from the gopher text document STRING."
   (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)))
+    (elpher-buttonify-urls cleaned-str)))
 
-(defun elopher-get-text-node ()
+(defun elpher-get-text-node ()
   "Getter which retrieves the current node contents as a text document."
-  (let ((content (elopher-node-content elopher-current-node))
-        (address (elopher-node-address elopher-current-node)))
+  (let ((content (elpher-node-content elpher-current-node))
+        (address (elpher-node-address elpher-current-node)))
     (if content
         (progn
-          (elopher-with-clean-buffer
+          (elpher-with-clean-buffer
            (insert content))
-          (elopher-restore-pos))
+          (elpher-restore-pos))
       (progn
-        (elopher-with-clean-buffer
+        (elpher-with-clean-buffer
          (insert "LOADING TEXT..."))
-        (elopher-get-selector address
+        (elpher-get-selector address
                               (lambda (proc event)
                                 (unless (string-prefix-p "deleted" event)
-                                  (elopher-with-clean-buffer
-                                   (insert (elopher-process-text elopher-selector-string)))
-                                  (elopher-restore-pos)
-                                  (elopher-set-node-content elopher-current-node
+                                  (elpher-with-clean-buffer
+                                   (insert (elpher-process-text elpher-selector-string)))
+                                  (elpher-restore-pos)
+                                  (elpher-set-node-content elpher-current-node
                                                             (buffer-string)))))))))
 
 ;; Image retrieval
 
-(defun elopher-get-image-node ()
+(defun elpher-get-image-node ()
   "Getter which retrieves the current node contents as an image to view."
-  (let ((content (elopher-node-content elopher-current-node))
-        (address (elopher-node-address elopher-current-node)))
+  (let ((content (elpher-node-content elpher-current-node))
+        (address (elpher-node-address elpher-current-node)))
     (if content
         (progn
-          (elopher-with-clean-buffer
+          (elpher-with-clean-buffer
            (insert-image content))
           (setq cursor-type nil)
-          (elopher-restore-pos))
+          (elpher-restore-pos))
       (progn
-        (elopher-with-clean-buffer
+        (elpher-with-clean-buffer
          (insert "LOADING IMAGE..."))
-        (elopher-get-selector address
+        (elpher-get-selector address
                               (lambda (proc event)
                                 (unless (string-prefix-p "deleted" event)
                                   (let ((image (create-image
-                                                (encode-coding-string elopher-selector-string
+                                                (encode-coding-string elpher-selector-string
                                                                       'no-conversion)
                                                 nil t)))
-                                    (elopher-with-clean-buffer
+                                    (elpher-with-clean-buffer
                                      (insert-image image))
                                     (setq cursor-type nil)
-                                    (elopher-restore-pos)
-                                    (elopher-set-node-content elopher-current-node
+                                    (elpher-restore-pos)
+                                    (elpher-set-node-content elpher-current-node
                                                               image)))))))))
 
 ;; Search retrieval
 
-(defun elopher-get-search-node ()
+(defun elpher-get-search-node ()
   "Getter which submits a search query to the address of the current node."
-  (let ((content (elopher-node-content elopher-current-node))
-        (address (elopher-node-address elopher-current-node))
+  (let ((content (elpher-node-content elpher-current-node))
+        (address (elpher-node-address elpher-current-node))
         (aborted t))
     (if content
         (progn
-          (elopher-with-clean-buffer
+          (elpher-with-clean-buffer
            (insert content))
-          (elopher-restore-pos)
+          (elpher-restore-pos)
           (message "Displaying cached search results.  Reload to perform a new search."))
       (unwind-protect
           (let* ((query-string (read-string "Query: "))
-                 (query-selector (concat (elopher-address-selector address) "\t" query-string))
-                 (search-address (elopher-make-address query-selector
-                                                       (elopher-address-host address)
-                                                       (elopher-address-port address))))
+                 (query-selector (concat (elpher-address-selector address) "\t" query-string))
+                 (search-address (elpher-make-address query-selector
+                                                       (elpher-address-host address)
+                                                       (elpher-address-port address))))
             (setq aborted nil)
-            (elopher-with-clean-buffer
+            (elpher-with-clean-buffer
              (insert "LOADING RESULTS..."))
-            (elopher-get-selector search-address
+            (elpher-get-selector search-address
                                   (lambda (proc event)
                                     (unless (string-prefix-p "deleted" event)
-                                      (elopher-with-clean-buffer
-                                       (elopher-insert-index elopher-selector-string))
+                                      (elpher-with-clean-buffer
+                                       (elpher-insert-index elpher-selector-string))
                                       (goto-char (point-min))
-                                      (elopher-set-node-content elopher-current-node
+                                      (elpher-set-node-content elpher-current-node
                                                                 (buffer-string))))))
         (if aborted
-            (elopher-visit-parent-node))))))
+            (elpher-visit-parent-node))))))
 
 ;; Raw server response retrieval
 
-(defun elopher-get-node-raw ()
+(defun elpher-get-node-raw ()
   "Getter which retrieves the raw server response for the current node."
-  (let* ((content (elopher-node-content elopher-current-node))
-         (address (elopher-node-address elopher-current-node)))
-    (elopher-with-clean-buffer
+  (let* ((content (elpher-node-content elpher-current-node))
+         (address (elpher-node-address elpher-current-node)))
+    (elpher-with-clean-buffer
      (insert "LOADING RAW SERVER RESPONSE..."))
     (if address
-        (elopher-get-selector address
+        (elpher-get-selector address
                               (lambda (proc event)
                                 (unless (string-prefix-p "deleted" event)
-                                  (elopher-with-clean-buffer
-                                   (insert elopher-selector-string))
+                                  (elpher-with-clean-buffer
+                                   (insert elpher-selector-string))
                                   (goto-char (point-min)))))
       (progn
-        (elopher-with-clean-buffer
-         (insert elopher-start-index))
+        (elpher-with-clean-buffer
+         (insert elpher-start-index))
         (goto-char (point-min)))))
   (message "Displaying raw server response.  Reload or redraw to return to standard view."))
  
 ;; File export retrieval
 
-(defvar elopher-download-filename)
+(defvar elpher-download-filename)
 
-(defun elopher-get-node-download ()
+(defun elpher-get-node-download ()
   "Getter which retrieves the current node and writes the result to a file."
-  (let* ((address (elopher-node-address elopher-current-node))
-         (selector (elopher-address-selector address)))
-    (elopher-visit-parent-node) ; Do first in case of non-local exits.
+  (let* ((address (elpher-node-address elpher-current-node))
+         (selector (elpher-address-selector address)))
+    (elpher-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
@@ -513,47 +513,47 @@ The result is stored as a string in the variable elopher-selector-string."
                                          filename-proposal
                                        "gopher.file"))))
       (message "Downloading...")
-      (setq elopher-download-filename filename)
-      (elopher-get-selector address
+      (setq elpher-download-filename filename)
+      (elpher-get-selector address
                             (lambda (proc event)
                               (let ((coding-system-for-write 'binary))
-                                (with-temp-file elopher-download-filename
-                                  (insert elopher-selector-string)
+                                (with-temp-file elpher-download-filename
+                                  (insert elpher-selector-string)
                                   (message (format "Download complate, saved to file %s."
-                                                   elopher-download-filename)))))))))
+                                                   elpher-download-filename)))))))))
 
 
 ;;; Navigation procedures
 ;;
 
-(defun elopher-next-link ()
+(defun elpher-next-link ()
   "Move point to the next link on the current page."
   (interactive)
   (forward-button 1))
 
-(defun elopher-prev-link ()
+(defun elpher-prev-link ()
   "Move point to the previous link on the current page."
   (interactive)
   (backward-button 1))
 
-(defun elopher-click-link (button)
+(defun elpher-click-link (button)
   "Function called when the gopher link BUTTON is activated (via mouse or keypress)."
-  (let ((node (button-get button 'elopher-node)))
-    (elopher-visit-node node)))
+  (let ((node (button-get button 'elpher-node)))
+    (elpher-visit-node node)))
 
-(defun elopher-click-url (button)
+(defun elpher-click-url (button)
   "Function called when the url link BUTTON is activated (via mouse or keypress)."
-  (let ((url (button-get button 'elopher-url)))
-    (if elopher-open-urls-with-eww
+  (let ((url (button-get button 'elpher-url)))
+    (if elpher-open-urls-with-eww
         (browse-web url)
       (browse-url url))))
 
-(defun elopher-follow-current-link ()
+(defun elpher-follow-current-link ()
   "Open the link or url at point."
   (interactive)
   (push-button))
 
-(defun elopher-go ()
+(defun elpher-go ()
   "Go to a particular gopher site."
   (interactive)
   (let* (
@@ -561,87 +561,87 @@ The result is stored as a string in the variable elopher-selector-string."
          (selector (read-string "Selector (default none): " nil nil ""))
          (port (read-string "Port (default 70): " nil nil 70))
          (address (list selector hostname port)))
-    (elopher-visit-node
-     (elopher-make-node elopher-current-node
+    (elpher-visit-node
+     (elpher-make-node elpher-current-node
                         address
-                        #'elopher-get-index-node))))
+                        #'elpher-get-index-node))))
 
-(defun  elopher-redraw ()
+(defun  elpher-redraw ()
   "Redraw current page."
   (interactive)
-  (elopher-visit-node elopher-current-node))
+  (elpher-visit-node elpher-current-node))
 
-(defun  elopher-reload ()
+(defun  elpher-reload ()
   "Reload current page."
   (interactive)
-  (elopher-reload-current-node))
+  (elpher-reload-current-node))
 
-(defun elopher-view-raw ()
+(defun elpher-view-raw ()
   "View current page as plain text."
   (interactive)
-  (elopher-visit-node elopher-current-node
-                      #'elopher-get-node-raw))
+  (elpher-visit-node elpher-current-node
+                      #'elpher-get-node-raw))
 
-(defun elopher-back ()
+(defun elpher-back ()
   "Go to previous site."
   (interactive)
-  (if (elopher-node-parent elopher-current-node)
-      (elopher-visit-parent-node)
+  (if (elpher-node-parent elpher-current-node)
+      (elpher-visit-parent-node)
     (message "No previous site.")))
 
-(defun elopher-download ()
+(defun elpher-download ()
   "Download the link at point."
   (interactive)
   (let ((button (button-at (point))))
     (if button
-        (let ((node (button-get button 'elopher-node)))
+        (let ((node (button-get button 'elpher-node)))
           (if node
-              (elopher-visit-node (button-get button 'elopher-node)
-                                  #'elopher-get-node-download)
+              (elpher-visit-node (button-get button 'elpher-node)
+                                  #'elpher-get-node-download)
             (message "Can only download gopher links, not general URLs.")))
       (message "No link selected."))))
 
 ;;; Mode and keymap
 ;;
 
-(defvar elopher-mode-map
+(defvar elpher-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "TAB") 'elopher-next-link)
-    (define-key map (kbd "<backtab>") 'elopher-prev-link)
-    (define-key map (kbd "u") 'elopher-back)
-    (define-key map (kbd "g") 'elopher-go)
-    (define-key map (kbd "r") 'elopher-redraw)
-    (define-key map (kbd "R") 'elopher-reload)
-    (define-key map (kbd "w") 'elopher-view-raw)
-    (define-key map (kbd "d") 'elopher-download)
+    (define-key map (kbd "TAB") 'elpher-next-link)
+    (define-key map (kbd "<backtab>") 'elpher-prev-link)
+    (define-key map (kbd "u") 'elpher-back)
+    (define-key map (kbd "g") 'elpher-go)
+    (define-key map (kbd "r") 'elpher-redraw)
+    (define-key map (kbd "R") 'elpher-reload)
+    (define-key map (kbd "w") 'elpher-view-raw)
+    (define-key map (kbd "d") 'elpher-download)
     (when (fboundp 'evil-define-key)
       (evil-define-key 'normal map
-        (kbd "TAB") 'elopher-next-link
-        (kbd "C-]") 'elopher-follow-current-link
-        (kbd "C-t") 'elopher-back
-        (kbd "u") 'elopher-back
-        (kbd "g") 'elopher-go
-        (kbd "r") 'elopher-redraw
-        (kbd "R") 'elopher-reload
-        (kbd "w") 'elopher-view-raw
-        (kbd "d") 'elopher-download))
+        (kbd "TAB") 'elpher-next-link
+        (kbd "C-]") 'elpher-follow-current-link
+        (kbd "C-t") 'elpher-back
+        (kbd "u") 'elpher-back
+        (kbd "g") 'elpher-go
+        (kbd "r") 'elpher-redraw
+        (kbd "R") 'elpher-reload
+        (kbd "w") 'elpher-view-raw
+        (kbd "d") 'elpher-download))
     map)
   "Keymap for gopher client.")
 
-(define-derived-mode elopher-mode special-mode "elopher"
-  "Major mode for elopher, an elisp gopher client.")
+(define-derived-mode elpher-mode special-mode "elpher"
+  "Major mode for elpher, an elisp gopher client.")
 
 
 ;;; Main start procedure
 ;;
 
 ;;;###autoload
-(defun elopher ()
-  "Start elopher with default landing page."
+(defun elpher ()
+  "Start elpher with default landing page."
   (interactive)
-  (setq elopher-current-node nil)
-  (let ((start-node (elopher-make-node nil nil #'elopher-get-index-node)))
-    (elopher-visit-node start-node))
-  "Started Elopher.") ; Otherwise (elopher) evaluates to start page string.
+  (setq elpher-current-node nil)
+  (let ((start-node (elpher-make-node nil nil #'elpher-get-index-node)))
+    (elpher-visit-node start-node))
+  "Started Elpher.") ; Otherwise (elpher) evaluates to start page string.
 
-;;; elopher.el ends here
+;;; elpher.el ends here