mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Code Issues Projects Releases Wiki Activity

Fix some compiler warnings.

Browse source
This commit is contained in:
Bastien Guerry 2012-01-05 19:18:05 +01:00
parent c74587e6b0
commit d660637a80
3 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/org/ChangeLog
View file

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

6
lisp/org/ob-maxima.el
View file

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

32
lisp/org/ob.el
View file

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