Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
Carsten Dominik
commit
263c109c52
|
|
@ -145,8 +145,9 @@ formats. Follow the instructions for [[http://orgmode.org/manual/Installation.h
|
|||
|
||||
You can check out the latest Org development version (along with every
|
||||
release we ever had) by using git. The git repository is [[http://repo.or.cz/w/org-mode.git][browsable
|
||||
online]]. To get a local clone use something like the following (from
|
||||
the command line....):
|
||||
online]]. At any time you can get a [[http://repo.or.cz/w/org-mode.git/snapshot][snapshot]] of the files in it. To
|
||||
get a local clone of the repository use something like the following
|
||||
(from the command line....):
|
||||
|
||||
: git clone git://repo.or.cz/org-mode.git
|
||||
|
||||
|
|
|
|||
|
|
@ -91,28 +91,28 @@
|
|||
(defvar swank-clojure-extra-classpaths)
|
||||
(defun org-babel-clojure-babel-clojure-cmd ()
|
||||
"Create the command to start clojure according to current settings."
|
||||
(if (and (not swank-clojure-binary) (not swank-clojure-classpath))
|
||||
(or (when swank-clojure-binary
|
||||
(if (listp swank-clojure-binary)
|
||||
swank-clojure-binary
|
||||
(list swank-clojure-binary)))
|
||||
(when swank-clojure-classpath
|
||||
(delq
|
||||
nil
|
||||
(append
|
||||
(list swank-clojure-java-path)
|
||||
swank-clojure-extra-vm-args
|
||||
(list
|
||||
(when swank-clojure-library-paths
|
||||
(concat "-Djava.library.path="
|
||||
(swank-clojure-concat-paths swank-clojure-library-paths)))
|
||||
"-classpath"
|
||||
(swank-clojure-concat-paths
|
||||
(append
|
||||
swank-clojure-classpath
|
||||
swank-clojure-extra-classpaths))
|
||||
"clojure.main"))))
|
||||
(error "%s" (concat "You must specifiy either a `swank-clojure-binary' "
|
||||
"or a `swank-clojure-jar-path'"))
|
||||
(if swank-clojure-binary
|
||||
(if (listp swank-clojure-binary)
|
||||
swank-clojure-binary
|
||||
(list swank-clojure-binary))
|
||||
(delq
|
||||
nil
|
||||
(append
|
||||
(list swank-clojure-java-path)
|
||||
swank-clojure-extra-vm-args
|
||||
(list
|
||||
(when swank-clojure-library-paths
|
||||
(concat "-Djava.library.path="
|
||||
(swank-clojure-concat-paths swank-clojure-library-paths)))
|
||||
"-classpath"
|
||||
(swank-clojure-concat-paths
|
||||
(append
|
||||
swank-clojure-classpath
|
||||
swank-clojure-extra-classpaths))
|
||||
"clojure.main"))))))
|
||||
"or a `swank-clojure-classpath'"))))
|
||||
|
||||
(defun org-babel-clojure-table-or-string (results)
|
||||
"Convert RESULTS to an elisp value.
|
||||
|
|
|
|||
|
|
@ -4499,17 +4499,20 @@ the documentation of `org-diary'."
|
|||
category (org-get-category beg)
|
||||
todo-state (org-get-todo-state))
|
||||
|
||||
(if (string-match "\\S-" result)
|
||||
(setq txt result)
|
||||
(setq txt "SEXP entry returned empty string"))
|
||||
(dolist (r (if (stringp result)
|
||||
(list result)
|
||||
result)) ;; we expect a list here
|
||||
(if (string-match "\\S-" r)
|
||||
(setq txt r)
|
||||
(setq txt "SEXP entry returned empty string"))
|
||||
|
||||
(setq txt (org-format-agenda-item
|
||||
"" txt category tags 'time))
|
||||
(org-add-props txt props 'org-marker marker)
|
||||
(org-add-props txt nil
|
||||
'org-category category 'date date 'todo-state todo-state
|
||||
'type "sexp")
|
||||
(push txt ee))))
|
||||
(setq txt (org-format-agenda-item
|
||||
"" txt category tags 'time))
|
||||
(org-add-props txt props 'org-marker marker)
|
||||
(org-add-props txt nil
|
||||
'org-category category 'date date 'todo-state todo-state
|
||||
'type "sexp")
|
||||
(push txt ee)))))
|
||||
(nreverse ee)))
|
||||
|
||||
(defun org-diary-class (m1 d1 y1 m2 d2 y2 dayname &rest skip-weeks)
|
||||
|
|
|
|||
|
|
@ -338,8 +338,7 @@ This is used by Org to re-create the anniversary hash table."
|
|||
(setq text (append text (list tmp)))
|
||||
(setq text (list tmp)))))
|
||||
))
|
||||
(when text
|
||||
(mapconcat 'identity text "; "))))
|
||||
text))
|
||||
|
||||
(defun org-bbdb-complete-link ()
|
||||
"Read a bbdb link with name completion."
|
||||
|
|
|
|||
|
|
@ -948,7 +948,7 @@ Point will be after the empty lines, so insertion can directly be done."
|
|||
(let ((pos (point)))
|
||||
(org-back-over-empty-lines)
|
||||
(delete-region (point) pos)
|
||||
(newline n)))
|
||||
(if (> n 0) (newline n))))
|
||||
|
||||
(defun org-capture-empty-lines-after (&optional n)
|
||||
"Arrange for the correct number of empty lines after the inserted string.
|
||||
|
|
@ -957,7 +957,7 @@ Point will remain at the first line after the inserted text."
|
|||
(org-back-over-empty-lines)
|
||||
(while (looking-at "[ \t]*\n") (replace-match ""))
|
||||
(let ((pos (point)))
|
||||
(newline n)
|
||||
(if (> n 0) (newline n))
|
||||
(goto-char pos)))
|
||||
|
||||
(defvar org-clock-marker) ; Defined in org.el
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@ publishing directory."
|
|||
(org-export-docbook-close-para-maybe)
|
||||
(insert (org-export-docbook-finalize-table
|
||||
(org-format-table-html table-buffer table-orig-buffer
|
||||
'docbook)))))
|
||||
'no-css)))))
|
||||
|
||||
(t
|
||||
;; Normal lines
|
||||
|
|
|
|||
|
|
@ -1838,13 +1838,14 @@ lang=\"%s\" xml:lang=\"%s\">
|
|||
nil))))
|
||||
|
||||
(defvar org-table-number-regexp) ; defined in org-table.el
|
||||
(defun org-format-table-html (lines olines &optional docbook)
|
||||
"Find out which HTML converter to use and return the HTML code."
|
||||
(defun org-format-table-html (lines olines &optional no-css)
|
||||
"Find out which HTML converter to use and return the HTML code.
|
||||
NO-CSS is passed to the exporter."
|
||||
(if (stringp lines)
|
||||
(setq lines (org-split-string lines "\n")))
|
||||
(if (string-match "^[ \t]*|" (car lines))
|
||||
;; A normal org table
|
||||
(org-format-org-table-html lines nil docbook)
|
||||
(org-format-org-table-html lines nil no-css)
|
||||
;; Table made by table.el - test for spanning
|
||||
(let* ((hlines (delq nil (mapcar
|
||||
(lambda (x)
|
||||
|
|
@ -1865,8 +1866,12 @@ lang=\"%s\" xml:lang=\"%s\">
|
|||
(org-format-table-table-html-using-table-generate-source olines)))))
|
||||
|
||||
(defvar org-table-number-fraction) ; defined in org-table.el
|
||||
(defun org-format-org-table-html (lines &optional splice docbook)
|
||||
"Format a table into HTML."
|
||||
(defun org-format-org-table-html (lines &optional splice no-css)
|
||||
"Format a table into HTML.
|
||||
LINES is a list of lines. Optional argument SPLICE means, do not
|
||||
insert header and surrounding <table> tags, just format the lines.
|
||||
Optional argument NO-CSS means use XHTML attributes instead of CSS
|
||||
for formatting. This is required for the DocBook exporter."
|
||||
(require 'org-table)
|
||||
;; Get rid of hlines at beginning and end
|
||||
(if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
|
||||
|
|
@ -1965,7 +1970,9 @@ lang=\"%s\" xml:lang=\"%s\">
|
|||
org-table-number-fraction)
|
||||
"right" "left")))
|
||||
(push align aligns)
|
||||
(format "%s<col align=\"%s\" />%s"
|
||||
(format (if no-css
|
||||
"%s<col align=\"%s\" />%s"
|
||||
"%s<col class=\"%s\" />%s")
|
||||
(if (memq gr '(:start :startend))
|
||||
(prog1
|
||||
(if colgropen
|
||||
|
|
@ -1997,7 +2004,7 @@ lang=\"%s\" xml:lang=\"%s\">
|
|||
(if (not org-export-html-table-align-individual-fields)
|
||||
""
|
||||
(setq n (string-to-number (match-string 1 txt)))
|
||||
(format (if docbook " align=\"%s\"" " class=\"%s\"")
|
||||
(format (if no-css " align=\"%s\"" " class=\"%s\"")
|
||||
(or (nth n aligns) "left"))))
|
||||
x))
|
||||
html))
|
||||
|
|
|
|||
|
|
@ -15026,7 +15026,10 @@ D may be an absolute day number, or a calendar-type list (month day year)."
|
|||
(sleep-for 2))))))
|
||||
(cond ((stringp result) result)
|
||||
((and (consp result)
|
||||
(not (consp (cdr result)))
|
||||
(stringp (cdr result))) (cdr result))
|
||||
((and (consp result)
|
||||
(stringp (car result))) result)
|
||||
(result entry)
|
||||
(t nil))))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue