Merge branch 'master' of orgmode.org:org-mode

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}.}

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

lisp/ob.el

@@ -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

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