Commit Graph

10056 Commits

Author SHA1 Message Date
Bastien Guerry d7bbf362da Revert "org.el (org-agenda-prepare-buffers): Restore the point position"
This reverts commit fe3379bda6.
2014-02-06 00:25:16 +01:00
Bastien Guerry 13b5123da1 Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-koma-letter.el
2014-02-05 16:16:36 +01:00
Bastien Guerry a6f81047a4 org.el (org-file-contents): Return an empty string instead of the message
* org.el (org-file-contents): Return an empty string instead
of the message.
2014-02-05 16:15:55 +01:00
Florian Beck 01e8103f8f Font-lock: allow hiding of brackets surrounding macros
* lisp/org.el (org-hide-macro-markers): new option
  (org-fontify-macros): new function
  (org-set-font-lock-defaults): call `org-fontify-macros'

* doc/org.texi: Document user option `org-hide-macro-markers'

TINYCHANGE
2014-02-05 11:13:39 +01:00
Bastien Guerry aa19233d80 Merge branch 'maint' 2014-02-05 10:57:01 +01:00
Bastien Guerry a08bff4138 org.el (org-open-at-point): Fix bug when opening a plain link followed by a bracket link
* org.el (org-open-at-point): Fix bug when opening a plain
link followed by a bracket link.

Thanks to John Kitchin for reporting this.
2014-02-05 10:56:50 +01:00
Bastien Guerry 655e07730b org-agenda.el: Allow to move backward/forward blocks
* org-agenda.el (org-agenda-find-same-or-today-or-agenda): Use
`org-agenda-backward-block'.
(org-agenda-backward-block): Renamed and rewritten from
`org-agenda-goto-block-beginning'.
(org-agenda-forward-block): New command.
(org-agenda-mode-map): Remap `backward-paragraph' and
`forward-paragraph' to `org-agenda-backward-block' and
`org-agenda-forward-block' respectively.

Thanks to Bart Bunting for raising this.
2014-02-05 10:33:03 +01:00
Nicolas Richard 5f0ca0ee92 Renaming of ob-sh to ob-shell: various fixes
* lisp/org.el (org-babel-load-languages):
* testing/org-test.el:
* testing/README: change 'sh' to 'shell'

* testing/lisp/test-ob-sh.el: re-rename test file (fixes 80754a8)
2014-02-02 00:08:56 -07:00
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
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
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
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
Bastien Guerry da8daf50a7 Merge branch 'maint' 2014-01-24 12:17:21 +01:00
Bastien Guerry e8bfc5336c Fix 77458b 2014-01-24 12:17:08 +01:00
Sebastien Vauban 8ad7b3888f Improve message when file to include is missing
* org.el (org-file-contents): Improve message when linked file does not exist.
2014-01-24 12:15:08 +01:00
Achim Gratz caf851d44d ob-ref: Fix "Marker points into wrong buffer" error
* lisp/ob-ref.el (org-babel-ref-parse): If
  `org-babel-current-src-block-location' is a marker, it can be from
  another buffer, use marker-position instead in this case.

