d4710bd0aa
Merge branch 'maint'
2013-12-23 06:58:46 +01:00
fc3857b310
Small rewrite of the previous commit.
...
Use `regexp-opt' instead of `regexp-quote'.
2013-12-23 06:58:26 +01:00
acfe7255ff
Merge branch 'maint'
2013-12-23 00:11:37 +01:00
a7417ffcdb
org-habit.el (org-habit-parse-todo): Match all TODO keywords, not just "TODO"
...
* org-habit.el (org-habit-parse-todo): Match all TODO
keywords, not just "TODO".
TINYCHANGE
2013-12-23 00:10:44 +01:00
3d4e8b4c00
Merge branch 'master' of orgmode.org:org-mode
2013-12-22 23:37:43 +01:00
66f55af525
Merge branch 'maint'
2013-12-22 23:37:27 +01:00
6999c5cc84
doc/org.texi: Add #+BEGIN_ABSTRACT as example
...
* org.texi (Special blocks): Add #+BEGIN_ABSTRACT as another
example.
(@LaTeX{} specific attributes): New index entries. Use
#+BEGIN_ABSTRACT in the example.
2013-12-22 23:36:38 +01:00
5587b8dd51
README: adding org-license.el and org-effectiveness.el
2013-12-22 22:17:29 +01:00
fa2e39148f
lisp/ob-J.el (obj-string-match-m): add missing function
2013-12-22 18:48:29 +01:00
b291cdbe6d
Merge branch 'maint'
2013-12-22 10:10:02 +01:00
eb28fe41dc
org-table.el (org-table-fix-formulas): Handle multiple #+tblfm: lines
...
* org-table.el (org-table-fix-formulas): Handle multiple
#+tblfm: lines.
Thanks to Daniel Gerber for reporting this problem.
2013-12-22 10:09:53 +01:00
3b3e116376
Merge branch 'maint'
2013-12-22 09:42:02 +01:00
fc5cf0d922
* server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el.
...
* server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el
in org-plus-contrib ELPA package.
Thanks to Francesco Pizzolante for reporting this.
2013-12-22 09:41:50 +01:00
baa60de32d
Merge branch 'maint'
2013-12-22 09:26:09 +01:00
9469f366cd
* contrib/lisp/ob-oz.el (mozart): Don't throw an error
...
* contrib/lisp/ob-oz.el (mozart): Don't throw an error if the
mozart library is not present in the load-path.
2013-12-22 09:25:58 +01:00
060e6eff06
Merge branch 'maint'
2013-12-22 09:19:21 +01:00
22af33a015
org-as-mac-chrome-get-frontmost-url: Fix to remove unneeded double quotes.
...
* contrib/lisp/org-mac-link.el: Fix bug: remove double quotes.
TINYCHANGE
Applescript returns the link and description in quotes like this:
[["http://orgmode.org/worg/org-contribute.html#sec-4 ][How to contribute to Org?"]]
The fix changes it to this:
[[http://orgmode.org/worg/org-contribute.html#sec-4 ][How to contribute to Org?]]
2013-12-22 09:17:43 +01:00
387e9c303e
now in main
2013-12-21 12:00:54 -07:00
14337ce4eb
Merge D-language into ob-C.el C&C++-languages
2013-12-21 11:59:27 -07:00
39a6ce6e46
removed top-level (require 'j-console)
2013-12-21 11:58:18 -07:00
663cb3b9b9
ox: Fix a dictionary entry
...
* lisp/ox.el (org-export-dictionary): Fix an entry.
Suggested-by: Yasushi SHOJI <yashi@atmark-techno.com>
2013-12-21 09:49:44 +01:00
5b778a6940
ox: Fix ^:{} handling
...
* lisp/ox.el (org-export--remove-uninterpreted): Fix ^:{} handling.
* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.
2013-12-20 21:51:17 +01:00
be70c688b2
fix typo
...
* lisp/org.el (org-babel-load-languages): Forgot to capitalize "j".
2013-12-20 10:11:29 -07:00
44f6bde0cf
add J to babel languages
...
* lisp/org.el (org-babel-load-languages): Add J to babel languages.
2013-12-20 10:05:10 -07:00
98811ad800
Add org-babel support for J.
2013-12-20 10:00:02 -07:00
68fda96c06
ox-latex: Fix 24b61d9105
...
* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Refactor code
to make it easier to read. Fix a code typo. Silence byte-compiler.
2013-12-19 22:49:48 +01:00
24b61d9105
ox-latex: Handle entities cluster
...
* lisp/ox-latex.el (org-latex-pseudo-objects): New variable.
(org-latex--wrap-latex-math-block): New function.
(org-latex-table, org-latex--math-table): declare pseudo objects.
This patch provides support for constructs like:
\alpha_b
which should be translated as
$\alpha_{\text{b}}$
instead of
$\alpha$$_{\text{b}}$
2013-12-19 21:59:15 +01:00
da05ab32f1
Merge branch 'maint'
2013-12-18 16:00:24 +01:00
8e00dbb00b
ox.el (org-export-to-file): Fix typo in docstring
...
* ox.el (org-export-to-file): Fix typo in docstring.
2013-12-18 16:00:05 +01:00
86eb0afe05
ox: Fix export of uninterpreted elements
...
* lisp/ox.el (org-export-data): Do not check for uninterpreted
elements or objects. These are removed from parse tree anyway.
(org-export--remove-uninterpreted): New function.
(org-export--interpret-p): Removed function.
(org-export-as): Handle uninterpreted elements and objects.
2013-12-18 14:25:03 +01:00
b44fbb920c
Merge branch 'maint'
2013-12-16 21:04:57 +01:00
b22714a88d
org-element: Keep compatibility with Babel's regexps
...
* lisp/org-element.el (org-element-inline-babel-call-successor): Use
original regexp to stay up-to-date with Babel changes.
2013-12-16 21:00:57 +01:00
085b7e8d16
no spaces in call line names
...
* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Don't allow
spaces in call line function names.
2013-12-16 08:04:59 -07:00
5b9e79c8b8
org.el: use a shy regex for fontifying macros
...
* lisp/org.el (org-set-font-lock-defaults): use a shy regex for
identifying macros to fontify
Before this change, the xxx in the following text would be erroneously
fontified with the macro face:
{{{macro1()}}} xxx {{{macro2()}}}
2013-12-15 23:31:47 -05:00
d55f0632b5
Merge branch 'maint'
2013-12-15 16:18:31 +01:00
f1b9339aa5
org-element: Fix affiliated keyword regexp
...
* lisp/org-element.el (org-element--affiliated-re): Fix affiliated
keyword regexp.
2013-12-15 16:16:20 +01:00
29c02c3810
ox-org: Remove attr_backend keywords
...
* lisp/ox-org.el (org-org-identity): Since back-end specific keywords
are stripped from output, also remove attr_backend keywords.
2013-12-15 15:17:24 +01:00
4e02e48fa3
Merge branch 'maint'
...
Conflicts:
doc/org.texi
2013-12-15 14:59:33 +01:00
18d3057e62
org.texi: Document `org' back-end
...
* doc/org.texi (Org export): New section.
* lisp/ox-org.el: Remove initial code comments since this is now in
manual.
2013-12-15 14:52:46 +01:00
b617d407ed
Merge branch 'maint'
2013-12-15 11:55:44 +01:00
7a80881d65
org.texi: Fix some whitespace errors
...
* doc/org.texi (HTML doctypes): Fix whitespace error.
2013-12-15 11:54:59 +01:00
c356b114d7
Merge branch 'maint'
2013-12-15 11:40:55 +01:00
64d9159ad0
org.texi: Add html related publishing options
...
* doc/org.texi (HTML doctypes): Fix display.
(Publishing options): Add missing html publishing options.
2013-12-15 11:38:37 +01:00
17e11fe419
Delete :grouptags from tags list when creating org-mobile index file
...
* org-mobile.el (org-mobile-create-index-file): delete :grouptags
entries from tags list when creating the org-mobile index file.
Reported by Dror Atariah - see
http://thread.gmane.org/gmane.emacs.orgmode/79803
and (the continuation of the above thread)
http://thread.gmane.org/gmane.emacs.orgmode/79856
2013-12-14 15:17:18 -05:00
059dc08dec
ob-clojure.el (org-babel-execute:clojure): Don't pretty print results
...
* ob-clojure.el (org-babel-execute:clojure): Don't pretty
print results.
Thanks to Daniel Szmulewicz for reporting this.
2013-12-14 14:26:56 +01:00
01b42f91de
Makefile: optionally switch to a specific git branch
...
* mk/default.mk (GIT_BRANCH): New configuration variable to specify a
Git branch that is checked out before updating.
* mk/targets.mk (up0 up1 up2): Check out the branch in GIT_BRANCH
before doing an update. Stays on the current branch if GIT_BRANCH
is undefined or empty.
2013-12-14 10:35:13 +01:00
49c128c300
Makefile: some refactoring for "make vanilla"
...
* mk/default.mk (BTEST_INIT): Isolate load-path manipulation into
BTEST_LOAD and do whitespace cleanup. (EMACSQ): New variable for an
Emacs with no configuration files. (NOBATCH, BATCH): Use EMACSQ.
* mk/targets.mk (vanilla): Do not echo command line and explicitly say
that we don't get a return value. (CONF_CALL): Add NOBATCH to the
list of things shown in `make config-all´.
2013-12-14 10:27:31 +01:00
04eb8d7d85
make vanilla: run Emacs -Q with *this* Org loaded
...
This change should make it easier to run interactive tests or to
reproduce problems with the current Org-mode loaded and without any
personal config.
2013-12-13 16:26:13 -07:00
fb09863fbb
more shell names
2013-12-13 16:04:41 -07:00
ea993c6d8c
fixed insertion of results with hashes
...
No longer overwrites intervening #+ lines.
* lisp/ob-core.el (org-babel-where-is-src-block-result): Fixed
insertion of results with hashes.
2013-12-13 15:06:06 -07:00
Bastien Guerry
Ted Wiles
David Arroyo Menendez
Oleh Krehel
Alex Poslavsky
Eric Schulte
Thierry Banel
Nicolas Goaziou
Aaron Ecay
Nick Dokos
Achim Gratz