Fix some compiler warnings.

3 files changed, 28 insertions, 17 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0a59f1f837e..983df8a6bfc 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-05  Eric Schulte  <eric.schulte@gmx.com>
+
+	* ob.el (org-babel-expand-noweb-references): Resurrect dropped
+	pieces of a previous patch.
+
+	* ob-maxima.el (org-babel-execute:maxima): Fix compiler warning.
+
 2012-01-05  Bastien Guerry  <bzg@gnu.org>
 
 	* org-eshell.el (org-eshell-open): Use (goto-char (point-max))
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 6955a778dd6..74bcb069434 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -63,9 +63,9 @@
   "Execute a block of Maxima entries with org-babel.  This function is
 called by `org-babel-execute-src-block'."
   (message "executing Maxima source code block")
-  (let ((result
-	 (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
-		(cmdline (cdr (assoc :cmdline params)))
+  (let ((result-params (split-string (or (cdr (assoc :results params)) "")))
+	(result
+	 (let* ((cmdline (cdr (assoc :cmdline params)))
 		(in-file (org-babel-temp-file "maxima-" ".max"))
 		(cmd (format "maxima --very-quiet -r 'batchload(%S)$' %s"
 			     in-file cmdline)))
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index ff5a8bc1d01..0288eb357b5 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -2068,25 +2068,29 @@ block but are passed literally to the \"example-block\"."
 		      (if *org-babel-use-quick-and-dirty-noweb-expansion*
 			  (while (re-search-forward rx nil t)
 			    (let* ((i (org-babel-get-src-block-info 'light))
-				   (body (org-babel-expand-noweb-references i)))
-			      (if comment
-				  ((lambda (cs)
-				     (concat (c-wrap (car cs)) "\n"
-					     body "\n" (c-wrap (cadr cs))))
-				   (org-babel-tangle-comment-links i))
-				(setq expansion (concat expansion body)))))
+				   (body (org-babel-expand-noweb-references i))
+				   (full (if comment
+					     ((lambda (cs)
+						(concat (c-wrap (car cs)) "\n"
+							body "\n"
+							(c-wrap (cadr cs))))
+					      (org-babel-tangle-comment-links i))
+					   body)))
+			      (setq expansion (concat expansion full))))
 			(org-babel-map-src-blocks nil
 			  (let ((i (org-babel-get-src-block-info 'light)))
 			    (when (equal (or (cdr (assoc :noweb-ref (nth 2 i)))
 					     (nth 4 i))
 					 source-name)
-			      (let ((body (org-babel-expand-noweb-references i)))
-				(if comment
-				    ((lambda (cs)
-				       (concat (c-wrap (car cs)) "\n"
-					       body "\n" (c-wrap (cadr cs))))
-				     (org-babel-tangle-comment-links i))
-				  (setq expansion (concat expansion body)))))))))
+			      (let* ((body (org-babel-expand-noweb-references i))
+				     (full (if comment
+					       ((lambda (cs)
+						  (concat (c-wrap (car cs)) "\n"
+							  body "\n"
+							  (c-wrap (cadr cs))))
+						(org-babel-tangle-comment-links i))
+					     body)))
+				(setq expansion (concat expansion full))))))))
 		    expansion)
 		  ;; possibly raise an error if named block doesn't exist
 		  (if (member lang org-babel-noweb-error-langs)