Introduced with r114064 on Emacs trunk.  Not sure if this is a bug in
Org or Emacs, but the patch restores the previous behaviour.
2014-01-24 11:26:39 +01:00
Bastien Guerry d1897eed7a Merge branch 'master' of orgmode.org:org-mode 2014-01-22 17:11:43 +01:00
Bastien Guerry 46ad4b561e Merge branch 'maint' 2014-01-22 17:11:06 +01:00
Bastien Guerry 91940f514e Fix dac6d8 2014-01-22 17:10:55 +01:00
Nicolas Goaziou 9d5e11fc79 export back-ends: Reorder options in templates
* lisp/ox-beamer.el: Be more cautious about the order in which options
  are defined, at this order will be the same when creating an export
  template (see `org-export-insert-default-template').
* lisp/ox-html.el: Ditto.
* lisp/ox-latex.el: Ditto.
* lisp/ox.el: Ditto.
2014-01-22 15:45:23 +01:00
Nicolas Goaziou 815cfb6c02 ox: Reorder keywords in export templates
* lisp/ox.el (org-export-insert-default-template): Do not hard-code
  alphabetical order for keywords in templates.  Instead, follow order
  specified in back-ends or `org-export-options-alist' for the default
  case.
2014-01-22 15:33:38 +01:00
Bastien Guerry 0b67b7e283 Merge branch 'maint' 2014-01-22 11:44:59 +01:00
Bastien Guerry 77458b782a org-compat.el (org-set-transient-map): New alias
* org-compat.el (org-set-transient-map): Alias pointing at
`set-transient-map' if defined, at `set-temporary-overlay-map'
otherwise.

Thanks to Eric Abrahamsen for reporting this.
2014-01-22 11:42:51 +01:00
Nicolas Goaziou 410b6a65f9 Merge branch 'maint' 2014-01-21 23:40:33 +01:00
Justin Gordon d91650b854 ox-md: Set correctly blank lines between elements
* lisp/ox-md (org-md-separate-elements): Fix blank line insertion
  between elements.
* lisp/ox-md.el (org-md-inner-template): New function.
2014-01-21 23:39:23 +01:00
Nicolas Goaziou 34edfd846f org-element: Preserve Emacs 23 compatibility
* lisp/org-element.el (org-element--cache-mapc): New function.
(org-element--cache-sync): Use new function.

`avl-tree-mapc' exists in Emacs 24's "avl-tree" but not in Emacs
23's. The new function implements it.
2014-01-21 18:17:33 +01:00
Bastien Guerry 630096ca6d Merge branch 'maint' 2014-01-20 22:40:42 +01:00
Bastien Guerry ac7fb4dd79 org.el (org-priority): Don't use `org-preserve-lc'
* org.el (org-priority): Don't use `org-preserve-lc' as it is
not necessary here.
2014-01-20 22:40:37 +01:00
Bastien Guerry e5259962f6 org-agenda.el: Fix buglets
* org-agenda.el (org-agenda-next-item)
(org-agenda-previous-item, org-agenda-toggle-archive-tag)
(org-agenda-todo, org-agenda-priority, org-agenda-clock-in)
(org-agenda-clock-out): Put the cursor back on the correct
column, when possible.
(org-agenda-todo): When `org-clock-out-when-done' is `t', also
remove the current clock overlay.
2014-01-20 22:34:18 +01:00
Nicolas Goaziou 5f38f7b7b0 org-element: Comply to Emacs 23 signature requirements
* lisp/org-element.el (org-element--cache-sync): Call
  `avl-tree-delete' with 2 arguments only as a 4-arguments call is
  only compatible with Emacs 24.1 and later.
2014-01-20 19:03:50 +01:00
Nicolas Goaziou e5617b88cb Merge branch 'maint' 2014-01-20 17:16:32 +01:00
Bastien Guerry 80fc5adb58 org.el (org-provide-todo-statistics): Allow to set to a list of two lists, for TODO and DONE keywords
* org.el (org-provide-todo-statistics): Allow to set to a list
of two lists, one with TODO keywords, the other one with DONE
keywords.
(org-update-parent-todo-statistics): Correctly handle
`org-provide-todo-statistics' when it is set as a list of two
lists, for TODO and DONE keywords.

Thanks to Fletcher Charest for reporting this and requesting
this feature.
2014-01-20 16:06:19 +01:00
Bastien Guerry ea0d35674f org.el: New command org-insert-last-stored-link bound to `C-c M-l'
* org.el (org-insert-all-links): New parameters `pre' and
`post' to specify a string to preprend and append.
(org-insert-last-stored-link): New command.
(org-mode-map): Bind the new command to `C-c M-l'.

Thanks to Sébastien Vauban for requesting this and to Nick
Dokos for testing and fixing the patch.
2014-01-20 15:37:25 +01:00
Nicolas Goaziou dde6af3a62 ob-exp: Fix export of src blocks with flags
* lisp/ob-exp.el (org-babel-exp-code): Fix export of src blocks with
  flags.
* testing/lisp/test-ob-exp.el (ob-export/export-src-block-with-flags):
  New test.

Thanks to Giuseppe Lipari for reporting it.
2014-01-20 14:20:06 +01:00
Sylvain Chouleur 5a2d47e1ba Fix `org-outline-overlay-data' marker insertion-type
* org.el (org-outline-overlay-data): Set the insertion-type of end
bound marker of the function to t (means marker advances when you
insert text at it)

This is to conserve outline visibility property when changes are made
at the end bound of the data.
For example: try `org-babel-execute-subtree' on a folded outline:
The new result will be shown after the folded part of the outline
whereas the outline body should not be visible.

TINYCHANGE
2014-01-19 22:00:02 +01:00
Nicolas Goaziou 5f04b3815f Fix ae0f1c56a7
* lisp/org.el (org-toggle-item): Fix ae0f1c56a7.
2014-01-19 18:15:56 +01:00
Bastien Guerry 848d1926ec Merge branch 'maint' 2014-01-19 16:45:37 +01:00
Bastien Guerry 25e4e5b6f0 org.el (org-format-latex-options): Fix docstring
* org.el (org-format-latex-options): Fix docstring.

Thanks to Mirko Vukovic for reporting this.
2014-01-19 16:44:21 +01:00
Bastien Guerry 84aabd700e Merge branch 'maint' 2014-01-19 16:37:42 +01:00
Bastien Guerry f4715f1652 ox.el (org-export--get-subtree-options): Fix bug
* ox.el (org-export--get-subtree-options): When using the
headline as a title for a subtree export, only take the true
heading, no TODO keyword, no priority cookie, no tag.

Thanks to Robert Klein for reporting this.
2014-01-19 16:37:25 +01:00
Nicolas Goaziou fd877a7380 org-element: Small optimization
* lisp/org-element.el (org-element-at-point): Do not call
  `outline-next-heading' when an element at top level contains point.
  This is particularly important when the current section ends way
  after the point.
2014-01-19 15:06:09 +01:00
Eric Schulte cd3bc12a29 named and caching call lines working
* lisp/ob-core.el (org-babel-current-result-hash): Additional info
  argument so that named call line results may be found.
  (org-babel-set-current-result-hash): Additional info argument so
  that named call line results may be found.
* lisp/ob-lob.el (org-babel-lob-execute): Passing info to hash finding
  functions so that named results may be found.
2014-01-18 13:40:57 -07:00
Eric Schulte 6c0992939d do not eval vars in call lines before hashing
* lisp/ob-lob.el (org-babel-lob-execute): Do not eval vars in call
  lines before hashing, because for a call lines variable
  expansion *is* evaluation.
2014-01-18 13:40:57 -07:00
Nicolas Goaziou c25c80e3f3 Merge branch 'maint' 2014-01-18 15:40:43 +01:00
Nicolas Goaziou 3f9a6916aa ob-exp: Fix code execution in some corner cases
* lisp/ob-exp.el (org-babel-exp-process-buffer): Make processing more
  robust when results are inserted before source block or when source
  block is followed by multiple blank lines.
* testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block):
  Add test.
2014-01-18 15:32:41 +01:00
Bastien Guerry 92c9b69b7f Merge branch 'maint' 2014-01-18 09:17:33 +01:00
Bastien Guerry 7b2af7cb60 Backport Emacs changes from r116063 2014-01-18 09:17:14 +01:00
Nicolas Goaziou a3fab8d899 Merge branch 'maint' 2014-01-17 22:17:39 +01:00
Nicolas Goaziou b0ac2f6ac0 ox: Remove clutter from export templates
* lisp/ox.el (org-export-insert-default-template): Only insert
  keywords and options relatives to the selected back-end.  Ignore
  those relatives to its parent in the case of a derived back-end.
2014-01-17 22:16:41 +01:00
Nicolas Goaziou bf304c3485 Merge branch 'maint' 2014-01-17 12:45:21 +01:00
Nicolas Goaziou 1e25d087dd ox-beamer: Small clean-up
* lisp/ox-beamer.el: Remove unnecessary package definitions in default
  class.
2014-01-17 12:44:05 +01:00
Rick Frankel e955be903a Add better svg support to html exporter.
* lisp/ox-html.el (org-html--format-image): If image is an svg file,
  format as "object" using new function `org-html--svg-image' instead
  of "img".
2014-01-16 17:35:55 -05:00
Rick Frankel 1376df2648 Use an overridable list of available doctypes for customization.
* lisp/ox-html.el (org-html-doctype): Use choice of available
  doctypes (from `org-html-doctype-alist) plus user-entered string.
2014-01-16 17:35:39 -05:00
Nicolas Goaziou 6ef2bd0ef0 Merge branch 'maint' 2014-01-16 16:24:15 +01:00
Yasushi SHOJI b7c1014353 ox-ascii: Convert `length' to `string-width'
* lisp/ox-ascii.el (org-ascii--current-text-width): Convert `length'
  to `string-width'.
  (org-ascii--build-title, org-ascii--build-toc)
  (org-ascii--list-listings, org-ascii--list-tables)
  (org-ascii-template--document-title)
  (org-ascii-inner-template, org-ascii-format-inlinetask-default)
  (org-ascii-format-inlinetask-default, org-ascii-item
  (org-ascii--table-cell-width, org-ascii-table-cell)
  (org-ascii--current-text-width): Likewise.

I've checked all occurrences of the function `length' in ox-ascii.el.
It turns out that the most of them are calculating the width of given
string.  To support fullwidth characters, we better use `string-width'
instead of `length'.

Some characters in UCS are categorized as "East Asian Ambiguous"[1].
The return value of `string-width' with those characters depends on
how Emacs is setup.  We leave those ambiguous character handling to
Emacs.

Two usages of `length' in `ox-ascii.el' were left as-is, because those
were used for:

 - bullet depth calculation in `org-ascii-headline', and
 - cell position calculation in `org-ascii--table-cell-width'.

[1]: http://www.unicode.org/reports/tr11/#Ambiguous
2014-01-16 16:17:48 +01:00
Nicolas Goaziou d99ffcf954 Merge branch 'maint' 2014-01-16 15:52:12 +01:00
Nicolas Goaziou 7d3205a20f ox-latex: Fix items starting with a square bracket
* lisp/ox-latex.el (org-latex-headline, org-latex-item): Fix items
  starting with a square bracket.

Thanks to Jon Degenhardt, Vladimir Lomov and Eric S Fraga for
contributing to the discussion.
2014-01-16 15:49:34 +01:00
Bastien Guerry 81dad90342 Merge branch 'maint' 2014-01-16 12:07:37 +01:00
Bastien Guerry d16477913d Fix ff902c 2014-01-16 12:07:27 +01:00
Bastien Guerry 3fafad7eec Merge branch 'maint' 2014-01-16 11:57:55 +01:00
Bastien Guerry be54f049dd Backport Emacs trunk revno r116039 2014-01-16 11:57:45 +01:00
Bastien Guerry c7408a2bd7 Merge branch 'maint' 2014-01-16 01:19:49 +01:00
Nicolas Goaziou d4b653656e org.el (org-mode-restart): Fix turning off `org-indent-mode' when necessary
* org.el (org-mode-restart): Fix turning off `org-indent-mode'
when necessary.
2014-01-16 01:18:30 +01:00
Bastien Guerry a4a2935c3f org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:13:15 +01:00
Bastien Guerry 73a6aba4b7 org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:12:51 +01:00
Bastien Guerry c31782d903 org.el (org-src-fontify-natively): Default to `t'
* org.el (org-src-fontify-natively): Default to `t'.

Thanks to Sébastien Vauban for pushing this.
2014-01-16 01:11:33 +01:00
Bastien Guerry a5a7231304 Merge branch 'maint' 2014-01-16 00:55:46 +01:00
Bastien Guerry e7ebe4163a Fix bf0649 2014-01-16 00:53:28 +01:00
Bastien Guerry ff902c4429 Remove spurious defvar
Thanks to Nicolas Goaziou for reporting this.
2014-01-16 00:52:46 +01:00
Bastien Guerry 27ab61acd0 Fix 4a9820 2014-01-16 00:35:12 +01:00
Bastien Guerry 8898c380ab Merge branch 'maint'
Conflicts:
	lisp/org.el
2014-01-15 09:22:59 +01:00
Bastien Guerry 0a8fe04a9d Merge branch 'maint' of orgmode.org:org-mode into maint 2014-01-15 09:21:59 +01:00
Bastien Guerry 947c3f5c2a Fix 035087777 2014-01-15 09:21:44 +01:00
Bastien Guerry d9797ca17e Revert "org.el (org-store-link): When a link has been stored, always returns it"
This reverts commit 035087777d.
2014-01-15 09:19:30 +01:00
Carsten Dominik 723306d6e7 Fix mode reset 2014-01-14 20:45:54 +01:00
Bastien Guerry 8694aa9352 Merge branch 'master' of orgmode.org:org-mode 2014-01-14 15:49:03 +01:00
Bastien Guerry 5cd6b30182 Merge branch 'maint' 2014-01-14 12:39:01 +01:00
Bastien Guerry 4a9820067a Fix bug when demoting invisible headlines
* org.el (org-demote): Ignore invisible text when aligning
tags.
(org-set-tags): When JUST-ALIGN is 'ignore-column, ignore
invisible text when restoring the cursor to the correct
column.

This fixes a bug about demoting hidden headlines.
If org-move-to-column temporarily ignore visibility
specs, this will prevent org-demote to work correctly
in hidden regions.

Thanks to Susan Cragin for reporting this bug.
2014-01-14 12:38:50 +01:00
Michael Brand 46f6fe3655 TBLFM remote ref indirection: Fix start
* lisp/org-table.el (org-table-remote-reference-indirection): Change
the local variable START to a value that will be still valid after
`replace-match'.
2014-01-13 20:23:11 +01:00
Nicolas Goaziou ae0f1c56a7 Small refactoring
* lisp/org.el (org-toggle-item): Do not call `org-list-struct' twice
  and fix checkboxes after modifying one of them.

This patch is relative to 213c2a6aa0.
2014-01-13 17:58:16 +01:00
Bastien Guerry 6ea3dee45d org.el (org-edit-special): Use `find-file-other-window'
* org.el (org-edit-special): Use `find-file-other-window' when
visiting included files.
2014-01-13 01:11:53 +01:00
Nick Dokos a49740ec83 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
2014-01-13 00:27:50 +01:00
Bastien Guerry 672b58a803 Merge branch 'maint' 2014-01-13 00:25:38 +01:00
Bastien Guerry dac6d880b7 ob-python.el (org-babel-python-var-to-python): Bugfix
* ob-python.el (org-babel-python-var-to-python): Bugfix: Strip
properties before formatting the results.

Thanks to Daniel Gerber for reporting this and providing a fix,
and to others who contributed.
2014-01-13 00:25:25 +01:00
Bastien Guerry 213c2a6aa0 org.el (org-toggle-item): Handle TODO and DONE keywords
* org.el (org-toggle-item): When an entry has a TODO or a DONE
keyword, add an empty or a checked checkbox.
2014-01-13 00:02:42 +01:00
Bastien Guerry b9e1dd8ff8 Merge branch 'maint' 2014-01-12 23:57:08 +01:00
Bastien Guerry bf0649c6fc Agenda: Fix dragging line in filtered agendas
* org-agenda.el (org-agenda-regexp-filter-preset): Fix
typo in docstring.
(org-agenda-reapply-filters): New function.
(org-agenda-drag-line-forward): Rewrite to fix a bug when used
in filtered agendas.
(org-agenda-drag-line-backward): Rewrite using
`org-agenda-drag-line-forward'.

Thanks to Thomas Morgan for reporting this.
2014-01-12 23:56:54 +01:00
Bastien Guerry 27b6b164ef Merge branch 'master' of orgmode.org:org-mode 2014-01-12 12:44:49 +01:00
Bastien Guerry e9e182a7f5 Merge branch 'maint' 2014-01-12 12:02:57 +01:00
Bastien Guerry a0610f0775 ob-table.el (org-sbe): Rename from `sbe'
* ob-table.el (org-sbe): Rename from `sbe'.
2014-01-12 12:02:25 +01:00
Michael Brand 9a5b8a7434 TBLFM remote ref: Improve indirection
* lisp/org-table.el (org-table-remote-reference-indirection): Use the
optional arg START of `string-match' to improve performance and to
avoid endless loop on user error.
2014-01-12 11:52:40 +01:00
Michael Brand bc1d54b84b TBLFM remote ref: Add indirection of name or ID
* doc/org.texi (References): Add description for indirection of
NAME-OR-ID.

* lisp/org-table.el (org-table-eval-formula): Make use of
`org-table-remote-reference-indirection'.
(org-table-remote-reference-indirection): New function.

* testing/lisp/test-org-table.el
(test-org-table/remote-reference-indirect): Change to use remote
reference indirection.
2014-01-12 10:53:06 +01:00
Bastien Guerry 90884b9748 Merge branch 'master' of orgmode.org:org-mode 2014-01-12 10:03:38 +01:00
Bastien Guerry 72b8a86d9c Merge branch 'maint' 2014-01-12 10:03:17 +01:00
Bastien Guerry 035087777d org.el (org-store-link): When a link has been stored, always returns it
* org.el (org-store-link): When a link has been stored, always
returns it.

(Storing links from the agenda are broken otherwise.)
2014-01-12 09:56:41 +01:00
Bastien Guerry 9305b41ceb Backport typo fixes from Emacs revno 115988 2014-01-12 09:54:21 +01:00
Nicolas Goaziou cad81696b8 Change no brace sub/superscript syntax
* lisp/org.el (org-match-substring-regexp): Simplify syntax when not
using braces.  Also make the variable a defconst.
(org-match-substring-with-braces-regexp): Make the variable a defconst
and remove a useless group in regexp.
* lisp/org-element.el (org-element-subscript-parser,
  org-element-superscript-parser): Adapt to group changes.
2014-01-11 23:54:22 +01:00
Nicolas Goaziou fd5edd35ae org-element: Fix cache bug
* lisp/org-element.el (org-element-cache-get): Return correct cached
  element when point is at the beginning of an item.
2014-01-11 22:31:53 +01:00
Nicolas Goaziou a4b1fa7ca1 org-element: New accessor for cache root
* lisp/org-element.el (org-element--cache-root): New function.
(org-element--cache-sync, org-element-cache-get): Use new function.

This is a workaround for `avl-tree--root' bug before Emacs 24.  Thanks
to Daniel Clemente for reporting it.
2014-01-11 10:12:45 +01:00
Bastien Guerry 525304cbda Merge branch 'maint' 2014-01-11 01:35:18 +01:00
Bastien Guerry 21472107fa org.el (org-ellipsis): Small docstring enhancement
* org.el (org-ellipsis): Small docstring enhancement.
2014-01-11 01:34:44 +01:00
Nicolas Goaziou f5380d1221 Merge branch 'maint' 2014-01-10 11:25:15 +01:00
Nicolas Goaziou 8720c49807 Speed improvement
* lisp/org.el (org-get-previous-line-level): Do not call
  `org-current-level' twice unless necessary.  Also, avoid using
  `line-number-at-pos' when the information needed is to know if point
  is in the first line of the visible part of the buffer.
2014-01-10 11:22:49 +01:00
Nicolas Goaziou 1d7bf33c5f ox-html: Fix a docstring
* lisp/ox-html.el (org-html-allow-name-attribute-in-anchors): Default
  value changed in 36a21d9372.  The
  docstring now reflects this change.
2014-01-10 10:07:22 +01:00
Nicolas Goaziou d0538affec ox-html: Fix a docstring
* lisp/ox-html.el (org-html-checkbox-types): Emphasize valid symbols
  to use for configuration.
2014-01-10 10:00:17 +01:00
Nicolas Goaziou 78e66c7212 ox-html: Fix checkbox customization
* lisp/ox-html.el (org-html-checkbox-types): Fix docstring.
(org-html-checkbox-type): Use symbols instead of strings.  It avoids
to rely on `intern' later on.  Modify docstring so its first line
contains only a complete sentence.
(org-html-checkbox): Use `assq' instead of `assoc'.

This fixes 2c782da801.
2014-01-10 09:52:08 +01:00
Rick Frankel 2c782da801 Add customization options for html checkboxes.
(org-html-checkbox-types): New constant. Contains unicode, ascii and html
checkbox alists.
(org_html_checkbox_type): New customzation variable can be set to one
of the above choices.  Defaults to "ascii"
(org-html-checkbox): Use the appropriate set of checkboxes as
specified in `org-html-checkbox-type'.
2014-01-09 18:04:09 -05:00
Rick Frankel 36a21d9372 Default `org-html-allow-name-attribute-in-anchors' to nil for HTML5
compatibily.
2014-01-09 18:00:52 -05:00
Nicolas Goaziou b8028c607d Merge branch 'maint' 2014-01-09 21:37:11 +01:00
Nicolas Goaziou 81ce406d8f ob-core: Speed improvement
* lisp/ob-core.el (org-babel-get-inline-src-block-matches): Do not
  compute line number if all is needed is to know if we're on the
  first one.
2014-01-09 21:36:25 +01:00
Michael Brand 9c1bc61cce Merge branch 'maint' 2014-01-09 20:11:07 +01:00
Michael Brand 34af2fe7ff Fix multiple TBLFM
Simplify commit release_8.2.4-14-geb28fe4 and commit
release_8.2.5c-8-ga2619b7.

* org-table.el (org-table-fix-formulas): Handle multiple #+TBLFM lines
with `forward-line'.
2014-01-09 20:10:19 +01:00
Nicolas Goaziou f75f3dd1c1 org-element: Fix `org-element-at-point' at eob
* lisp/org-element.el (org-element-at-point): Return appropriate value
  when point is at end of buffer and a cached element was found above.
2014-01-09 11:55:49 +01:00
Bastien Guerry e0f46e9a1d Merge branch 'maint' 2014-01-09 11:03:11 +01:00
Bastien Guerry a2619b7145 org-table.el (org-table-fix-formulas): Fix commit eb28fe
Thanks to Michael Brand for reporting this.
2014-01-09 11:03:01 +01:00
Bastien Guerry 213c78f73c Merge branch 'maint' 2014-01-09 00:48:16 +01:00
Bastien Guerry abed7277e1 Backport typo fixes from Emacs revno r115923 2014-01-09 00:47:40 +01:00
Nicolas Goaziou 87234bee55 Merge branch 'maint' 2014-01-08 22:50:52 +01:00
Nicolas Goaziou ba4852ec74 ox-md: Prevent error with empty items
* lisp/ox-md.el (org-md-item): Do not return an error when exporting
  an empty item.
2014-01-08 22:47:10 +01:00
Bastien Guerry 884faddd57 Revert "ob-python.el (org-babel-python-var-to-python): Fix code typo"
This reverts commit e88d9d7caf.
2014-01-08 18:31:50 +01:00
Eric Schulte 8285763b97 update psql command to respect :colnames
Suggested by Joost Helberg on the Mailing list.

TINYCHANGE

* lisp/ob-sql.el (org-babel-execute:sql): Update psql command to
  respect :colnames.
2014-01-08 09:57:40 -07:00
Bastien Guerry d310a87605 Merge branch 'maint' 2014-01-08 17:29:45 +01:00
Bastien Guerry e88d9d7caf ob-python.el (org-babel-python-var-to-python): Fix code typo
* ob-python.el (org-babel-python-var-to-python): Fix code typo.

Thanks to Daniel Gerber for reporting this.
2014-01-08 17:29:31 +01:00
Bastien Guerry 1f4b6a1e03 Merge branch 'maint' 2014-01-08 16:12:28 +01:00
Bastien Guerry e5b84d14cd org-entities.el: Fix display of pretty entities
* org-entities.el (org-entities-help): Prevent the display of
pretty entities, as this help buffer is meant to list literal
strings, not utf-8 representations.

Thanks to Brice Waegenire for reporting this.
2014-01-08 16:12:15 +01:00
Nicolas Goaziou a24e6420be ob-J: Silence byte-compiler 2014-01-07 21:56:22 +01:00
Nicolas Goaziou 09f148ec2e Merge branch 'maint' 2014-01-07 21:54:42 +01:00
Nicolas Goaziou fc09ad3be4 ox-beamer: Fix bug when an selecting environment
* lisp/ox-beamer.el (org-beamer-select-environment): Function doesn't
  work if fast tag selection is disabled, so make sure it is always
  on, independently on user's configuration.

Reported-by: Anders Johansson <mejlaandersj@gmail.com>
2014-01-07 21:50:44 +01:00
Bastien Guerry f8e1745440 Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
Bastien Guerry 7d9a883b50 Update copyright years again.
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
Bastien Guerry ccbe3965b1 Merge branch 'maint' 2014-01-07 13:26:12 +01:00
Bastien Guerry 152712a7c8 Backport change from Chong on 2013-12-23 2014-01-07 13:25:30 +01:00
Bastien Guerry eb79f0e35d Merge branch 'maint' 2014-01-06 11:02:31 +01:00
Bastien Guerry 2755f8d954 Backport spelling fixes from Emacs r115885
* org-clock.el (org-clock-cancel-hook)
(org-clock-leftover-time): Fix typo in docstring.
2014-01-06 11:02:18 +01:00
Nicolas Goaziou e32ebb6c1a org-element: Change data structure for cache
* lisp/org-element.el (org-element-at-point, org-element-cache-get,
  org-element-cache-put, org-element--cache-sync): Complete rewrite to
  use new data structure.
(org-element-context, org-element-cache-reset): Slight change in order
to use new tools to access cached data.
(org-element-cache-merge-changes-threshold): Renamed from
`org-element--cache-merge-changes-threshold'.
(org-element-cache-sync-idle-time): Renamed from
`org-element--cache-sync-idle-time'.
(org-element--cache-objects): New variable.

Now elements are stored in AVL tree and objects in a hash table.  Also
moved functions relative to cache into a specific section of the file.
2014-01-05 23:08:18 +01:00
Nicolas Goaziou 594b7808a1 org-element: Fix parsing orphaned affiliated keywords
* lisp/org-element.el (org-element-keyword-parser): Fix parsing
  orphaned affiliated keywords.
2014-01-05 23:08:18 +01:00
Nicolas Goaziou d361f465e9 ox: Change meaning of `org-export-with-\(table\|fixed-width\)
* lisp/ox.el (org-export-with-fixed-width, org-export-with-tables):
  Change docstring to reflect new meaning.
(org-export--skip-p): Completely ignore tables and fixed-width areas
if appropriate option is nil.
* testing/lisp/test-ox.el (test-org-export/handle-options): Add tests.
2014-01-05 23:07:13 +01:00
Bastien Guerry e4a013fcf3 Merge branch 'maint' 2014-01-05 14:21:51 +01:00
Bastien Guerry 66fd521264 org.el (org-set-tags): Ignore invisible text when restoring cursor position
* org.el (org-set-tags): Ignore invisible text when restoring
cursor position.
2014-01-05 14:21:38 +01:00
Bastien Guerry 1792643794 Merge branch 'maint' 2014-01-05 14:15:00 +01:00
U-usuario-PC\\usuario 65cf7047bf ob-gnuplot.el (org-babel-gnuplot-quote-tsv-field): Fix code typo
* ob-gnuplot.el (org-babel-gnuplot-quote-tsv-field): Fix code typo.

TINYCHANGE
2014-01-05 14:14:09 +01:00
Bastien Guerry c41f5075ac Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
Bastien Guerry 3737676632 Update copyright year for files changed since 2013 2014-01-05 06:35:21 +01:00
Bastien Guerry 0beda99171 Revert "Update copyright years."
This reverts commit 21105594fc.
2014-01-05 06:28:07 +01:00
Nicolas Goaziou 455fbca5f8 ox-md: Handle HTML export blocks
* lisp/ox-md.el (org-md-export-block): Handle HTML export blocks.
2014-01-05 00:48:58 +01:00
Nicolas Goaziou af2fa1da6a ox-md: Add support for MD, MARKDOWN keywords
* lisp/ox-md.el (org-md-keyword): New function.
(org-md-export-block): Allow "MARKDOWN" blocks.
2014-01-04 20:19:24 +01:00
Bastien Guerry 83b7f49f38 ox-md.el: Add export-block
* ox-md.el (org-md-export-block): New function.
(md): Use it.
2014-01-04 19:20:23 +01:00
Bastien Guerry 096ff7e078 Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
Bastien Guerry 21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
Bastien Guerry 17c3091f15 Merge branch 'maint' 2014-01-04 18:09:59 +01:00
Bastien Guerry b8a495d2ed Fix ox-odt bugs
* ox-odt.el (org-odt--frame): Add a draw:name property to the
draw:frame tag.
(org-odt-format-label): Don't use short-caption at all.

See http://article.gmane.org/gmane.emacs.orgmode/79910
and http://article.gmane.org/gmane.emacs.orgmode/79892
for threads about these issues.
2014-01-04 18:09:31 +01:00
Bastien Guerry 0965364707 Merge branch 'maint' 2014-01-04 15:28:04 +01:00
Bastien Guerry e764dfe80b org-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched
* org-rmail.el (org-rmail-follow-link): Don't raise an error
when no article is matched.
2014-01-04 15:27:53 +01:00
Bastien Guerry d09088ca17 Merge branch 'maint' 2014-01-04 15:05:13 +01:00
Bastien Guerry 45b0d23b0c Fix creation of parent nodes when refiling.
* org.el (org-refile-get-location): Check for a refile
position when the position is not nil, otherwise allow to
create the parent node if the user requests it.

Thanks to Li Zhuo for reporting this bug and for providing
a preliminary patch.
2014-01-04 15:05:01 +01:00
Bastien Guerry c36ab62b11 Merge branch 'maint' 2014-01-04 14:53:10 +01:00
Bastien Guerry 857cf28a90 org.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring
* org.el (org-refile-allow-creating-parent-nodes): Fix typo in
docstring.
2014-01-04 14:53:00 +01:00
Bastien Guerry 31c5e3dc8c Merge branch 'maint' 2014-01-04 14:49:07 +01:00
Bastien Guerry 2aeb5f0cad Merge branch 'maint' of orgmode.org:org-mode into maint 2014-01-04 14:48:51 +01:00
Bastien Guerry 597a7e65f0 org.el (org-entry-get): Minor docstring enhancement
* org.el (org-entry-get): Minor docstring enhancement.
2014-01-04 14:48:39 +01:00
Nicolas Goaziou 7ef92ae121 Merge branch 'maint' 2014-01-04 14:29:03 +01:00
Nicolas Goaziou 9b0067e166 ox-icalendar: Fix BBDB anniversaries integration
* lisp/ox-icalendar.el (org-icalendar--combine-files): Make sure
  anniversaries do not end up in *Message* buffer instead of the ICS
  file.

Patch-by: Thomas Baumann <tbaumann@tum.de>
2014-01-04 14:26:19 +01:00
Bastien Guerry 02078833e0 Merge branch 'maint' 2014-01-04 12:23:27 +01:00
Bastien Guerry 44acd00049 org.el (org-set-startup-visibility): Bugfix
* org.el (org-set-startup-visibility): Bugfix.

See http://article.gmane.org/gmane.emacs.orgmode/79905
2014-01-04 12:22:50 +01:00
Bastien Guerry 914f3f88a7 Merge branch 'maint' 2014-01-03 17:38:19 +01:00
Bastien Guerry bee871762c org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log
* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log.  Otherwise throw an error.
2014-01-03 17:38:02 +01:00
Bastien Guerry 62375dc3e5 Merge branch 'maint' 2014-01-03 17:16:10 +01:00
Bastien Guerry 6492b9cde4 ob-lob.el: Minor custom and docstring fixes
* ob-lob.el (org-babel-lob-files): Fix custom type.
(org-babel-lob-ingest): Small docstring fix.

Thanks to Glenn Morris for reporting them.
2014-01-03 17:15:34 +01:00
Bastien Guerry d97c050720 Merge branch 'maint' 2014-01-03 16:04:06 +01:00
Bastien Guerry adb6e545c7 org-agenda.el (org-cmp-ts): Fix bug
* org-agenda.el (org-cmp-ts): Fix bug: interpret `late' as
`later than any date' instead of `later than today'.

Thank to Michael Crouch for reporting this and to Michael Hoffman for
providing the fix.
2014-01-03 16:01:30 +01:00
Bastien Guerry f531d06f80 Merge branch 'maint' 2014-01-03 11:16:30 +01:00
Bastien Guerry f21150f185 org.el (org-do-emphasis-faces): Fix false positives handling
* org.el (org-do-emphasis-faces): Handle false positives by
restarting the re-search one char after the beginning of the
match, not one char before its ending.

Before this fix, consider this buffer

** Headline
  - *Bold* non-bold
  - *Bold* non-bold

The first false positive is "** Headline\n  - *Bold*"

Starting the search again from the last "*" will skip
the "*Bold*" string.  Starting again at "* Headline" will
find it.
2014-01-03 11:16:14 +01:00
Bastien Guerry d9b520586d Merge branch 'master' of orgmode.org:org-mode 2014-01-03 10:07:40 +01:00
Bastien Guerry af97893516 Merge branch 'maint' 2014-01-03 10:07:31 +01:00
Bastien Guerry 9758f203fb org.el (org-entry-put): Check that the value provided is a string
* org.el (org-entry-put): Check that the value provided is a
string.  If it is nil, convert it to the empty string.
2014-01-03 10:07:09 +01:00
Yasushi SHOJI 6ee4a75b68 ox: Add new Japanese translation strings
* lisp/ox.el (org-export-dictionary): Add new Japanese translation
  strings.

A few strings in `org-export-dictionary' didn't have Japanese
translations.  So, I just added.
2014-01-03 09:57:32 +01:00
Yasushi SHOJI 92b37eec82 ox: Convert Japanese translation from utf-8 to default
* lisp/ox.el (org-export-dictionary): Convert all Japanese translation
  from utf-8 to default.

There shouldn't be much need for exporters and users to worry about
the coding system of the final output.  If one wants to export a
"Japanese" document, he should already have the document with Japanese
capable coding system. In that case, Emacs should be able to handle
the coding system conversion form the translation table to the
designated file coding system.

There are two cases which I can think don't work:

  - all words in the document are written in romaji, and one wants
    romaji translations

  - the documents are writ en in a language which does not support
    Japanese character set, ie English or French, and one wants to use
    Japanese for non-content strings, ie TOC.

These cases are too rare that we can ignore for now.
2014-01-03 09:57:24 +01:00
Bastien Guerry 581db4e0a5 ob-clojure.el (org-babel-clojure-backend): Use 'cider when available
* ob-clojure.el (org-babel-clojure-backend): Use 'cider as the
backend when available.  Fall back on nrepl when available and
on slime otherwise.
2014-01-03 09:33:30 +01:00
Oleh Krehel 13bb11695b ob-J: Fix docstrings.
* lisp/ob-J.el (org-babel-J-interleave-echos): Update docstring.
  (org-babel-J-interleave-echos-except-functions): Update docstring.
  (obj-get-string-alignment): Update docstring.
  (obj-string-match-m): Update docstring.
2014-01-02 11:10:39 +01:00
Nicolas Goaziou eb5cb33218 Merge branch 'maint' 2014-01-01 19:07:31 +01:00
Nicolas Goaziou 1a3591c0e7 ox-html: Clean up some comments
* lisp/ox-html.el: Clean up "FIXME" comments.
2014-01-01 19:05:49 +01:00
Nicolas Goaziou e4386ba22a Merge branch 'maint' 2014-01-01 19:02:58 +01:00
Nicolas Goaziou 22c3bb81ff ox-publish: Fix a docstring
* lisp/ox-publish.el (org-publish-resolve-external-fuzzy-link): Fix
  docstring.
2014-01-01 19:02:13 +01:00
Nicolas Goaziou 4d652d21ae ox-html: Change default behaviour for unresolved link options
* lisp/ox-html.el (org-html-link): When an option cannot be resolved,
  append a hash sign as it could point to a target, instead of
  ignoring it.
2014-01-01 18:58:26 +01:00
Oleh Krehel e23bbda0aa ob-J.el: Fix wrong name in a call.
* lisp/ob-J.el (obj-get-string-alignment): Fix bug.
2013-12-31 22:56:20 +01:00
Oleh Krehel 8c67695e62 ob-J.el: Fix display of 3-dimensional arrays.
* lisp/ob-J.el (org-babel-J-interleave-echos): Change '' to ','.
  (org-babel-J-interleave-echos-except-functions): Improve regexp
  and change '' to ','.
  (org-babel-J-strip-whitespace): Change '' to ','.
  (obj-get-string-alignment): New function.
  (org-babel-J-print-block): Accomodate left- and right-aligned tables.
  (obj-match-second-space): Rename.
  (obj-match-second-space-left): Renamed from `obj-match-second-space'.
  (obj-match-second-space-right): New function.
2013-12-31 22:46:02 +01:00
Nicolas Goaziou ae1cf04833 org-element: Fix `org-element-at-point'
* lisp/org-element.el (org-element-at-point): Fix function when buffer
  starts with a headline.
2013-12-30 17:26:13 +01:00
Nicolas Goaziou 4dbbbe5b01 org-element: Small refactoring
* lisp/org-element.el (org-element-at-point): Refactor code.  Fixing
  structure in cached plain lists is no longer required since
  4423d750a4.
2013-12-30 14:15:11 +01:00
Nicolas Goaziou fde42c5303 org-element: Fix cache when point is at eob
* lisp/org-element.el (org-element-at-point): Fix cache when point is
  at eob and shortcut found something above.
2013-12-30 14:15:11 +01:00
Nicolas Goaziou 405b505c73 org-element: Fix cache update
* lisp/org-element.el (org-element--cache-sync): Fix cache update when
  a only contents of an element are modified.
(org-element--cache-shift-positions): Add optional argument allowing
partial shifting.
2013-12-30 14:15:11 +01:00
Bastien Guerry f58a8482b4 Merge branch 'maint' 2013-12-30 10:44:57 +01:00
Vladimir Lomov 71e2401bb5 ox-html.el: Use classes for caption instead of align
* ox-html.el (org-html-style-default): New classes
caption.t-above and caption.t-bottom.
(org-html-table): Use new classes.

TINYCHANGE

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-30 10:44:43 +01:00
Bastien Guerry 855ba428f2 Merge branch 'maint' 2013-12-30 10:44:31 +01:00
Bastien Guerry 4898be673f Revert "ox-html.el: Use classes for caption instead of align"
This reverts commit 1813200fc8.
2013-12-30 10:43:43 +01:00
Bastien Guerry 52d34f6cbc Merge branch 'maint' 2013-12-30 10:37:33 +01:00
Vladimir Lomov 1813200fc8 ox-html.el: Use classes for caption instead of align
* ox-html.el (org-html-style-default): New classes
caption.t-above and caption.t-bottom.
(org-html-table): Use new classes.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-30 10:35:13 +01:00
Bastien Guerry c8bb89faca Merge branch 'maint' 2013-12-30 10:32:24 +01:00
Bastien Guerry 8bb519d934 Fix defcustoms: don't quote const values.
* ob-latex.el (org-babel-latex-htlatex-packages): Use repeat
instead of list as the defcustom type.

* ox.el (org-export-with-creator):
* org.el (org-loop-over-headlines-in-active-region)
(org-mouse-1-follows-link, org-provide-todo-statistics):
* org-agenda.el (org-agenda-custom-commands-local-options)
(org-agenda-start-with-log-mode)
(org-agenda-show-inherited-tags): Don't quote const values.

Thanks to Glenn Morris for reporting this.
2013-12-30 10:30:44 +01:00
Bastien Guerry 9d3e48f629 Add missing :type to a few options.
* ox-texinfo.el (org-texinfo-def-table-markup):
* org-inlinetask.el (org-inlinetask-show-first-star):
* ob-maxima.el (org-babel-maxima-command): Add type.

Thanks to Glenn Morris for reporting this.
2013-12-30 10:13:57 +01:00
Vladimir Lomov 0dee513f6b ox: Russian translation for all supported strings
* ox.el: Completed Russian translation for all available strings.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
2013-12-29 09:55:50 +01:00
Nicolas Goaziou 398dbd91ed org-element: Fix `org-element-at-point' shortcut
* lisp/org-element.el (org-element-at-point): Correctly move from
  blank line to blank line in order to find a known element above.
2013-12-27 15:41:41 +01:00
Nicolas Goaziou 954168565b Merge branch 'maint' 2013-12-26 12:43:06 +01:00
Nicolas Goaziou 4ee7e60405 ox: Fix smart quote detection
* lisp/ox.el (org-export-smart-quotes-regexps): Fix smart quote
  detection when it is followed by an open parenthesis syntax class.
2013-12-26 12:35:59 +01:00
Nicolas Goaziou c0aa83bf41 ox: Fix uninterpreted objects in TITLE property
* lisp/ox.el (org-export-remove-uninterpreted-data): Renamed from
  `org-export--remove-uninterpreted'.
(org-export--remove-uninterpreted-data-1): New function.
(org-export-as): Use new function.
* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add test.
2013-12-26 12:26:11 +01:00
Nicolas Goaziou 39c936584a ox-latex: Fix inline math in title
* lisp/ox-latex.el (org-latex--wrap-latex-math-block): Change
  signature.
(org-latex-math-block-tree-filter,
org-latex-math-block-options-filter): New functions.

This patch fixes 68fda96c06, where
changes to inline math export were not propagated to document
properties.
2013-12-26 12:26:11 +01:00
Nicolas Goaziou 4cb98ed1cd org-element: Fix org-element-insert-before
* lisp/org-element.el (org-element-insert-before): Handle insertion at
  the beginning of a :title property.
2013-12-26 12:26:11 +01:00
Oleh Krehel 0ef823725b ob-J (obj-strip-leading-ws): Remove redundant function.
* lisp/ob-J.el (obj-strip-leading-ws): Remove function.
  (org-babel-J-print-block): Use `org-trim' instead.
2013-12-23 14:48:06 +01:00
Oleh Krehel 7ea6c3cf38 ob-J: Fix explicit body regexp.
* lisp/ob-J.el (org-babel-J-interleave-echos-except-functions):
  Explicit body has to end either with "\n)\n" or with "\n)$".
2013-12-23 14:39:43 +01:00
Bastien Guerry d4710bd0aa Merge branch 'maint' 2013-12-23 06:58:46 +01:00
Bastien Guerry fc3857b310 Small rewrite of the previous commit.
Use `regexp-opt' instead of `regexp-quote'.
2013-12-23 06:58:26 +01:00
Bastien Guerry acfe7255ff Merge branch 'maint' 2013-12-23 00:11:37 +01:00