branch: externals/org
commit 37cd00bb1207bfe5f50493ee48390a516b9b07b5
Author: Aaron L. Zeng <m...@bcc32.com>
Commit: Matthew Trzcinski <m...@excalamus.com>
lisp/ob-shell.el: Initialize explicit-shell-file-name
* lisp/ob-shell.el (org-babel-shell-initialize): force blocks to
always use the specified shell language
Sessions are initialized using `shell'. The `shell' command checks
`explicit-shell-file-name' for file to use before checking other
variables, like `shell-file-name'. Previously, only `shell-file-name'
was set. So, if the user had set the `explicit-shell-file-name',
session blocks would use that whereas non-session blocks would use
`shell-file-name', resulting in inconsistent behavior. This change
sets both variables so that even if the user changes the
`explicit-shell-file-name' or `shell-file-name', blocks will only use
the shell language specified by the block.
TINYCHANGE
---
check.sh | 6 ++++++
lisp/ob-shell.el | 3 ++-
nohup.out | 21 +++++++++++++++++++++
setup.sh | 16 ++++++++++++++++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/check.sh b/check.sh
new file mode 100755
index 0000000000..a1083fbe10
--- /dev/null
+++ b/check.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+make autoloads
+emacs -q --eval="(add-to-list 'load-path
\"/home/ahab/Projects/org-mode/lisp\")"
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 551c3785d8..35d9e93761 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -81,7 +81,8 @@ is modified outside the Customize interface."
(lambda (body params)
(:documentation
(format "Execute a block of %s commands with Babel." name))
- (let ((shell-file-name name))
+ (let ((explicit-shell-file-name name)
+ (shell-file-name name))
(org-babel-execute:shell body params))))
(put fname 'definition-name 'org-babel-shell-initialize))
(defalias (intern (concat "org-babel-variable-assignments:" name))
diff --git a/nohup.out b/nohup.out
new file mode 100644
index 0000000000..b110156b6c
--- /dev/null
+++ b/nohup.out
@@ -0,0 +1,21 @@
+/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started
the server?
+/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type
"M-x server-start".
+/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor.
Please use:
+
+ --socket-name
+ --server-file (or environment variable EMACS_SERVER_FILE)
+ --alternate-editor (or environment variable ALTERNATE_EDITOR)
+/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started
the server?
+/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type
"M-x server-start".
+/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor.
Please use:
+
+ --socket-name
+ --server-file (or environment variable EMACS_SERVER_FILE)
+ --alternate-editor (or environment variable ALTERNATE_EDITOR)
+/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started
the server?
+/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type
"M-x server-start".
+/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor.
Please use:
+
+ --socket-name
+ --server-file (or environment variable EMACS_SERVER_FILE)
+ --alternate-editor (or environment variable ALTERNATE_EDITOR)
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000000..c5de9c8a54
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+echo "[DEV] Setting up ssh..."
+eval "$(ssh-agent)"
+ssh-add /home/ahab/.ssh/id_org
+echo "[DEV] SSH setup complete"
+
+echo "[DEV] Rebuilding..."
+make
+echo "[DEV] Rebuilt"
+
+echo "[DEV] Restarting emacsd..."
+herd restart emacsd
+echo "[DEV] emacsd restarted"
