ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,227 Commits 2 Branches 439 Tags 111 MiB
Commit Graph

15227 Commits

Author SHA1 Message Date
Nicolas Goaziou dda9461fbb Merge branch 'maint' 
Conflicts:
	lisp/org-element.el
 2014-02-01 23:33:58 +01:00
Nicolas Goaziou 8e1386cead org-element: Fix smart quotes in TITLE 
* lisp/org-element.el (org-element-interpret-data): Do not remove
  properties by side-effect when interpreting a string, as it also
  removes them from the parse tree, making the string unusable without
  its :parent property.

If text properties get in the way, it is also possible to use
`substring-no-properties' but then, a compatibility function would be
required for XEmacs.
 2014-02-01 23:25:47 +01:00
Marc-Oliver Ihm 8b1ffc717b org-index.el: Version 2.42, sorting for x-columns 2014-02-01 23:11:18 +01:00
Nicolas Goaziou 8f91f657e1 Merge branch 'maint' 2014-02-01 21:54:03 +01:00
Nicolas Goaziou ac2f516edf ob-exp: Do not ignore `org-src-preserve-indentation' 
* lisp/ob-exp.el (org-babel-exp-process-buffer): Also check
  `org-src-preserve-indentation' to know when to preserve indentation.
* testing/lisp/test-ob-exp.el (ob-export/export-and-indentation): New
  test.

Thanks to John Hendy for reporting it.
 2014-02-01 21:52:43 +01:00
Bastien Guerry 4df24f5fc8 Merge branch 'maint' 2014-02-01 01:09:00 +01:00
Bastien Guerry ccc4f6b96e Fix d035a9af6 
Thanks to Nicolas for providing the correct fix.
 2014-02-01 01:08:42 +01:00
Bastien Guerry c89827dc37 Revert "org.el (org-ctrl-c-ctrl-c): Bugfix" 
This reverts commit d035a9af6c.

See http://article.gmane.org/gmane.emacs.orgmode/81752
 2014-02-01 01:06:25 +01:00
Bastien Guerry ca0c77033d ox.el (org-export-insert-default-template): Require match 
* ox.el (org-export-insert-default-template): Require match
when completing.
 2014-01-31 18:04:18 +01:00
Bastien Guerry bdeac998c8 Merge branch 'maint' 2014-01-31 15:53:54 +01:00
Bastien Guerry d035a9af6c org.el (org-ctrl-c-ctrl-c): Bugfix 
* org.el (org-ctrl-c-ctrl-c): Fix behavior when hitting C-c
C-c on LaTeX formulas in tables.
 2014-01-31 15:53:42 +01:00
Bastien Guerry 21ce3296b7 Merge branch 'maint' 2014-01-31 10:39:06 +01:00
Bastien Guerry 7ddebe5c7b Revert "org.el (org-map-entries): Use `save-window-excursion'" 
This reverts commit 3ec38f5c06.
 2014-01-31 10:38:50 +01:00
Bastien Guerry 4068a829a1 org.el: Fix compiler warnings 2014-01-31 09:45:25 +01:00
Bastien Guerry 23fa320af8 ob-tangle.el: Fix compiler warning 2014-01-31 09:43:46 +01:00
Bastien Guerry a391d528e0 ob-clojure.el: Fix compiler warnings 2014-01-31 09:39:34 +01:00
Bastien Guerry 99a23ba436 Merge branch 'maint' 2014-01-30 12:43:02 +01:00
Bastien Guerry 53c664c4ec org.el (org-refile--get-location): New internal function 
* org.el (org-refile--get-location): New internal function
using a wider set of possible refile locations.
(org-refile-get-location): Use it.
 2014-01-30 12:42:13 +01:00
Bastien Guerry 98de33a9ac Merge branch 'maint' 2014-01-30 12:21:51 +01:00
Bastien Guerry f3ed0f7c6c org.el (org-refile): Fix bug when refiling the last subtree 
* org.el (org-refile): Fix bug when refiling the last subtree
of the buffer: don't leave out the last character.
 2014-01-30 12:21:39 +01:00
