branch: externals/dtache
commit 4778eda4dff29c58c7a60c685b0deb3cb39e88e0
Author: Niklas Eklund <niklas.ekl...@posteo.net>
Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Rename compile-session to post-compile-session
The compile session is odne in retrospect, hence post-compile.
---
README.org | 2 +-
documentation/demo.org | 2 +-
dtache-compile.el | 8 ++++----
dtache.el | 13 +++++++------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/README.org b/README.org
index e3c20eacdf..4de941a2f7 100644
--- a/README.org
+++ b/README.org
@@ -99,7 +99,7 @@ To interact with a session =dtache= provides the command
=dtache-open-session=.
| dtache-open-output (o) | Open a session's output
|
| dtache-tail-output (t) | Tail the output of an active session
|
| dtache-diff-session (=) | Diff a session with another session
|
-| dtache-compile-session (c) | Open the session output in compilation
mode |
+| dtache-post-compile-session (c) | Open the session output in
compilation mode |
| dtache-rerun-session (r) | Rerun a session
|
| dtache-insert-session-command (i) | Insert the session's command at point
|
| dtache-copy-session-command (w) | Copy the session's shell command
|
diff --git a/documentation/demo.org b/documentation/demo.org
index e322b969bc..ec30340ee7 100644
--- a/documentation/demo.org
+++ b/documentation/demo.org
@@ -71,7 +71,7 @@ The commands that are available.
| Command | Description | Keybinding |
|-------------------------------+------------------------------+------------|
| =dtache-open-session= | A DWIM function | Return |
-| =dtache-compile-session= | Post compilation | c |
+| =dtache-post-compile-session= | Post compilation | c
|
| =dtache-delete-session= | Delete an active session | d |
| =dtache-kill-session= | Kill an active session | k |
| =dtache-open-output= | Open sessions output | o |
diff --git a/dtache-compile.el b/dtache-compile.el
index d6c2c76ed2..dd8772db69 100644
--- a/dtache-compile.el
+++ b/dtache-compile.el
@@ -30,7 +30,7 @@
;;;; Variables
-(defvar dtache-compile-session-action '(:attach dtache-compile-attach :view
dtache-compile-session))
+(defvar dtache-post-compile-session-action '(:attach dtache-compile-attach
:view dtache-post-compile-session))
;;;; Commands
@@ -46,7 +46,7 @@ Optionally enable COMINT if prefix-argument is provided."
command))
(consp current-prefix-arg)))
(let* ((dtache-enabled t)
- (dtache-session-action dtache-compile-session-action)
+ (dtache-session-action dtache-post-compile-session-action)
(dtache-session-type 'compile)
(dtache-session-mode 'create))
(compile command comint)))
@@ -57,7 +57,7 @@ Optionally enable COMINT if prefix-argument is provided."
Optionally EDIT-COMMAND."
(interactive "P")
(let* ((dtache-enabled t)
- (dtache-session-action dtache-compile-session-action)
+ (dtache-session-action dtache-post-compile-session-action)
(dtache-session-type 'compile)
(dtache-session-mode 'create))
(recompile edit-command)))
@@ -102,7 +102,7 @@ Optionally EDIT-COMMAND."
(when (dtache-valid-session session)
(if (dtache--session-active session)
(dtache-compile-attach session)
- (dtache-compile-session session))))
+ (dtache-post-compile-session session))))
;;;###autoload
(defun dtache-compile-setup ()
diff --git a/dtache.el b/dtache.el
index 1e03d3c249..725a7e3c04 100644
--- a/dtache.el
+++ b/dtache.el
@@ -86,6 +86,9 @@
(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-annotation-format
`((:width 3 :function dtache--active-str :face dtache-active-face)
@@ -100,7 +103,7 @@
(defvar dtache-action-map
(let ((map (make-sparse-keymap)))
- (define-key map "c" #'dtache-compile-session)
+ (define-key map "c" #'dtache-post-compile-session)
(define-key map "d" #'dtache-delete-session)
(define-key map "i" #'dtache-insert-session-command)
(define-key map "k" #'dtache-kill-session)
@@ -159,8 +162,6 @@
(defvar dtache--sessions-initialized nil
"Sessions are initialized.")
-(defvar dtache-session-mode nil
- "Mode of operation for dtach.")
(defvar dtache--sessions nil
"A list of sessions.")
(defvar dtache--buffer-session nil
@@ -233,8 +234,8 @@ Optionally SUPPRESS-OUTPUT."
(funcall view session)))))
;;;###autoload
-(defun dtache-compile-session (session)
- "Open log of SESSION in `compilation-mode'."
+(defun dtache-post-compile-session (session)
+ "Post `compile' by opening the output of a SESSION in `compilation-mode'."
(interactive
(list (dtache-completing-read (dtache-get-sessions))))
(when (dtache-valid-session session)
@@ -617,7 +618,7 @@ If session is not valid trigger an automatic cleanup on
SESSION's host."
(cond ((eq 'success (dtache--session-status session))
(dtache-open-output session))
((eq 'failure (dtache--session-status session))
- (dtache-compile-session session))
+ (dtache-post-compile-session session))
((eq 'unknown (dtache--session-status session))
(dtache-open-output session))
(t (message "Dtache session is in an unexpected state."))))
