Commit Graph

13459 Commits

Author SHA1 Message Date
Bastien Guerry dd3fbd246e Fix commit a9880a
* org.el (org-toggle-tags-groups): Correctly highlight group
tags.
(org-tags-expand): Expand tags as words, with characters ?@
and ?_ being considered words constituents.
2013-03-25 15:53:21 +01:00
Carsten Dominik 181abcaf29 Merge branch 'master' of orgmode.org:org-mode 2013-03-25 15:49:35 +01:00
Carsten Dominik 21fead7888 Revert "Work around calc-eval regression"
This reverts commit 10e239f434.
2013-03-25 15:48:56 +01:00
Eric Schulte 727a22e327 print Perl variables with a format string
Don't use princ because it doesn't always return a string.

Thanks to Rick Frankel for pointing this out.

* lisp/ob-perl.el (org-babel-perl--var-to-perl): Print Perl variables
  with a format string.
2013-03-25 07:39:40 -06:00
Bastien Guerry 9ae225f48a Merge branch 'master' of orgmode.org:org-mode 2013-03-25 12:17:25 +01:00
Bastien Guerry 44b218d2d7 doc/org.texi: Fix typo in 225289 2013-03-25 12:13:19 +01:00
Carsten Dominik acff82f9fe Merge branch 'master' of orgmode.org:org-mode 2013-03-25 11:48:40 +01:00
Carsten Dominik 10e239f434 Work around calc-eval regression
* lisp/org-table.el (org-table-eval-formula): Work-around for
  calc-eval regression.

Calc-eval can no longer be called without initializing the
*Calculator* buffer first.
2013-03-25 11:48:21 +01:00
Bastien Guerry 78959943e2 Merge branch 'master-group-tags2' 2013-03-25 06:59:23 +01:00
Bastien Guerry d26431cea4 org.el (org-set-regexps-and-options): Don't read setup files from read-only buffers
* org.el (org-set-regexps-and-options): Don't read setup files
from read-only buffers.
(org-file-contents): When no-error is non-nil, throw a less
intrusive message.

This commit prevents Gnus to try reading arbitrary files on your machine
when opening a message with #+SETUPFILE keyword.

In general, it prevents reading a setup file from any read-only buffer.

Thanks to Eric Abrahamsen and Andreas Leha for reporting this.
2013-03-25 06:45:33 +01:00
Suhail Shergill 3b2abfce7b bugfix: fix `org-babel-execute-src-block' on remote hosts
* lisp/ob-core.el (org-babel-temp-file): For remote hosts, modify the prefix
  and leave `temporary-file-directory' unchanged.

The reason setting `temporary-file-directory' doesn't work here is
because `make-temp-file' recursively calls itself (indirectly).
Modifying `temporary-file-directly', affects the recursive calls as well,
which results in a "No such file file or directory" error.

The fix is to leave `temporary-file-directory' unaltered, for remote
hosts, and instead modifying the 'prefix' argument to `make-temp-file'
appropriately.

TINYCHANGE
2013-03-25 06:09:14 +01:00
Bastien Guerry 3abd5ef707 org-agenda.el: Re-align leaders to the left
* org-agenda.el (org-agenda-scheduled-leaders)
(org-agenda-deadline-leaders): Re-align leaders to the left,
back to a 11 characters width.

Thanks to Matt Lundin for reporting display problems here.
2013-03-25 06:03:17 +01:00
Bastien Guerry 0f175ea128 org.el (org-refile-cache-check-set): More informative message
* org.el (org-refile-cache-check-set): More informative message.

Thanks to Samuel Wales for raising this.
2013-03-25 05:47:45 +01:00
Bastien Guerry a9880a7710 Implement group tags
* org-agenda.el (org-tags-view): Set the matcher after
preparing the agenda, as `org-tag-groups-alist-for-agenda'
might be needed.
(org-agenda-filter-make-matcher): New parameter `filter' and
`type'.  Handle group tags.
(org-agenda-filter-expand-tags): New function.
(org-agenda-filter-apply): Handle group tags.