Bastien Guerry de087d0bbe ob-clojure.el (org-babel-execute:clojure): Fix output 
* ob-clojure.el (org-babel-execute:clojure): Use
`org-babel-result-cond' to create the correct output.

Thanks to Soapy Smith who reported this and to Eric Schulte for providing the fix.
 2014-01-30 12:10:37 +01:00
Bastien Guerry cf2c7e9f18 Merge branch 'maint' 2014-01-30 11:59:57 +01:00
Bastien Guerry 3c71ab34dd org.el (org-sort-entries): Restore the point location when there is nothing to sort 
* org.el (org-sort-entries): Restore the point location when
there is nothing to sort.
 2014-01-30 11:59:25 +01:00
Bastien Guerry ca69fdd884 org-table.el (org-table-field-info): Throw a user error when not at a table 
* org-table.el (org-table-field-info): Throw a user error when
not at a table.
 2014-01-30 11:58:28 +01:00
Bastien Guerry 7fc6d3df39 org-agenda.el (org-agenda-drag-line-forward): Call`org-agenda-mark-clocking-task' when done 
* org-agenda.el (org-agenda-drag-line-forward): Call
`org-agenda-mark-clocking-task' when done.
(org-agenda-mark-clocking-task): Small refactoring.
 2014-01-30 11:57:43 +01:00
Bastien Guerry 9368d317fb ob-tangle.el (org-babel-under-commented-heading-p): Throw nil when called before the first heading 
* ob-tangle.el (org-babel-under-commented-heading-p): Throw
nil when called before the first heading.

Thanks to John Kitchin for reporting this.
 2014-01-30 00:57:24 +01:00
Bastien Guerry 72ad5257fc Merge branch 'maint' 2014-01-29 14:58:14 +01:00
Benjamin Drieu 33a0a198e3 org.el (org-store-link): Fix selection of the function to store the link 
* org.el (org-store-link): Fix selection of the function to
store the link.
 2014-01-29 14:57:45 +01:00
Bastien Guerry 524242fc4d Fix 80fc5ad again 2014-01-29 10:31:37 +01:00
Bastien Guerry 9f6c5897b3 Merge branch 'master' of orgmode.org:org-mode 2014-01-29 10:18:22 +01:00
Bastien Guerry 2c7ffbe4b2 Fix 80fc5ad 
Thanks to Yasushi SHOJI for reporting this.
 2014-01-29 09:19:08 +01:00
Nicolas Goaziou 98eed5baf9 Merge branch 'maint' 2014-01-29 09:05:44 +01:00
Nicolas Goaziou 63a2a403a9 ob-exp: Fix switches handling upon exporting 
* lisp/ob-exp.el (org-babel-exp-code-template): Include switches in
  template.
(org-babel-exp-code): Provide %switches placeholder.
* testing/lisp/test-ob-exp.el (ob-export/export-src-block-with-switches):
  New test.
(ob-export/export-src-block-with-flags): Fix indentation.

This fixes dde6af3a62.  The confusion
came from the fact that "flags" placeholder had two meanings:
the :flags value and the block's switches (e.g., "-n").  This patch
separates these two meanings.
 2014-01-29 09:01:43 +01:00
Marc-Oliver Ihm ba724406f9 Minor Version 2.4.1 2014-01-28 22:42:54 +01:00
Nicolas Goaziou 88c18e07db org-element: Fix a code comment 
* lisp/org-element.el (org-element-headline-parser): Fix code comment.
 2014-01-28 22:14:40 +01:00
Nicolas Goaziou 6a00c96541 Remove left over references to QUOTE blocks 
* lisp/org.el (org-quote-string): Remove variable.
(org-enable-fixed-width-editor, org-context): Update docstring.
(org-toggle-fixed-width-section): Remove function and binding.
(org-set-font-lock-defaults): Remove reference to `org-quote-string'.

