Merge branch 'master' into maint
This commit is contained in:
Carsten Dominik
commit
bacbd4d143
94
Makefile
94
Makefile
|
|
@ -272,6 +272,42 @@ pdf: doc/org.pdf doc/orgguide.pdf
|
|||
|
||||
card: doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt
|
||||
|
||||
testrelease:
|
||||
git checkout -b testrelease maint
|
||||
git merge -s recursive -X theirs master
|
||||
UTILITIES/set-version.pl testing
|
||||
git commit -a -m "Release testing"
|
||||
make distfile TAG=testversion
|
||||
make cleanrel
|
||||
rm -rf org-testversion*
|
||||
git reset --hard
|
||||
git checkout master
|
||||
git branch -D testrelease
|
||||
|
||||
release:
|
||||
git checkout maint
|
||||
git merge -s recursive -X theirs master
|
||||
UTILITIES/set-version.pl $(TAG)
|
||||
git commit -a -m "Release $(TAG)"
|
||||
make relup TAG=$(TAG)
|
||||
make cleanrel
|
||||
rm -rf org-$(TAG)
|
||||
rm org-$(TAG)*.zip
|
||||
rm org-$(TAG)*.tar.gz
|
||||
make pushreleasetag TAG=$(TAG)
|
||||
git push origin maint
|
||||
git checkout master
|
||||
git merge -s ours maint
|
||||
UTILITIES/set-version.pl -o $(TAG)
|
||||
git commit -a -m "Update website to show $(TAG) as current release"
|
||||
git push
|
||||
make updateweb
|
||||
|
||||
relup:
|
||||
${MAKE} makerelease
|
||||
${MAKE} upload_release
|
||||
${MAKE} upload_manual
|
||||
|
||||
distfile:
|
||||
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
|
||||
touch doc/org.texi doc/orgcard.tex # force update
|
||||
|
|
@ -315,44 +351,15 @@ upload_manual:
|
|||
rsync -avuz --delete doc/manual/ cdominik@orgmode.org:orgmode.org/manual/
|
||||
rsync -avuz --delete doc/guide/ cdominik@orgmode.org:orgmode.org/guide/
|
||||
|
||||
relup0:
|
||||
${MAKE} makerelease
|
||||
${MAKE} upload_release
|
||||
cleanall:
|
||||
${MAKE} clean
|
||||
rm -f lisp/org-install.el
|
||||
|
||||
relup:
|
||||
${MAKE} makerelease
|
||||
${MAKE} upload_release
|
||||
${MAKE} upload_manual
|
||||
|
||||
testrelease:
|
||||
git checkout -b testrelease maint
|
||||
git merge -s recursive -X theirs master
|
||||
UTILITIES/set-version.pl testing
|
||||
git commit -a -m "Release testing"
|
||||
make distfile TAG=testversion
|
||||
make cleanrel
|
||||
rm -rf org-testversion*
|
||||
git reset --hard
|
||||
git checkout master
|
||||
git branch -D testrelease
|
||||
|
||||
release:
|
||||
git checkout maint
|
||||
git merge -s recursive -X theirs master
|
||||
UTILITIES/set-version.pl $(TAG)
|
||||
git commit -a -m "Release $(TAG)"
|
||||
make relup TAG=$(TAG)
|
||||
make cleanrel
|
||||
rm -rf org-$(TAG)
|
||||
rm org-$(TAG)*.zip
|
||||
rm org-$(TAG)*.tar.gz
|
||||
make pushreleasetag TAG=$(TAG)
|
||||
git push origin maint
|
||||
git checkout master
|
||||
UTILITIES/set-version.pl -o $(TAG)
|
||||
git commit -a -m "Update website to show $(TAG) as current release"
|
||||
git push
|
||||
make updateweb
|
||||
clean:
|
||||
${MAKE} cleanelc
|
||||
${MAKE} cleandoc
|
||||
${MAKE} cleanrel
|
||||
rm -f *~ */*~ */*/*~
|
||||
|
||||
cleancontrib:
|
||||
find contrib -name \*~ -exec rm {} \;
|
||||
|
|
@ -371,16 +378,6 @@ cleanrel:
|
|||
rm -rf org-6.*
|
||||
rm -rf org-6*zip org-6*tar.gz
|
||||
|
||||
clean:
|
||||
${MAKE} cleanelc
|
||||
${MAKE} cleandoc
|
||||
${MAKE} cleanrel
|
||||
rm -f *~ */*~ */*/*~
|
||||
|
||||
cleanall:
|
||||
${MAKE} clean
|
||||
rm -f lisp/org-install.el
|
||||
|
||||
.el.elc:
|
||||
$(ELC) $<
|
||||
|
||||
|
|
@ -396,9 +393,6 @@ pushreleasetag:
|
|||
git-tag -m "Adding release tag" -a release_$(TAG)
|
||||
git-push git+ssh://repo.or.cz/srv/git/org-mode.git release_$(TAG)
|
||||
|
||||
dummy:
|
||||
echo ${prefix}
|
||||
|
||||
# Dependencies
|
||||
|
||||
lisp/org.elc: lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
|
||||
|
|
|
|||
|
|
@ -123,9 +123,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
|
|||
- <2010-04-06 Tue>: Release 6.35
|
||||
- <2010-01-10 Sun>: Release 6.34
|
||||
|
||||
* Current Version (7.01b)
|
||||
* Current Version (7.01e)
|
||||
|
||||
The current version is 7.01b. To see what has changed in recent
|
||||
The current version is 7.01e. To see what has changed in recent
|
||||
releases, check this detailed list of [[file:Changes.html][user-visible changes]].
|
||||
|
||||
This package works on Emacs 23 and 22, and (with minor restrictions)
|
||||
|
|
@ -137,7 +137,7 @@ recent version, but may lag a bit behind the website release.
|
|||
|
||||
** The standard distribution
|
||||
|
||||
Download as [[file:org-7.01b.zip][zip file]] or [[file:org-7.01b.tar.gz][gzipped tar archive]]. These archives contain
|
||||
Download as [[file:org-7.01e.zip][zip file]] or [[file:org-7.01e.tar.gz][gzipped tar archive]]. These archives contain
|
||||
both the Lisp file org.el and the documentation in PDF and (TeX)Info
|
||||
formats. Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]].
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ and corresponding to the latest git version.
|
|||
|
||||
* Documentation
|
||||
** The Org guide and manual
|
||||
- Read the [[file:manual/index.html][online compact guide]] or download it as a [[file:orgguide.pdf][PDF document]].
|
||||
- Read the [[file:guide/index.html][online compact guide]] or download it as a [[file:orgguide.pdf][PDF document]].
|
||||
The compact guide is a 40-page introduction to Org mode. It
|
||||
covers all features in a basic way and has links to in-depth
|
||||
documentation in the manual and on the web.
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ Read the contents of the file at =file=. The =:results vector= and
|
|||
=:results scalar= header arguments can be used to read the contents of
|
||||
file as either a table or a string.
|
||||
#+srcname: read
|
||||
#+begin_src emacs-lisp :var file=""
|
||||
(if (member "vector" result-params)
|
||||
#+begin_src emacs-lisp :var file="" :var format=""
|
||||
(if (string= format "csv")
|
||||
(with-temp-buffer
|
||||
(org-table-import (expand-file-name file) nil)
|
||||
(org-table-to-lisp))
|
||||
|
|
@ -82,14 +82,13 @@ The =google= command seems to be throwing "Moved Temporarily" errors
|
|||
when trying to download textual documents, but this is working fine
|
||||
for spreadsheets.
|
||||
#+source: gdoc-read
|
||||
#+begin_src emacs-lisp :var title="example"
|
||||
(let* ((format (if (member "vector" result-params) "csv" "txt"))
|
||||
(file (concat title "." format))
|
||||
#+begin_src emacs-lisp :var title="example" :var format="csv"
|
||||
(let* ((file (concat title "." format))
|
||||
(cmd (format "google docs get --format %S --title %S" format title)))
|
||||
(message cmd) (message (shell-command-to-string cmd))
|
||||
(prog1 (if (string= format "csv")
|
||||
(with-temp-buffer
|
||||
(org-table-import (shell-quote-argument file) nil)
|
||||
(org-table-import (shell-quote-argument file) '(4))
|
||||
(org-table-to-lisp))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents (shell-quote-argument file))
|
||||
|
|
@ -99,15 +98,11 @@ for spreadsheets.
|
|||
|
||||
For example, a line like the following can be used to read the
|
||||
contents of a spreadsheet named =num-cells= into a table.
|
||||
#+begin_src org
|
||||
,#+call: gdoc-read(title="num-cells"") :results vector
|
||||
#+end_src
|
||||
: #+call: gdoc-read(title="num-cells"")
|
||||
|
||||
A line like the following can be used to read the contents of a
|
||||
document as a string.
|
||||
#+begin_src org
|
||||
,#+call: gdoc-read(title="loremi") :results scalar
|
||||
#+end_src
|
||||
: #+call: gdoc-read(title="loremi", :format "txt")
|
||||
|
||||
****** write a document to a Google docs
|
||||
Write =data= to a google document named =title=. If =data= is tabular
|
||||
|
|
@ -129,15 +124,13 @@ normal document.
|
|||
#+end_src
|
||||
|
||||
example usage
|
||||
#+begin_src org
|
||||
,#+source: fibs
|
||||
,#+begin_src emacs-lisp :var n=8
|
||||
, (flet ((fib (m) (if (< m 2) 1 (+ (fib (- m 1)) (fib (- m 2))))))
|
||||
, (mapcar (lambda (el) (list el (fib el))) (number-sequence 0 (- n 1))))
|
||||
,#+end_src
|
||||
|
||||
,#+call: gdoc-write(title="fibs", data=fibs(n=10))
|
||||
#+end_src
|
||||
: #+source: fibs
|
||||
: #+begin_src emacs-lisp :var n=8
|
||||
: (flet ((fib (m) (if (< m 2) 1 (+ (fib (- m 1)) (fib (- m 2))))))
|
||||
: (mapcar (lambda (el) (list el (fib el))) (number-sequence 0 (- n 1))))
|
||||
: #+end_src
|
||||
:
|
||||
: #+call: gdoc-write(title="fibs", data=fibs(n=10))
|
||||
|
||||
* Plotting code
|
||||
|
||||
|
|
|
|||
12
doc/org.texi
12
doc/org.texi
|
|
@ -10979,9 +10979,9 @@ e.g.
|
|||
|
||||
Org-mode provides a number of features for working with live source code,
|
||||
including editing of code blocks in their native major-mode, evaluation of
|
||||
code blocks, tangling of code blocks, and exporting code blocks and
|
||||
their results in several formats. This functionality was contributed by Dan
|
||||
Davison and Eric Schulte, and was originally named Org-babel.
|
||||
code blocks, tangling of code blocks, and exporting code blocks and their
|
||||
results in several formats. This functionality was contributed by Eric
|
||||
Schulte and Dan Davison, and was originally named Org-babel.
|
||||
|
||||
The following sections describe Org-mode's code block handling facilities.
|
||||
|
||||
|
|
@ -13286,8 +13286,10 @@ Also the @kbd{M-cursor} and @kbd{M-S-cursor} keys have this property.
|
|||
Add-ons can tap into this functionality by providing a function that detects
|
||||
special context for that add-on and executes functionality appropriate for
|
||||
the context. Here is an example from Dan Davison's @file{org-R.el} which
|
||||
allows you to evaluate commands based on the @file{R} programming language. For
|
||||
this package, special contexts are lines that start with @code{#+R:} or
|
||||
allows you to evaluate commands based on the @file{R} programming language
|
||||
@footnote{@file{org-R.el} has been replaced by the org-mode functionality
|
||||
described in @ref{Working With Source Code} and is now obsolete.}. For this
|
||||
package, special contexts are lines that start with @code{#+R:} or
|
||||
@code{#+RR:}.
|
||||
|
||||
@lisp
|
||||
|
|
|
|||
|
|
@ -61,9 +61,10 @@ If you change the value of this variable then your files may
|
|||
become unusable by other org-babel users, and vice versa.")
|
||||
|
||||
(defconst org-babel-lob-one-liner-regexp
|
||||
(concat "^\\([ \t]*\\)#\\+\\(?:"
|
||||
(mapconcat #'regexp-quote org-babel-lob-call-aliases "\\|")
|
||||
"\\):[ \t]+\\([^\(\)\n]+\\)\(\\([^\n]*\\)\)[ \t]*\\([^\n]*\\)")
|
||||
(concat
|
||||
"^\\([ \t]*\\)#\\+\\(?:"
|
||||
(mapconcat #'regexp-quote org-babel-lob-call-aliases "\\|")
|
||||
"\\):[ \t]+\\([^\(\)\n]+\\)\(\\([^\n]*\\)\)\\(\\[.+\\]\\)[ \t]*\\([^\n]*\\)")
|
||||
"Regexp to match calls to predefined source block functions.")
|
||||
|
||||
;; functions for executing lob one-liners
|
||||
|
|
@ -92,10 +93,13 @@ the word 'call'."
|
|||
(save-excursion
|
||||
(beginning-of-line 1)
|
||||
(if (looking-at org-babel-lob-one-liner-regexp)
|
||||
(append (mapcar #'org-babel-clean-text-properties
|
||||
(list (format "%s(%s)" (match-string 2) (match-string 3))
|
||||
(match-string 4)))
|
||||
(list (length (match-string 1))))))))
|
||||
(append
|
||||
(mapcar #'org-babel-clean-text-properties
|
||||
(list
|
||||
(format "%s(%s)%s"
|
||||
(match-string 2) (match-string 3) (match-string 4))
|
||||
(match-string 5)))
|
||||
(list (length (match-string 1))))))))
|
||||
|
||||
(defun org-babel-lob-execute (info)
|
||||
"Execute the lob call specified by INFO."
|
||||
|
|
@ -105,7 +109,8 @@ the word 'call'."
|
|||
(org-babel-params-from-properties)
|
||||
(org-babel-parse-header-arguments
|
||||
(org-babel-clean-text-properties
|
||||
(concat ":var results=" (mapconcat #'identity (butlast info) " ")))))))
|
||||
(concat ":var results="
|
||||
(mapconcat #'identity (butlast info) " ")))))))
|
||||
(org-babel-execute-src-block
|
||||
nil (list "emacs-lisp" "results" params nil nil (nth 2 info)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1691,7 +1691,7 @@ When it is nil, all comments will be removed."
|
|||
(while (or (looking-at re)
|
||||
(re-search-forward re nil t))
|
||||
(setq pos (match-beginning 0))
|
||||
(if (get-text-property (point) 'org-protected)
|
||||
(if (get-text-property (match-beginning 1) 'org-protected)
|
||||
(goto-char (1+ pos))
|
||||
(goto-char (1+ pos))
|
||||
(replace-match "")
|
||||
|
|
|
|||
Loading…
Reference in New Issue