* org.el (org-blank-before-new-entry): Tiny docstring fix.
(org-tag-alist-for-agenda): Add docstring.
(org-tag-groups-alist-for-agenda): New global variable.
(org-tag-groups-alist): New buffer-local variable.
(org-tag-alist, org-tag-persistent-alist): Handle :grouptags.
(org-group-tags): New option.
(org-toggle-group-tags): New command.
(org-mode-map): Bind `org-toggle-group-tags' to `C-c C-x q'.
(org-set-regexps-and-options-for-tags): New function, factored
out from `org-set-regexps-and-options'.
(org-set-regexps-and-options): Don't handle tags, they are now
handled separately by `org-set-regexps-and-options-for-tags'.
(org-assign-fast-keys): Handle :grouptags.
(org-mode): Use `org-set-regexps-and-options-for-tags' on top
of `org-set-regexps-and-options'.
(org-fontify-meta-lines-and-blocks-1): Fontify group tags.
(org-make-tags-matcher): Expand group tags in the matcher.
(org-tags-expand): New function.
(org-tags-completion-function): Tiny code clean up.
(org-set-current-tags-overlay): Add a docstring.
(org-fast-tag-selection): Highlight group tags.
(org-agenda-prepare-buffers): Set `org-tag-alist-for-agenda'
and `org-tag-groups-alist-for-agenda'.  Don't uniquify
`org-tag-alist-for-agenda' as we may need the grouping
information for filtering in the agenda buffer.
(org-uniquify-alist): New function.

* org-pcomplete.el (pcomplete/org-mode/file-option/tags):
Handle :grouptags.

* org-faces.el (mode-line): New face for group tags.
2013-03-25 05:42:35 +01:00
Bastien Guerry 225289c2db doc/org.texi: Reflect changes from the new export engine
* org.texi (Sparse trees, Agenda commands)
(@LaTeX{} fragments, Selective export, Export options)
(Export options, Export options, The export dispatcher)
(ASCII/Latin-1/UTF-8 export, ASCII/Latin-1/UTF-8 export)
(HTML Export commands, HTML Export commands)
(@LaTeX{}/PDF export commands, @LaTeX{}/PDF export commands)
(ODT export commands, ODT export commands, iCalendar export)
(Publishing options, Publishing options)
(Triggering publication, In-buffer settings): Update to
reflect changes from the new export engine.
2013-03-25 05:41:59 +01:00
Bastien Guerry 7f2f845700 orgguide.texi (Tag searches): New section
* orgguide.texi (Tag searches): New section.
2013-03-25 05:41:59 +01:00
Bastien Guerry 2c9d486740 org.texi (Matching tags and properties): Explain group tags expansion as regular expressions
* org.texi (Matching tags and properties): More examples.
Explain group tags expansion as regular expressions.
2013-03-25 05:41:59 +01:00
Bastien Guerry a7fd28b4b6 org.texi (Tag groups): New section
* org.texi (Tag groups): New section.
2013-03-25 05:41:59 +01:00
Bastien Guerry 63f22cb4bc org.texi (Setting tags): Tiny formatting fixes
* org.texi (Setting tags): Tiny formatting fixes.
2013-03-25 05:41:58 +01:00
Bastien Guerry 49fd02134e contrib/lisp/ox-confluence.el (org-confluence-empty): Fix typo
* contrib/lisp/ox-confluence.el (org-confluence-empty): Fix typo.
2013-03-25 05:41:58 +01:00
Bastien Guerry 7610231952 ob-core.el (org-babel-hash-show-time): tiny Docstring enhancement
* ob-core.el (org-babel-hash-show-time): tiny Docstring enhancement.
2013-03-25 05:41:58 +01:00
Bastien Guerry fa9a9ac7a7 mk/server.mk: Fix doc-up
Also upload org.pdf and orgguide.pdf
2013-03-25 05:41:58 +01:00
Nicolas Goaziou 42e1a6351d org-element: Allow to escape escaping character before a comma
* lisp/org-element.el (org-element-macro-parser): Allow to escape
  escaping character before a comma.  Also do not trim spaces at
  argument boundaries.
* doc/org.texi (Macro replacement): Update documentation about
  possible locations and escaping mechanism.
* testing/lisp/test-org-element.el: Add tests.

With this patch, macro's arguments are read as the following:

  "a,b"     -> '("a" "b")
  "a\,b"    -> '("a,b")
  "a\\,b"   -> '("a\" "b")
  "a\\\,b"  -> '("a\,b")
  "a\\\\,b" -> '(a"\\" "b")

Note that with the patch, you only need to escape backslashes before
a comma:

  "a\\b\,c" -> '("a\\b,c")
2013-03-23 20:42:34 +01:00
Nicolas Goaziou 7847b4d7a8 ox: Fix coding system problem in asynchronous export
* lisp/ox.el (org-export-async-start): Use correct coding system so
  unibyte characters do not appear in the resulting buffer or file.
2013-03-23 19:02:50 +01:00
Bastien Guerry 2922c1365d testing/lisp/: Use non-obsolete variable names (see previous commit)
* test-org-list.el (test-org-list/cycle-bullet)
(test-org-list/move-item-down, test-org-list/move-item-up)
(test-org-list/insert-item): Use non-obsolete variable names.

* test-org-element.el (test-org-element/at-point): Use
`org-list-empty-line-terminates-plain-lists'.
2013-03-23 17:45:26 +01:00
Bastien Guerry f373bca58b Rename some list variables
* org-element.el (org-element-paragraph-separate): Use
new name `org-list-allow-alphabetical'.

* org-list.el (org-list-allow-alphabetical): Rename from
`org-alphabetical-lists'.
(org-list-empty-line-terminates-plain-lists): Rename from
`org-empty-line-terminates-plain-lists'.
(org-checkbox-hierarchical-statistics): Rename from
`org-hierarchical-checkbox-statistics'.

