diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2011-06-14 11:23:56 -0700 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2011-06-14 11:23:56 -0700 |
commit | 95f9aa5ff543b0e46af84244868f4f70bafd2086 (patch) | |
tree | 01765f58c4e4da71bc6c58bffb9f8d6545225acc | |
parent | 2601678dc0f0c29ee711af2d43d58e3b0fb03c6e (diff) | |
download | org-mode-95f9aa5ff543b0e46af84244868f4f70bafd2086.tar.gz |
fixing compiler warnings for Babel functions
* lisp/ob-R.el (ess-local-process-name): This variable wasn't known to
be defined.
* lisp/ob-lisp.el (org-babel-lisp-dir-fmt): This defcustom now has a
group specified.
* lisp/ob-tangle.el (org-bracket-link-regexp): This variable wasn't
known to be defined.
(org-babel-tangle-combine-named-blocks): Roll my own version of a
forbidden common lisp function.
* lisp/ob.el (org-babel-sha1-hash): Using a non-deprecated version of
called-interactively.
-rw-r--r-- | lisp/ob-R.el | 1 | ||||
-rw-r--r-- | lisp/ob-lisp.el | 4 | ||||
-rw-r--r-- | lisp/ob-tangle.el | 12 | ||||
-rw-r--r-- | lisp/ob.el | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el index d0efcbb..8d39860 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -51,6 +51,7 @@ (defvar org-babel-R-command "R --slave --no-save" "Name of command to use for executing R code.") +(defvar ess-local-process-name) (defun org-babel-edit-prep:R (info) (let ((session (cdr (assoc :session (nth 2 info))))) (when (and session (string-match "^\\*\\(.+?\\)\\*$" session)) diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index 4baf603..a576f97 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -45,7 +45,9 @@ "(let ((*default-pathname-defaults* #P%S)) %%s)" "Format string used to wrap code bodies to set the current directory. For example a value of \"(progn ;; %s\\n %%s)\" would ignore the -current directory string.") +current directory string." + :group 'org-babel + :type 'string) (defun org-babel-expand-body:lisp (body params) "Expand BODY according to PARAMS, return the expanded body." diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 8c13cf9..77b4866 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -279,6 +279,7 @@ references." (save-excursion (end-of-line 1) (forward-char 1) (point))))) (defvar org-stored-links) +(defvar org-bracket-link-regexp) (defun org-babel-tangle-collect-blocks (&optional language) "Collect source blocks in the current Org-mode file. Return an association list of source-code block specifications of @@ -389,10 +390,13 @@ same name in the order they appear in the file." (nth 5 spec) (let ((named (mapcar (lambda (el) (nth 5 el)) - (remove-if - (lambda (el) - (not (equal name (nth 3 el)))) - (cdr by-lang))))) + (delq + nil + (mapcar + (lambda (el) + (when (equal name (nth 3 el)) + el)) + (cdr by-lang)))))) (case org-babel-tangle-named-block-combination (append (mapconcat #'identity named "")) @@ -752,7 +752,7 @@ the current subtree." (setf (nth 2 info) (sort (copy-sequence (nth 2 info)) (lambda (a b) (string< (car a) (car b))))) - ((lambda (hash) (when (interactive-p) (message hash)) hash) + ((lambda (hash) (when (called-interactively-p 'interactive) (message hash)) hash) (sha1 (format "%s-%s" (mapconcat #'identity |