ソースを参照

babel: more compiler cleanup -- now only throwing 1 warning (which doesn't make sense anyways)

Eric Schulte 15 年 前
コミット
32c985ffd9

+ 2 - 4
lisp/babel/ob-comint.el

@@ -36,8 +36,6 @@
 (require 'ob)
 (require 'ob)
 (require 'comint)
 (require 'comint)
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defun org-babel-comint-buffer-livep (buffer)
 (defun org-babel-comint-buffer-livep (buffer)
   "Check if BUFFER is a comint buffer with a live process."
   "Check if BUFFER is a comint buffer with a live process."
   (let ((buffer (if buffer (get-buffer buffer))))
   (let ((buffer (if buffer (get-buffer buffer))))
@@ -69,8 +67,8 @@ or user `keyboard-quit' during execution of body."
   (declare (indent 1))
   (declare (indent 1))
   (let ((buffer (car meta))
   (let ((buffer (car meta))
 	(eoe-indicator (cadr meta))
 	(eoe-indicator (cadr meta))
-	(remove-echo (caddr meta))
-	(full-body (cadddr meta)))
+	(remove-echo (cadr (cdr meta)))
+	(full-body (cadr (cdr (cdr meta)))))
     `(org-babel-comint-in-buffer ,buffer
     `(org-babel-comint-in-buffer ,buffer
        (let ((string-buffer "") dangling-text)
        (let ((string-buffer "") dangling-text)
 	 (flet ((my-filt (text)
 	 (flet ((my-filt (text)

+ 0 - 2
lisp/babel/ob-exp.el

@@ -34,8 +34,6 @@
 (eval-when-compile
 (eval-when-compile
   (require 'cl))
   (require 'cl))
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defvar obe-marker nil)
 (defvar obe-marker nil)
 (defvar org-current-export-file)
 (defvar org-current-export-file)
 (defvar org-babel-lob-one-liner-regexp)
 (defvar org-babel-lob-one-liner-regexp)

+ 0 - 2
lisp/babel/ob-keys.el

@@ -34,8 +34,6 @@
 ;;; Code:
 ;;; Code:
 (require 'ob)
 (require 'ob)
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defvar org-babel-key-prefix "\C-c\C-v"
 (defvar org-babel-key-prefix "\C-c\C-v"
   "The `org-babel-key-prefix' variable holds the key prefix
   "The `org-babel-key-prefix' variable holds the key prefix
 behind which all org-babel interactive key-binding are placed.
 behind which all org-babel interactive key-binding are placed.

+ 0 - 2
lisp/babel/ob-lob.el

@@ -33,8 +33,6 @@
 (require 'ob-table)
 (require 'ob-table)
 (require 'ob-exp)
 (require 'ob-exp)
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defvar org-babel-library-of-babel nil
 (defvar org-babel-library-of-babel nil
   "Library of source-code blocks.  This is an association list.
   "Library of source-code blocks.  This is an association list.
 Populate the library by adding files to `org-babel-lob-files'.")
 Populate the library by adding files to `org-babel-lob-files'.")

+ 0 - 2
lisp/babel/ob-ref.el

@@ -56,8 +56,6 @@
 (eval-when-compile
 (eval-when-compile
   (require 'cl))
   (require 'cl))
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defun org-babel-ref-variables (params)
 (defun org-babel-ref-variables (params)
   "Takes a parameter alist, and return an alist of variable
   "Takes a parameter alist, and return an alist of variable
 names, and the emacs-lisp representation of the related value."
 names, and the emacs-lisp representation of the related value."

+ 0 - 2
lisp/babel/ob-table.el

@@ -55,8 +55,6 @@
 ;;; Code:
 ;;; Code:
 (require 'ob)
 (require 'ob)
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defun org-babel-table-truncate-at-newline (string)
 (defun org-babel-table-truncate-at-newline (string)
   "If STRING ends in a newline character, then remove the newline
   "If STRING ends in a newline character, then remove the newline
 character and replace it with ellipses."
 character and replace it with ellipses."

+ 0 - 2
lisp/babel/ob-tangle.el

@@ -33,8 +33,6 @@
 (eval-when-compile
 (eval-when-compile
   (require 'cl))
   (require 'cl))
 
 
-(declare-function org-babel-get-src-block-info "ob" (&optional hvo))
-
 (defvar org-babel-tangle-langs nil
 (defvar org-babel-tangle-langs nil
   "List of languages supported by `org-babel-tangle'.  The first
   "List of languages supported by `org-babel-tangle'.  The first
 element of each language's list is a string indicating the name
 element of each language's list is a string indicating the name

+ 10 - 10
lisp/babel/ob.el

@@ -49,6 +49,16 @@
 (declare-function tramp-file-name-user "tramp" (vec))
 (declare-function tramp-file-name-user "tramp" (vec))
 (declare-function tramp-file-name-host "tramp" (vec))
 (declare-function tramp-file-name-host "tramp" (vec))
 
 
+(defvar org-babel-source-name-regexp
+  "^[ \t]*#\\+\\(srcname\\|source\\|function\\):[ \t]*"
+  "Regular expression used to match a source name line.")
+
+(defvar org-babel-src-block-regexp nil
+  "Regexp used to test when inside of a org-babel src-block")
+
+(defvar org-babel-inline-src-block-regexp nil
+  "Regexp used to test when on an inline org-babel src-block")
+
 (defun org-babel-get-src-block-info (&optional header-vars-only)
 (defun org-babel-get-src-block-info (&optional header-vars-only)
   "Get information of the current source block.
   "Get information of the current source block.
 
 
@@ -176,22 +186,12 @@ header arguments as well.")
 (defvar org-babel-current-buffer-properties)
 (defvar org-babel-current-buffer-properties)
 (make-variable-buffer-local 'org-babel-current-buffer-properties)
 (make-variable-buffer-local 'org-babel-current-buffer-properties)
 
 
-(defvar org-babel-src-block-regexp nil
-  "Regexp used to test when inside of a org-babel src-block")
-
-(defvar org-babel-inline-src-block-regexp nil
-  "Regexp used to test when on an inline org-babel src-block")
-
 (defvar org-babel-result-regexp
 (defvar org-babel-result-regexp
   "^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:"
   "^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:"
   "Regular expression used to match result lines.  If the
   "Regular expression used to match result lines.  If the
 results are associated with a hash key then the hash will be
 results are associated with a hash key then the hash will be
 saved in the second match data.")
 saved in the second match data.")
 
 
-(defvar org-babel-source-name-regexp
-  "^[ \t]*#\\+\\(srcname\\|source\\|function\\):[ \t]*"
-  "Regular expression used to match a source name line.")
-
 (defvar org-babel-min-lines-for-block-output 10
 (defvar org-babel-min-lines-for-block-output 10
   "If number of lines of output is equal to or exceeds this
   "If number of lines of output is equal to or exceeds this
 value, the output is placed in a #+begin_example...#+end_example
 value, the output is placed in a #+begin_example...#+end_example