diff options
| author | Bastien Guerry <bzg@altern.org> | 2011-07-19 18:34:02 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2011-07-19 18:34:02 +0200 |
| commit | 4670e954583ca64e67764b44cfe06d7cfe431e72 (patch) | |
| tree | afc95caec939f84f67f2985a570fb21941d5d1e7 | |
| parent | 3482284bbd693cdf6bdd884a923ac0d5cd3636db (diff) | |
| parent | d883d0b01d872091391f80d0416952b70a743ee7 (diff) | |
| download | org-mode-4670e954583ca64e67764b44cfe06d7cfe431e72.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | doc/org.texi | 2 | ||||
| -rw-r--r-- | lisp/ob-java.el | 2 | ||||
| -rw-r--r-- | lisp/ob.el | 2 | ||||
| -rw-r--r-- | lisp/org-capture.el | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/doc/org.texi b/doc/org.texi index a0a78b7..8147fdf 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -6522,7 +6522,7 @@ dynamic insertion of content: @smallexample %^@{@var{prompt}@} @r{prompt the user for a string and replace this sequence with it.} - @r{You may specify a default value and a completion table with.} + @r{You may specify a default value and a completion table with} @r{%^@{prompt|default|completion2|completion3...@}.} @r{The arrow keys access a prompt-specific history.} %a @r{annotation, normally the link created with @code{org-store-link}.} diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 8e83760..8595a18 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -52,7 +52,7 @@ (org-babel-eval (concat org-babel-java-compiler " " src-file) "")))) ;; created package-name directories if missing - (unless (file-exists-p packagename) + (unless (or (not packagename) (file-exists-p packagename)) (make-directory packagename 'parents)) ((lambda (results) (org-babel-reassemble-table @@ -373,7 +373,7 @@ block." (string= "yes" (cdr (assoc :cache params))))) (result-params (cdr (assoc :result-params params))) (new-hash (when cache? (org-babel-sha1-hash info))) - (old-hash (when cache? (org-babel-result-hash info))) + (old-hash (when cache? (org-babel-current-result-hash))) (body (setf (nth 1 info) (let ((noweb (cdr (assoc :noweb params)))) (if (and noweb diff --git a/lisp/org-capture.el b/lisp/org-capture.el index c2d36b5..591dcd1 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -65,6 +65,7 @@ (defvar org-remember-default-headline) (defvar org-remember-templates) (defvar org-table-hlines) +(defvar dired-buffers) (defvar org-capture-clock-was-started nil "Internal flag, noting if the clock was started.") @@ -453,7 +454,9 @@ bypassed." (org-capture-get-template) (org-capture-put :original-buffer orig-buf :original-file (or (buffer-file-name orig-buf) - (car (rassq orig-buf dired-buffers))) + (and (featurep 'dired) + (car (rassq orig-buf + dired-buffers)))) :original-file-nondirectory (and (buffer-file-name orig-buf) (file-name-nondirectory |