X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;fp=elpher.el;h=acd89fce2b5c9a8c62738300a5985db1302f3ed8;hp=b57f2b83a269ad58ab6be28a1db805698ac87cb0;hb=d583c4f64c7e59845633931ec364703bf9eb2abb;hpb=a2966e515f0fb0c9b803ead48a00bab8fa42be4f

diff --git a/elpher.el b/elpher.el
index b57f2b8..acd89fc 100644
--- a/elpher.el
+++ b/elpher.el
@@ -2195,8 +2195,8 @@ that there are no buffers for history items so many of the buffer
 menu commands won't work on them."
     (setq tabulated-list-format
 	  (vector '("T" 1 t)
-		  '("URL" 40 t)
-		  '("Name" 30 t))
+		  '("Name" 30 t)
+		  '("URL" 40 t))
 	  tabulated-list-sort-key nil)
     ;; Collect info for each buffer we're interested in.
     (let (entries)
@@ -2220,25 +2220,25 @@ list established by `elpher-menu-refresh'. See
   (list (current-buffer)
 	(cond ((eq major-mode 'elpher-mode)
 	       (vector "G"
-		       (or (elpher-address-to-url
-			    (elpher-page-address elpher-current-page))
-			   "none")
 		       (or (elpher-find-title)
 			   (elpher-page-display-string elpher-current-page)
-			   (buffer-name))))
+			   (buffer-name))
+		       (or (elpher-address-to-url
+			    (elpher-page-address elpher-current-page))
+			   "none")))
 	      ((eq major-mode 'gemini-mode)
 	       (vector "E"
+		       (or (elpher-page-display-string elpher-current-page)
+			   (buffer-name))
 		       (or (elpher-address-to-url
 			    (elpher-page-address elpher-current-page))
-			   "none")
-		       (or (elpher-page-display-string elpher-current-page)
-			   (buffer-name))))
+			   "none")))
 	      ((eq major-mode 'eww-mode)
 	       (vector "W"
-		       (or (eww-current-url)
-			   "none")
 		       (or (plist-get eww-data :title)
-			   (buffer-name)))))))
+			   (buffer-name))
+		       (or (eww-current-url)
+			   "none"))))))
 
 (defun elpher-menu-refresh-history ()
   "Return current entries for `elpher-menu-refresh'.
@@ -2265,9 +2265,9 @@ list established by `elpher-menu-refresh'. See
 		     (if (cdr pair)
 			 (list (car pair)
 			       (vector "G"
+				       (or (elpher-page-display-string (cdr pair)) "?")
 				       (or (elpher-address-to-url
-					    (elpher-page-address (cdr pair))) "none")
-				       (or (elpher-page-display-string (cdr pair)) "?")))
+					    (elpher-page-address (cdr pair))) "none")))
 		       separator))
 		   (cons (cons (current-buffer) elpher-current-page)
 			 (mapcar (lambda (page)
@@ -2278,10 +2278,10 @@ list established by `elpher-menu-refresh'. See
 	   ;; No history means a list of one item. Add a separator.
 	   (list (list (current-buffer)
 		       (vector "E"
-			       (or (elpher-address-to-url
-				    (elpher-page-address elpher-current-page)))
 			       (or (elpher-page-display-string elpher-current-page)
-				   (buffer-name))))
+				   (buffer-name))
+			       (or (elpher-address-to-url
+				    (elpher-page-address elpher-current-page)))))
 		 separator))
 	   ((eq major-mode 'eww-mode)
 	   ;; A pair is (BUFFER-OR-DATA . PAGE) where BUFFER-OR-DTA is
@@ -2290,14 +2290,14 @@ list established by `elpher-menu-refresh'. See
 	   ;; what function to call. Add the separator at the end.
 	    (nconc (cons (list (current-buffer)
 			       (vector "W"
-				       (or (plist-get eww-data :url) "none")
-				       (or (plist-get eww-data :title) "none")))
+				       (or (plist-get eww-data :title) "none")
+				       (or (plist-get eww-data :url) "none")))
 			 (mapcar (lambda (data)
 				   (list
 				    (list (current-buffer) 'eww-restore-history data)
 				    (vector "W"
-					    (or (plist-get data :url) "none")
-					    (or (plist-get data :title) "none"))))
+					    (or (plist-get data :title) "none")
+					    (or (plist-get data :url) "none"))))
 				 eww-history))
 		   (list separator))))))