[Emacs-diffs] /srv/bzr/emacs/trunk r106790: Fix some compiler warnings.

[Bastien Guerry]

------------------------------------------------------------
revno: 106790
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-05 19:18:05 +0100
message:
  Fix some compiler warnings.
modified:
  lisp/org/ChangeLog
  lisp/org/ob-maxima.el
  lisp/org/ob.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-01-05 17:02:29 +0000
+++ b/lisp/org/ChangeLog        2012-01-05 18:18:05 +0000
@@ -1,3 +1,10 @@
+2012-01-05  Eric Schulte  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org-eshell.el (org-eshell-open): Use (goto-char (point-max))

=== modified file 'lisp/org/ob-maxima.el'
--- a/lisp/org/ob-maxima.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-maxima.el     2012-01-05 18:18:05 +0000
@@ -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)))

=== modified file 'lisp/org/ob.el'
--- a/lisp/org/ob.el    2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob.el    2012-01-05 18:18:05 +0000
@@ -2068,25 +2068,29 @@
                      (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)