Browse Source

Merge branch 'master' of git://repo.or.cz/org-mode

Dan Davison 15 years ago
parent
commit
ad1ab9d419
5 changed files with 22 additions and 4 deletions
  1. 2 0
      doc/orgcard.tex
  2. 2 0
      lisp/ob-keys.el
  3. 2 1
      lisp/ob-plantuml.el
  4. 14 2
      lisp/ob.el
  5. 2 1
      lisp/org-exp-blocks.el

+ 2 - 0
doc/orgcard.tex

@@ -480,8 +480,10 @@ formula, \kbd{:=} a field formula.
 \key{view expanded body of code block at point}{C-c C-v v}
 \key{view expanded body of code block at point}{C-c C-v v}
 \key{go to named code block}{C-c C-v g}
 \key{go to named code block}{C-c C-v g}
 \key{go to named result}{C-c C-v r}
 \key{go to named result}{C-c C-v r}
+\key{go to the head of the current code block}{C-c C-v u}
 \key{go to the next code block}{C-c C-v n}
 \key{go to the next code block}{C-c C-v n}
 \key{go to the previous code block}{C-c C-v p}
 \key{go to the previous code block}{C-c C-v p}
+\key{execute the next key sequence in the code edit buffer}{C-c C-v x}
 \key{execute all code blocks in current buffer}{C-c C-v b}
 \key{execute all code blocks in current buffer}{C-c C-v b}
 \key{execute all code blocks in current subtree}{C-c C-v s}
 \key{execute all code blocks in current subtree}{C-c C-v s}
 \key{tangle code blocks in current file}{C-c C-v t}
 \key{tangle code blocks in current file}{C-c C-v t}

+ 2 - 0
lisp/ob-keys.el

@@ -58,6 +58,8 @@ functions which are assigned key bindings, and see
     ("\C-o" . org-babel-open-src-block-result)
     ("\C-o" . org-babel-open-src-block-result)
     ("\C-v" . org-babel-expand-src-block)
     ("\C-v" . org-babel-expand-src-block)
     ("v" . org-babel-expand-src-block)
     ("v" . org-babel-expand-src-block)
+    ("u" . org-babel-goto-src-block-head)
+    ("\C-u" . org-babel-goto-src-block-head)
     ("g" . org-babel-goto-named-src-block)
     ("g" . org-babel-goto-named-src-block)
     ("r" . org-babel-goto-named-result)
     ("r" . org-babel-goto-named-result)
     ("\C-r" . org-babel-goto-named-result)
     ("\C-r" . org-babel-goto-named-result)

+ 2 - 1
lisp/ob-plantuml.el

@@ -54,7 +54,8 @@
   "Execute a block of plantuml code with org-babel.
   "Execute a block of plantuml code with org-babel.
 This function is called by `org-babel-execute-src-block'."
 This function is called by `org-babel-execute-src-block'."
   (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
   (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
-	 (out-file (cdr (assoc :file params)))
+	 (out-file (or (cdr (assoc :file params))
+		       (error "plantuml requires a \":file\" header argument")))
 	 (cmdline (cdr (assoc :cmdline params)))
 	 (cmdline (cdr (assoc :cmdline params)))
 	 (in-file (org-babel-temp-file "plantuml-"))
 	 (in-file (org-babel-temp-file "plantuml-"))
 	 (cmd (if (not org-plantuml-jar-path)
 	 (cmd (if (not org-plantuml-jar-path)

+ 14 - 2
lisp/ob.el

@@ -1021,6 +1021,14 @@ If the point is not on a source block then return nil."
 	       (looking-at org-babel-src-block-regexp))
 	       (looking-at org-babel-src-block-regexp))
         (point))))))
         (point))))))
 
 
+;;;###autoload
+(defun org-babel-goto-src-block-head ()
+  "Go to the beginning of the current code block."
+  (interactive)
+  ((lambda (head)
+     (if head (goto-char head) (error "not currently in a code block")))
+   (org-babel-where-is-src-block-head)))
+
 ;;;###autoload
 ;;;###autoload
 (defun org-babel-goto-named-src-block (name)
 (defun org-babel-goto-named-src-block (name)
   "Go to a named source-code block."
   "Go to a named source-code block."
@@ -1097,7 +1105,9 @@ buffer or nil if no such result exists."
 With optional prefix argument ARG, jump forward ARG many source blocks."
 With optional prefix argument ARG, jump forward ARG many source blocks."
   (interactive "P")
   (interactive "P")
   (when (looking-at org-babel-src-block-regexp) (forward-char 1))
   (when (looking-at org-babel-src-block-regexp) (forward-char 1))
-  (re-search-forward org-babel-src-block-regexp nil nil (or arg 1))
+  (condition-case nil
+      (re-search-forward org-babel-src-block-regexp nil nil (or arg 1))
+    (error (error "No further code blocks")))
   (goto-char (match-beginning 0)) (org-show-context))
   (goto-char (match-beginning 0)) (org-show-context))
 
 
 ;;;###autoload
 ;;;###autoload
@@ -1105,7 +1115,9 @@ With optional prefix argument ARG, jump forward ARG many source blocks."
   "Jump to the previous source block.
   "Jump to the previous source block.
 With optional prefix argument ARG, jump backward ARG many source blocks."
 With optional prefix argument ARG, jump backward ARG many source blocks."
   (interactive "P")
   (interactive "P")
-  (re-search-backward org-babel-src-block-regexp nil nil (or arg 1))
+  (condition-case nil
+      (re-search-backward org-babel-src-block-regexp nil nil (or arg 1))
+    (error (error "No previous code blocks")))
   (goto-char (match-beginning 0)) (org-show-context))
   (goto-char (match-beginning 0)) (org-show-context))
 
 
 (defvar org-babel-lob-one-liner-regexp)
 (defvar org-babel-lob-one-liner-regexp)

+ 2 - 1
lisp/org-exp-blocks.el

@@ -201,7 +201,8 @@ which defaults to the value of `org-export-blocks-witheld'."
 	(interblock start (point-max))
 	(interblock start (point-max))
 	(run-hooks 'org-export-blocks-postblock-hook)))))
 	(run-hooks 'org-export-blocks-postblock-hook)))))
 
 
-(add-hook 'org-export-preprocess-hook 'org-export-blocks-preprocess)
+(add-hook 'org-export-preprocess-after-include-files-hook
+	  'org-export-blocks-preprocess)
 
 
 ;;================================================================================
 ;;================================================================================
 ;; type specific functions
 ;; type specific functions