* org.texi (Plain lists, Checkboxes): Use non-obsolete
variable names.
2013-03-23 17:45:15 +01:00
Bastien Guerry 869f9f2354 Update READMEs 2013-03-23 17:34:19 +01:00
Bastien Guerry 412d980f28 org.el (org-display-inline-images): Use the #+attr_html: :width syntax
* org.el (org-image-actual-width): Update docstring.
(org-display-inline-images): Use the #+attr_html: :width syntax.
2013-03-21 16:02:19 +01:00
Bastien Guerry d738f047ef org.el (org-modules): Remove deleted libraries, add new ones
* org.el (org-modules): Remove deleted libraries, add new
ones.
2013-03-21 15:53:24 +01:00
Bastien Guerry 51233b8ae2 ox-html.el (org-html-indent): Default to nil
* ox-html.el (org-html-indent): Default to nil, as non-nil can
break indentation of source code blocks.

Thanks to Vladimir Lomov for reporting this.
2013-03-21 14:25:18 +01:00
Nicolas Goaziou fbb30a5e79 ox: Move a function in the file
* lisp/ox.el (org-export--copy-to-kill-ring-p): Move function
  elsewhere in the file.
2013-03-20 16:58:48 +01:00
Bastien Guerry 73fe0ab77a ox-html.el (org-html-link): Don't insert nil if there is no attributes
* ox-html.el (org-html-link--inline-image): Small refactoring.
(org-html-link): Don't insert nil if there is no attributes.

Thanks to Samuel Wales for reporting this.
2013-03-20 07:54:16 +01:00
Bastien Guerry 1fb57438bd Fix code typo in commit 78b3a0 2013-03-20 07:46:53 +01:00
Bastien Guerry 855dcfbf2a Merge branch 'master' of orgmode.org:org-mode 2013-03-20 01:00:24 +01:00
Bastien Guerry 9c1ea74c2b Fix typo in commit a13b19e
Thanks to John Hendy for reporting the bug!
2013-03-20 00:57:56 +01:00
Rick Frankel 78b3a03981 Fix issue with dbi processing in ob-sql.
* lisp/ob-sql.el (org-babel-execute:sql): Unquote cmdline argument in
  format string, dbish requires three separate arguments. Add dbi to
  the list of engines with automatically added header separator.
2013-03-19 16:51:42 -04:00
Bastien Guerry eff59a15d7 ox-html.el: Use the correct syntax for image and link attributes
* ox-html.el (org-html-link--inline-image): Use the correct
syntax for image attributes.  Allow :width :height and :alt as
predefined attributes for inline images.
(org-html-link, org-html-table): Use the standard syntax---
e.g. "#+attr_html: :options ..."--- to get attributes.
2013-03-19 19:39:35 +01:00
Bastien Guerry 9cd0810f90 ox.el (org-export-table-cell-alignment): Treat an empty cell as a number if it follows a number
* ox.el (org-export-table-cell-alignment): Treat an empty cell
as a number if it follows a number.

