Mercurial > emacs
changeset 109812:063e94b66261
Fix some Org errors revealed by `make check-declare'.
* ob.el (tramp-compat-make-temp-file, org-edit-src-code)
(org-entry-get, org-table-import): Fix declarations.
(org-match-string-no-properties): Remove declaration.
* ob-sh.el (org-babel-comint-in-buffer)
(org-babel-comint-wait-for-output, org-babel-comint-buffer-livep)
(org-babel-comint-with-output): Remove unnecessary declarations.
* ob-R.el (orgtbl-to-tsv): Fix declaration.
* org-list.el (org-entry-get): Fix declaration.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 17 Aug 2010 00:29:26 -0700 |
| parents | d06b7ff1ea84 |
| children | 17256ad564e9 |
| files | lisp/org/ChangeLog lisp/org/ob-R.el lisp/org/ob-sh.el lisp/org/ob.el lisp/org/org-list.el |
| diffstat | 5 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/ChangeLog Tue Aug 17 00:04:35 2010 -0700 +++ b/lisp/org/ChangeLog Tue Aug 17 00:29:26 2010 -0700 @@ -1,3 +1,14 @@ +2010-08-17 Glenn Morris <rgm@gnu.org> + + * ob.el (tramp-compat-make-temp-file, org-edit-src-code) + (org-entry-get, org-table-import): Fix declarations. + (org-match-string-no-properties): Remove unnecessary declaration. + * ob-sh.el (org-babel-comint-in-buffer) + (org-babel-comint-wait-for-output, org-babel-comint-buffer-livep) + (org-babel-comint-with-output): Remove unnecessary declarations. + * ob-R.el (orgtbl-to-tsv): Fix declaration. + * org-list.el (org-entry-get): Fix declaration. + 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * ob-C.el: New file.
--- a/lisp/org/ob-R.el Tue Aug 17 00:04:35 2010 -0700 +++ b/lisp/org/ob-R.el Tue Aug 17 00:29:26 2010 -0700 @@ -33,7 +33,7 @@ (require 'ob-eval) (eval-when-compile (require 'cl)) -(declare-function orgtbl-to-tsv "ob-table" (table params)) +(declare-function orgtbl-to-tsv "org-table" (table params)) (declare-function R "ext:essd-r" (&optional start-args)) (declare-function inferior-ess-send-input "ext:ess-inf" ())
--- a/lisp/org/ob-sh.el Tue Aug 17 00:04:35 2010 -0700 +++ b/lisp/org/ob-sh.el Tue Aug 17 00:29:26 2010 -0700 @@ -34,10 +34,6 @@ (eval-when-compile (require 'cl)) (declare-function org-babel-ref-variables "ob-ref" (params)) -(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)) -(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer)) -(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer)) -(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)) (declare-function orgtbl-to-generic "org-table" (table params)) (defvar org-babel-default-header-args:sh '())
--- a/lisp/org/ob.el Tue Aug 17 00:04:35 2010 -0700 +++ b/lisp/org/ob.el Tue Aug 17 00:29:26 2010 -0700 @@ -25,7 +25,7 @@ ;;; Commentary: ;; See the online documentation for more information -;; +;; ;; http://orgmode.org/worg/org-contrib/babel/ ;;; Code: @@ -34,24 +34,25 @@ (defvar org-babel-call-process-region-original) (declare-function show-all "outline" ()) -(declare-function tramp-compat-make-temp-file "tramp" (filename &optional dir-flag)) +(declare-function tramp-compat-make-temp-file "tramp-compat" + (filename &optional dir-flag)) (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault)) (declare-function tramp-file-name-user "tramp" (vec)) (declare-function tramp-file-name-host "tramp" (vec)) (declare-function org-icompleting-read "org" (&rest args)) -(declare-function org-edit-src-code "org" (context code edit-buffer-name)) +(declare-function org-edit-src-code "org-src" + (&optional context code edit-buffer-name)) (declare-function org-open-at-point "org" (&optional in-emacs reference-buffer)) (declare-function org-save-outline-visibility "org" (use-markers &rest body)) (declare-function org-narrow-to-subtree "org" ()) -(declare-function org-entry-get "org" (pom property &optional inherit)) +(declare-function org-entry-get "org" (pom property &optional inherit literal-nil)) (declare-function org-make-options-regexp "org" (kwds &optional extra)) -(declare-function org-match-string-no-properties "org" (num &optional string)) (declare-function org-do-remove-indentation "org" (&optional n)) (declare-function org-show-context "org" (&optional key)) (declare-function org-at-table-p "org" (&optional table-type)) (declare-function org-cycle "org" (&optional arg)) (declare-function org-uniquify "org" (list)) -(declare-function org-table-import "org" (file arg)) +(declare-function org-table-import "org-table" (file arg)) (declare-function org-add-hook "org-compat" (hook function &optional append local)) (declare-function org-table-align "org-table" ()) (declare-function org-table-end "org-table" (&optional table-type))
--- a/lisp/org/org-list.el Tue Aug 17 00:04:35 2010 -0700 +++ b/lisp/org/org-list.el Tue Aug 17 00:29:26 2010 -0700 @@ -51,7 +51,8 @@ (declare-function org-get-indentation "org" (&optional line)) (declare-function org-timer-item "org-timer" (&optional arg)) (declare-function org-combine-plists "org" (&rest plists)) -(declare-function org-entry-get "org" (pom property &optional inherit)) +(declare-function org-entry-get "org" + (pom property &optional inherit literal-nil)) (declare-function org-narrow-to-subtree "org" ()) (declare-function org-show-subtree "org" ())