[elpa] externals/dtache 9b7e7ffd2e 086/158: Rename session-type to session-origin

[ELPA Syncer]

branch: externals/dtache
commit 9b7e7ffd2e09eb068ac0441c392c8deac61f1de1
Author: Niklas Eklund <niklas.eklund@posteo.net>
Commit: Niklas Eklund <niklas.eklund@posteo.net>

    Rename session-type to session-origin
---
 dtache-compile.el |  4 ++--
 dtache-eshell.el  |  2 +-
 dtache-shell.el   |  2 +-
 dtache.el         | 19 ++++++++++---------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/dtache-compile.el b/dtache-compile.el
index dd8772db69..7a9d7e908b 100644
--- a/dtache-compile.el
+++ b/dtache-compile.el
@@ -47,7 +47,7 @@ Optionally enable COMINT if prefix-argument is provided."
     (consp current-prefix-arg)))
   (let* ((dtache-enabled t)
          (dtache-session-action dtache-post-compile-session-action)
-         (dtache-session-type 'compile)
+         (dtache-session-origin 'compile)
          (dtache-session-mode 'create))
     (compile command comint)))
 
@@ -58,7 +58,7 @@ Optionally EDIT-COMMAND."
   (interactive "P")
   (let* ((dtache-enabled t)
          (dtache-session-action dtache-post-compile-session-action)
-         (dtache-session-type 'compile)
+         (dtache-session-origin 'compile)
          (dtache-session-mode 'create))
     (recompile edit-command)))
 
diff --git a/dtache-eshell.el b/dtache-eshell.el
index 395d638a9a..e1fff1136c 100644
--- a/dtache-eshell.el
+++ b/dtache-eshell.el
@@ -81,7 +81,7 @@
 
 If prefix-argument directly DETACH from the session."
   (interactive "P")
-  (let* ((dtache-session-type 'eshell)
+  (let* ((dtache-session-origin 'eshell)
          (dtache-session-mode (if detach 'new 'create))
          (dtache-eshell-command t))
     (call-interactively #'eshell-send-input)))
diff --git a/dtache-shell.el b/dtache-shell.el
index 2db49ef8f6..e4043c5c1a 100644
--- a/dtache-shell.el
+++ b/dtache-shell.el
@@ -78,7 +78,7 @@ This function also makes sure that the HISTFILE is disabled 
for local shells."
 (defun dtache-shell-create-session (&optional detach)
   "Create a session and attach to it unless DETACH."
   (interactive "P")
-  (let* ((dtache-session-type 'shell)
+  (let* ((dtache-session-origin 'shell)
          (dtache-session-action dtache-shell-session-action)
          (dtache-session-mode (if detach 'new 'create))
          (comint-input-sender #'dtache-shell--create-input-sender))
diff --git a/dtache.el b/dtache.el
index 725a7e3c04..5612fb5101 100644
--- a/dtache.el
+++ b/dtache.el
@@ -63,16 +63,12 @@
   "Shell to run the dtach command in.")
 (defvar dtache-env nil
   "The name of the `dtache' program.")
-(defvar dtache-shell-command-history nil
-  "History of commands run with `dtache-shell-command'.")
 (defvar dtache-max-command-length 90
   "Maximum length of displayed command.")
 (defvar dtache-redirect-only-regexps '()
   "Regexps for commands that should be run with redirect only.")
 (defvar dtache-tail-interval 2
   "Interval in seconds for the update rate when tailing a session.")
-(defvar dtache-session-type nil
-  "Variable to specify the origin of the session.")
 (defvar dtache-notification-function #'dtache-inactive-session-notification
   "Variable to specify notification function when a session becomes inactive.")
 (defvar dtache-compile-hooks nil
@@ -81,14 +77,19 @@
   "An alist of annotators for metadata.")
 (defvar dtache-timer-configuration '(:seconds 10 :repeat 60 :function 
run-with-timer)
   "A property list defining how often to run a timer.")
-(defvar dtache-session-action nil
-  "A property list of actions for a session.")
 (defvar dtache-shell-command-action '(:attach dtache-shell-command-attach 
:view dtache-view-dwim)
   "Actions for a session created with `dtache-shell-command'.")
+
 (defvar dtache-enabled nil)
 (defvar dtache-session-mode nil
   "Mode of operation for session.
 Valid values are: create, new and attach")
+(defvar dtache-session-origin nil
+  "Variable to specify the origin of the session.")
+(defvar dtache-session-action nil
+  "A property list of actions for a session.")
+(defvar dtache-shell-command-history nil
+  "History of commands run with `dtache-shell-command'.")
 
 (defvar dtache-annotation-format
   `((:width 3 :function dtache--active-str :face dtache-active-face)
@@ -184,7 +185,7 @@ Valid values are: create, new and attach")
                               (:conc-name dtache--session-))
   (id nil :read-only t)
   (command nil :read-only t)
-  (type nil :read-only t)
+  (origin nil :read-only t)
   (working-directory nil :read-only t)
   (creation-time nil :read-only t)
   (session-directory nil :read-only t)
@@ -213,7 +214,7 @@ Optionally SUPPRESS-OUTPUT."
                           "Dtache shell command: ")
                         nil 'dtache-shell-command-history)
     current-prefix-arg))
-  (let ((dtache-session-type 'shell-command)
+  (let ((dtache-session-origin 'shell-command)
         (dtache-session-action dtache-shell-command-action))
     (dtache-start-session command suppress-output)))
 
@@ -423,7 +424,7 @@ nil before closing."
   (let ((session
          (dtache--session-create :id (intern (dtache--create-id command))
                                  :command command
-                                 :type dtache-session-type
+                                 :origin dtache-session-origin
                                  :action dtache-session-action
                                  :working-directory 
(dtache-get-working-directory)
                                  :redirect-only (dtache-redirect-only-p 
command)