* lisp/org-element.el (org-element-headline-parser,
  org-element-headline-interpreter): Remove references to
  `org-quote-string'.

* testing/lisp/test-org-element.el (test-org-element/headline-quote-keyword):
  Remove test.
(test-org-element/headline-interpreter): Remove a test.
 2014-01-28 21:36:54 +01:00
Bastien Guerry e45d13d94e Merge branch 'maint' 2014-01-28 11:20:42 +01:00
Bastien Guerry b298a47eb1 org.texi (Literal examples): Fix typo 
* org.texi (Literal examples): Fix typo.
 2014-01-28 11:20:29 +01:00
Nicolas Goaziou 2cb8b1401c Merge branch 'maint' 2014-01-27 21:43:43 +01:00
Nicolas Goaziou 43870228c5 ORG-NEWS: Notify "QUOTE" keywords deprecation 2014-01-27 21:42:23 +01:00
Nicolas Goaziou 2b8fd33d0f ox-groff: Remove quote section translator 
* contrib/lisp/ox-groff.el (org-groff-quote-section): Remove function.
 2014-01-27 21:14:44 +01:00
Nicolas Goaziou 81f2f5a6e8 Export back-ends: Remove quote section translators 
* lisp/ox-ascii.el (org-ascii--current-text-width): Remove
  `quote-section' reference.
  (org-ascii-quote-section): Remove function.
* lisp/ox-html.el (org-html-quote-section): Remove function.
* lisp/ox-man.el (org-man-quote-section): Remove function.
* lisp/ox-md.el (org-md-quote-section): Remove function.
* lisp/ox-odt.el (org-odt-quote-section): Remove function.
* lisp/ox-org.el (org-org-quote-section): Remove function.
* lisp/ox-texinfo.el (org-texinfo-quote-section): Remove function.
 2014-01-27 21:14:44 +01:00
Nicolas Goaziou 0fc0126491 ox: Remove quote sections 
* lisp/ox.el (org-export-filter-quote-section-functions): Remove
  variable.
 2014-01-27 21:14:38 +01:00
Nicolas Goaziou 8a265e2915 org-element: Remove quote sections 
* lisp/org-element.el (org-element-quote-section-parser,
  org-element-quote-section-interpreter): Remove functions.
  (org-element--current-element, org-element--parse-elements): Do not
  handle quote sections at all.
* testing/lisp/test-org-element.el (test-org-element/quote-section-parser):
  Remove test.
 2014-01-27 21:14:20 +01:00
Rainer M. Krug eaa3a761da Graphic: Catch errors and return error message 
* lisp/ob-R.el (org-babel-expand-body:R): Added the opening of the
  tryCatch() wrapper

* lisp/ob-R.el (org-babel-R-construct-graphics-device-call): Added
  closing of the wrapper containing the error function.

Added tryCatch() wrapper around the execution of the source block so
that if an error occurs
- the R graphic device is closed even when an error occurs
- a graph containing the error message is created
- the error message is printed in the R session in the form
    ERROR : the error message

TINYCHANGE
 2014-01-26 11:05:46 -07:00
Nicolas Goaziou e0d14e6aa7 Merge branch 'maint' 2014-01-25 14:57:46 +01:00
Nicolas Goaziou b2dce80601 ox-latex: Fix :options discrepancy between blocks and lists 
* lisp/ox-latex.el (org-latex-plain-list): Do not automatically
  enclose value for :options attribute within square brackets.
  Instead, append them verbatim next to the block name, as special
  blocks do.
* doc/org.texi (@LaTeX{} specific attributes): Update manual.
 2014-01-25 14:56:49 +01:00
Bastien Guerry f37904713c Merge branch 'maint' 2014-01-25 14:49:28 +01:00
Bastien Guerry a6b8bdecab Fix e52599 
Thanks to Matt Lundin for reporting this.
 2014-01-25 14:49:17 +01:00
Bastien Guerry 92c696cf8d Revert "Improve message when file to include is missing" 
This reverts commit 8ad7b3888f.
 2014-01-24 12:19:25 +01:00