ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-05-23 12:13:39 +02:00
parent b62b49bc2b 141d0fd24b
commit 31aa82c998
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-plantuml.el
View File

@ -55,9 +55,10 @@ This function is called by `org-babel-execute-src-block'."
(error "plantuml requires a \":file\" header argument"))) (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-"))
(java (or (cdr (assoc :java params)) ""))
(cmd (if (not org-plantuml-jar-path) (cmd (if (not org-plantuml-jar-path)
(error "`org-plantuml-jar-path' is not set") (error "`org-plantuml-jar-path' is not set")
(concat "java -jar " (concat "java " java " -jar "
(shell-quote-argument (shell-quote-argument
(expand-file-name org-plantuml-jar-path)) (expand-file-name org-plantuml-jar-path))
(if (string= (file-name-extension out-file) "svg") (if (string= (file-name-extension out-file) "svg")

15
lisp/ob.el
View File

@ -2040,11 +2040,16 @@ file's directory then expand relative links."
result) result)
(if description (concat "[" description "]") "")))) (if description (concat "[" description "]") ""))))
(defvar org-babel-capitalize-examplize-region-markers nil
"Make true to capitalize begin/end example markers inserted by code blocks.")
(defun org-babel-examplize-region (beg end &optional results-switches) (defun org-babel-examplize-region (beg end &optional results-switches)
"Comment out region using the inline '==' or ': ' org example quote." "Comment out region using the inline '==' or ': ' org example quote."
(interactive "*r") (interactive "*r")
(flet ((chars-between (b e) (flet ((chars-between (b e)
(not (string-match "^[\\s]*$" (buffer-substring b e))))) (not (string-match "^[\\s]*$" (buffer-substring b e))))
(maybe-cap (str) (if org-babel-capitalize-examplize-region-markers
(upcase str) str)))
(if (or (chars-between (save-excursion (goto-char beg) (point-at-bol)) beg) (if (or (chars-between (save-excursion (goto-char beg) (point-at-bol)) beg)
(chars-between end (save-excursion (goto-char end) (point-at-eol)))) (chars-between end (save-excursion (goto-char end) (point-at-eol))))
(save-excursion (save-excursion
@ -2061,10 +2066,12 @@ file's directory then expand relative links."
(t (t
(goto-char beg) (goto-char beg)
(insert (if results-switches (insert (if results-switches
(format "#+begin_example%s\n" results-switches) (format "%s%s\n"
"#+begin_example\n")) (maybe-cap "#+begin_example")
results-switches)
(maybe-cap "#+begin_example\n")))
(if (markerp end) (goto-char end) (forward-char (- end beg))) (if (markerp end) (goto-char end) (forward-char (- end beg)))
(insert "#+end_example\n")))))))) (insert (maybe-cap "#+end_example\n")))))))))
(defun org-babel-update-block-body (new-body) (defun org-babel-update-block-body (new-body)
"Update the body of the current code block to NEW-BODY." "Update the body of the current code block to NEW-BODY."

5
lisp/org.el
View File

@ -12918,10 +12918,7 @@ headlines matching this string."
org-outline-regexp) org-outline-regexp)
" *\\(\\<\\(" " *\\(\\<\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
(org-re (org-re "\\)\\>\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))
(if todo-only
"\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"
"\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))))
(props (list 'face 'default (props (list 'face 'default
'done-face 'org-agenda-done 'done-face 'org-agenda-done
'undone-face 'default 'undone-face 'default