multishell - merge 1.1.5 from multishell repo.

diff --git a/packages/multishell/multishell-list.el b/packages/multishell/multishell-list.el
index f3895e2201f2ef9491aa3e8a982c79944a1af16d..dc7529b6ae237d6219e8425f2e6cb8dcc7faff98 100644 (file)
--- a/packages/multishell/multishell-list.el
+++ b/packages/multishell/multishell-list.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2016 Free Software Foundation, Inc. and Ken Manheimer
 
 ;; Author: Ken Manheimer <ken.manheimer@gmail.com>
-;; Version: 1.1.4
+;; Version: 1.1.5
 ;; Created: 2016 -- first public availability
 ;; Keywords: processes
 ;; URL: https://github.com/kenmanheimer/EmacsMultishell
@@ -252,15 +252,18 @@ Initial sort is from most to least recently used:
 
 For duplicates, we prefer the ones that have paths."
   (let ((tally (make-hash-table :test #'equal))
-        got name already)
+        got name name-order-reversed already)
     (mapcar #'(lambda (entry)
                 (setq name (multishell-name-from-entry entry)
                       already (gethash name tally nil))
+                (when (not already)
+                  (push name name-order-reversed))
                 (when (or (not already) (< (length already) (length entry)))
                   ;; Add new or replace shorter prior entry for name:
                   (puthash name entry tally)))
             entries)
-    (maphash #'(lambda (key value) (push value got)) tally)
+    (dolist (name name-order-reversed)
+      (push (gethash name tally) got))
     got))
 
 ;;;###autoload

diff --git a/packages/multishell/multishell.el b/packages/multishell/multishell.el
index 8056669c0e78578240ed8adc8ef0e5796dc230e1..51bad08d6a62e80955becafb331ea542a539710f 100644 (file)
--- a/packages/multishell/multishell.el
+++ b/packages/multishell/multishell.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken.manheimer@gmail.com>
-;; Version: 1.1.4
+;; Version: 1.1.5
 ;; Created: 1999 -- first public availability
 ;; Keywords: processes
 ;; URL: https://github.com/kenmanheimer/EmacsMultishell
@@ -59,6 +59,9 @@
 ;;
 ;; Change Log:
 ;;
+;; * 2016-02-11 1.1.5 Ken Manheimer:
+;;   - Rectify multishell list sorting to preserve recentness
+;;   - Increment the actual multishell-version setting, neglected for 1.1.4.
 ;; * 2016-02-11 1.1.4 Ken Manheimer:
 ;;   - hookup multishell-list as completion help buffer.
 ;;     Mouse and keyboard selections from help listing properly exits
@@ -156,7 +159,7 @@
 (require 'savehist)
 (require 'multishell-list)
 
-(defvar multishell-version "1.1.3")
+(defvar multishell-version "1.1.5")
 (defun multishell-version (&optional here)
   "Return string describing the loaded multishell version."
   (interactive "P")