[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d33fb54 2/2: multishell - a bit more for 1.1.2, including
From: |
ken manheimer |
Subject: |
[elpa] master d33fb54 2/2: multishell - a bit more for 1.1.2, including missed change log entries. |
Date: |
Mon, 01 Feb 2016 06:23:15 +0000 |
branch: master
commit d33fb5489c4cc6c9111d7f485376699516896e72
Merge: 9df64fc 0e4d322
Author: Ken Manheimer <address@hidden>
Commit: Ken Manheimer <address@hidden>
multishell - a bit more for 1.1.2, including missed change log entries.
---
packages/multishell/multishell-list.el | 38 ++++++++++++++++++++++++++-----
packages/multishell/multishell.el | 13 ++++++-----
2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/packages/multishell/multishell-list.el
b/packages/multishell/multishell-list.el
index f17878c..b4ebe47 100644
--- a/packages/multishell/multishell-list.el
+++ b/packages/multishell/multishell-list.el
@@ -75,6 +75,31 @@ supplemented by our own when buffer is inactive.)"
(revert-buffer)
(goto-char where))))
+(defun multishell-list-clone-entry (&optional arg)
+ "Create a new list entry based on editing the current one.
+
+You will be left in the list at the entry, not yet launched.
+
+Providing a universal argument will also open the new shell.
+
+The already existing current entry is left untouched."
+ (interactive "P")
+ (let* ((prototype (tabulated-list-get-id))
+ (name (multishell-name-from-entry prototype))
+ (new (multishell-read-unbracketed-entry
+ (format "Clone new shell spec from %s: " name)
+ prototype
+ 'no-record))
+ (new-name (multishell-name-from-entry new))
+ (new-path (cadr (multishell-split-entry new))))
+ (when (not (string= new prototype))
+ (multishell-register-name-to-path new-name new-path)
+ (revert-buffer)
+ (goto-char (point-min))
+ (re-search-forward (format "^ . \\b%s\\b"
+ (regexp-quote new-name)))
+ (beginning-of-line))))
+
(defun multishell-list-placeholder (value default)
"Return VALUE if non-empty string, else DEFAULT."
(if (or (not value) (string= value ""))
@@ -85,7 +110,7 @@ supplemented by our own when buffer is inactive.)"
(defconst multishell-list-absent-buffer-flag "x")
(defun multishell-list-entries ()
- "Generate multishell name/path entries list for tabulated-list."
+ "Generate multishell name/path-spec entries list for tabulated-list."
(let ((recency 0))
(mapcar #'(lambda (entry)
(setq recency (1+ recency))
@@ -100,11 +125,11 @@ supplemented by our own when buffer is inactive.)"
multishell-list-active-buffer-flag)
(t multishell-list-inactive-buffer-flag)))
(rest (cadr splat))
- (path (or (file-remote-p rest 'localname)
- rest))
+ (dir (or (file-remote-p rest 'localname)
+ rest))
(hops (and (file-remote-p rest 'localname)
(substring
- rest 0 (- (length rest) (length path))))))
+ rest 0 (- (length rest) (length dir))))))
(when (not name)
(setq name (multishell-name-from-entry entry)))
(list entry
@@ -112,7 +137,7 @@ supplemented by our own when buffer is inactive.)"
status
name
(multishell-list-placeholder hops "-")
- (multishell-list-placeholder path "~")))))
+ (multishell-list-placeholder dir "~")))))
(multishell-all-entries))))
(defun compare-strings-as-numbers (a b)
@@ -122,6 +147,7 @@ supplemented by our own when buffer is inactive.)"
(defvar multishell-list-mode-map
(let ((map (make-sparse-keymap)))
+ (define-key map (kbd "c") 'multishell-list-clone-entry)
(define-key map (kbd "d") 'multishell-list-delete)
(define-key map (kbd "\C-k") 'multishell-list-delete)
(define-key map (kbd "k") 'multishell-list-delete)
@@ -141,7 +167,7 @@ supplemented by our own when buffer is inactive.)"
("! " 1 t :pad-right 1)
("Name" 15 t)
("Hops" 30 t)
- ("Path" 30 t)]
+ ("Directory" 30 t)]
tabulated-list-sort-key '("#" . t)
tabulated-list-entries #'multishell-list-entries)
(tabulated-list-init-header))
diff --git a/packages/multishell/multishell.el
b/packages/multishell/multishell.el
index 5342cfc..f746c57 100644
--- a/packages/multishell/multishell.el
+++ b/packages/multishell/multishell.el
@@ -67,7 +67,10 @@
;; no-record option to avoid this when needed.
;; - Implement simple edit-in-place multishell-replace-entry and use in
;; multishell-list-edit-entry.
-;; - Remove now (hopefully) unnecessary multishell-list-revert-buffer-kludge.
+;; - Remove now unnecessary multishell-list-revert-buffer-kludge.
+;; - Rectify byte compiler offenses, and other fixes - thanks to Stefan
+;; Monnier for pointing out many of the corrections.
+;; - Avoid directly calling tramp functions unnecessarily.
;; * 2016-01-30 1.1.1 Ken Manheimer:
;; - shake out initial multishell-list glitches:
;; - (Offer to) delete shell buffer, if present, when deleting entry.
@@ -230,13 +233,11 @@ current-window behavior.)"
"Maintain shell's current directory in its multishell history entry.
When set, the history entry for shells started with explicit
-paths will track the shell's current working directory. (Explicit
-paths will not be added to local shells started without one,
-however.)
+paths will track the shell's current working directory.
If `savehist-save-minibuffer-history' is enabled, the current
-working directory of shells \(that were started with an explicit
-path) will be conveyed between emacs sessions."
+working directory of shells will be conveyed between emacs
+sessions."
:type 'boolean)
(defvar multishell-history nil
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master d33fb54 2/2: multishell - a bit more for 1.1.2, including missed change log entries.,
ken manheimer <=