Thanks to Kodi Arfer for reporting this.
2013-03-19 19:39:35 +01:00
Bastien Guerry 492e20dbfa ox.el (org-export-as): Allow user functions in `org-export-before-parsing-hook' to modify the point
* ox.el (org-export-as): Allow user functions in
`org-export-before-parsing-hook' to modify the point.

Thanks to Charles Berry for reporting this.
2013-03-19 19:39:35 +01:00
Bastien Guerry 1ab084ba73 org.el (org-entry-add-to-multivalued-property): Add the new value by appending it at the end of the line
* org.el (org-entry-add-to-multivalued-property): Add the new
value by appending it at the end of the line.

Thanks to Thorsten Jolitz for a preliminary patch for this.
2013-03-19 19:39:35 +01:00
Bastien Guerry 70417caa90 org-table.el (orgtbl-to-latex, orgtbl-to-texinfo): Export cells to LaTeX and Texinfo before sending the table
* org-table.el (orgtbl-to-generic): New parameter `backend' to
export cells content using a specific backend.
(orgtbl-to-latex, orgtbl-to-texinfo): Export cells to LaTeX
and Texinfo before sending the table.

Thanks to Luca Sabbatini for reporting a problem that led to this change.
2013-03-19 19:39:35 +01:00
Bastien Guerry ae85aa0d32 test-ox.el (test-org-export/define-derived-backend, test-org-export/derived-backend-p): Uncomment
* test-ox.el (test-org-export/define-derived-backend)
(test-org-export/derived-backend-p): Uncomment.
2013-03-19 19:39:35 +01:00
Bastien Guerry 5c63007721 contrib/lisp/*: Use `org-export-define-*backend' as defuns, not macros
* ox-taskjuggler.el (taskjuggler):
* ox-s5.el (s5):
* ox-rss.el (rss):
* ox-koma-letter.el (koma-letter):
* ox-groff.el (groff):
* ox-freemind.el (freemind):
* ox-deck.el (deck):
* ox-confluence.el (confluence): Use
`org-export-define-backend' or
`org-export-define-derived-backend' as defuns, not macros.
2013-03-19 19:39:34 +01:00
Bastien Guerry a13b19e384 ox.el (org-export-define-backend, org-export-define-derived-backend): Use defuns
* ox.el (org-export-define-backend)
(org-export-define-derived-backend): Make defuns and update
docstrings.

* ox-texinfo.el (texinfo):
* ox-org.el (org):
* ox-odt.el (odt):
* ox-md.el (md):
* ox-man.el (man):
* ox-latex.el (latex):
* ox-icalendar.el (icalendar):
* ox-html.el (html):
* ox-beamer.el (beamer):
* ox-ascii.el (ascii): Use the defuns.
2013-03-19 19:39:34 +01:00
Bastien Guerry d8969931a9 org-table.el: Fix setting of constants.
* org.el (org-set-regexps-and-options): Use
`org-table-set-constants'.

* org-table.el (org-table-set-constants): New function.
(orgtbl-ctrl-c-ctrl-c): Use it.

Thanks to Oliver Večerník for reporting problems here.
2013-03-19 19:39:34 +01:00
Bastien Guerry f4b38bcdbb org-pcomplete.el (pcomplete/org-mode/block-option/clocktable): Add parameters
* org-pcomplete.el
(pcomplete/org-mode/block-option/clocktable): Add parameters.
2013-03-19 19:39:34 +01:00
Bastien Guerry 6b2693393b org.el (org-options-keywords): Remove "INFOJS_OPT": it is added through ox-html.el now
* org.el (org-options-keywords): Remove "INFOJS_OPT": it is
added through ox-html.el now.
2013-03-19 19:39:34 +01:00
Bastien Guerry c8a3425559 org-agenda.el (org-agenda-redo): Set filters after agenda has been redone
* org-agenda.el (org-agenda-redo): Set filters after agenda
has been redone.
2013-03-19 19:39:34 +01:00
Bastien Guerry ecb9e5811d org.el (org-store-link): Store each line of the active as a separate link
* org.el (org-store-link): When there is an active region,
store each line as a separate link.
(org-insert-all-links): Use a default description when links
do not have one already.

* org-agenda.el (org-agenda-redo): Fix typo in code.
2013-03-19 19:39:12 +01:00
Bastien Guerry 00e8ef22f2 org.el (org-link-display-format): Fix docstring
* org.el (org-link-display-format): Fix docstring.
2013-03-19 19:39:12 +01:00