From: Alex Schroeder <alex@gnu.org>
Date: Thu, 23 Jul 2020 07:10:12 +0000 (+0200)
Subject: Switch URL and Name position in the menu
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=a2074b070a34f3d424638df01bd86dc7dc934cb3;p=elpher.git

Switch URL and Name position in the menu

In my experience, the URL is often very long, and thus 30 characters
is never enough to show the most important part of it: the end. At the
same time, buffer names are rarely long.
---

diff --git a/elpher.el b/elpher.el
index 87fe007..29687f1 100644
--- a/elpher.el
+++ b/elpher.el
@@ -2197,8 +2197,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)
@@ -2222,25 +2222,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'.
@@ -2267,9 +2267,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)
@@ -2280,10 +2280,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
@@ -2292,14 +2292,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))))))