emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Mark Cox <markcox80@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Common Lisp source blocks are now wrapped in a LET form which binds the symbol *default-pathname-defaults* to the directory in which the org file resides.
Date: Wed, 1 Jun 2011 15:17:59 +1000	[thread overview]
Message-ID: <BANLkTikRAF-D-QQqjEnNEsEcGApexxGZjQ@mail.gmail.com> (raw)

Hi,

This may be contentious and break backward compatibility for some people.

Currently, relative pathnames in Common Lisp source blocks are
meaningless as the *default-pathname-defaults* symbol is set to
whatever the value is when SLIME was invoked. This behaviour is
contrary to the shell source block processor (I haven't checked the
others).

This is in /tmp/example1/test.org
#+begin_src sh
pwd
#+end_src

#+results:
: #P"/tmp/example1/"

This is in /tmp/example2/test.org
#+begin_src sh
pwd
#+end_src

#+results:
: #P"/tmp/example2/"

The attached patch brings this expected behaviour (well from my point
of view) to lisp source blocks. Given the behaviour of Emacs commands
like DIRED and COMPILE, I think the patch makes things more
consistent.

I couldn't figure out how the sh block processor determines the path
to the org file so I hacked together something that works using some
of the Org hooks.

Thanks
Mark

lisp/ob-lisp.el: Added new variable ORG-BABEL-LISP-CURRENT-BUFFER
which is used to store a reference to the currently being processed org file.
This variable is setq'd in the hooks for
ORG-BABEL-PRE-TANGLE-HOOK, ORG-CTRL-C-CTRL-C-HOOK and
ORG-EXPORT-FIRST-HOOK.

lisp/ob-lisp.el (org-babel-expand-body:lisp): The code sent to SLIME
is now wrapped in a LET block which binds
COMMON-LISP:*DEFAULT-PATHNAME-DEFAULTS* to the directory where the
currently being processed org file resides.

diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index a875d55..db06182 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -40,6 +40,14 @@

 (defvar org-babel-default-header-args:lisp '())
 (defvar org-babel-header-arg-names:lisp '(package))
+(defvar org-babel-lisp-current-buffer nil)
+
+(let ((fn (lambda ()
+           (setq org-babel-lisp-current-buffer (current-buffer))
+           nil)))
+  (dolist (hook '(org-babel-pre-tangle-hook org-ctrl-c-ctrl-c-hook
org-export-first-hook))
+    (add-hook hook fn)))
+

 (defun org-babel-expand-body:lisp (body params)
   "Expand BODY according to PARAMS, return the expanded body."
@@ -73,8 +81,10 @@
                (read (org-bable-lisp-vector-to-list (cadr result)))
              (error (cadr result)))))
       (slime-eval `(swank:eval-and-grab-output
-                   ,(format "(progn %s)" (buffer-substring-no-properties
-                                          (point-min) (point-max))))
+                   ,(format "(let
((common-lisp:*default-pathname-defaults* #P%S)) %s)"
+                            (file-name-directory (buffer-file-name
org-babel-lisp-current-buffer))
+                            (buffer-substring-no-properties
+                             (point-min) (point-max))))
                  (cdr (assoc :package params)))))
    (org-babel-pick-name (cdr (assoc :colname-names params))
                        (cdr (assoc :colnames params)))

next             reply	other threads:[~2011-06-01  5:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-01  5:17 Mark Cox [this message]
2011-06-01 12:47 ` [PATCH] Common Lisp source blocks are now wrapped in a LET form which binds the symbol *default-pathname-defaults* to the directory in which the org file resides Eric Schulte

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:a875d55 dfblob:db06182
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BANLkTikRAF-D-QQqjEnNEsEcGApexxGZjQ@mail.gmail.com \
    --to=markcox80@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).