Fixes to the Elpher menu code

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 943b569..13cd006 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -2008,7 +2008,7 @@ functions which initialize the gopher client, namely
 (defun elpher-menu (&optional arg)
   "Show a list of all your `elpher' buffers.
 With an optional argument, add all the history items, too."
-  (interactive)
+  (interactive "P")
   (switch-to-buffer (get-buffer-create "*Elpher Menu*"))
   (elpher-menu-mode)
   (elpher-menu-refresh arg)
@@ -2159,11 +2159,9 @@ With an optional argument, add all the history items, too."
       (dolist (buf (buffer-list))
        (with-current-buffer buf
          (when (memq major-mode '(elpher-mode eww-mode))
-           (setq entries
-                 (nconc (if arg
-                            (elpher-menu-refresh-current)
-                          (elpher-menu-refresh-history))
-                        entries)))))
+           (if arg
+               (setq entries (nconc (elpher-menu-refresh-history) entries))
+             (push (elpher-menu-refresh-current) entries)))))
       (setq tabulated-list-entries (nreverse entries)))
     (tabulated-list-init-header))
 
@@ -2171,7 +2169,7 @@ With an optional argument, add all the history items, too."
   "Return current entries for `elpher-menu-refresh'.
 If we're only interested in the current entries, then this
 function can only return a list of a single item per buffer."
-  (list buf
+  (list (current-buffer)
        (vector
         (cond ((eq major-mode 'elpher-mode) "E")
               ((eq major-mode 'eww-mode) "W"))