1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-12 09:28:11 +00:00
Commit Graph

15609 Commits

Author SHA1 Message Date
Bastien Guerry
e247cfe1e3 Complete previous patch 2014-04-17 16:20:48 +02:00
Bastien Guerry
6cdaf171db org.el (org-insert-heading): Minor docstring enhancement
* org.el (org-insert-heading): Minor docstring enhancement.
2014-04-17 16:15:48 +02:00
Bastien Guerry
a2b69cc4d7 Merge branch 'maint' 2014-04-17 13:38:41 +02:00
Bastien Guerry
4315658419 org.texi (Installation): Fix documentation bug
* org.texi (Installation): Be more clear on why installing Org
through ELPA should be done without loading any Org file.

This is a very common pitfall that needs to be considered a
documentation bug.
2014-04-17 13:38:29 +02:00
Bastien Guerry
cd823dc3f7 Fix commit 5ec31814 2014-04-17 13:19:15 +02:00
Bastien Guerry
13230e3a66 org-clock.el (org-clock-put-overlay): Minor enhancements
* org-clock.el (org-clock-put-overlay): Don't use a line of
dots anymore.  Enhance display of time.

Thanks to Noah Slater for suggesting this.
2014-04-17 13:10:09 +02:00
Bastien Guerry
1a27bed477 Merge branch 'maint' 2014-04-17 12:52:04 +02:00
Bastien Guerry
a937366e8a org.el (org-sort-entries): Fix the number of blank lines to keep for the last entry to sort
* org.el (org-sort-entries): Fix the number of blank lines to
keep for the last entry to sort.

Thanks to Kyle Meyer for raising this issue.
2014-04-17 12:51:49 +02:00
Bastien Guerry
ca80c8c277 org.texi (Beamer export): Update example to let it display a table of contents
* org.texi (Beamer export): Update example to let it display a
table of contents.
2014-04-17 12:09:53 +02:00
Bastien Guerry
9448fa263b Merge branch 'maint'
Conflicts:
	lisp/org-clock.el
2014-04-17 11:42:16 +02:00
Bastien Guerry
1781a63304 Merge branch 'maint' of orgmode.org:org-mode into maint 2014-04-17 11:39:02 +02:00
Bastien Guerry
17fb85b12c org-clock.el (org-clock-put-overlay): Fix display when `org-indent-mode' is on
* org-clock.el (org-clock-put-overlay): Fix display when
`org-indent-mode' is on.

Thanks to Christoph Groth for reporting this.
2014-04-17 11:38:53 +02:00
Nicolas Goaziou
fffd055ac5 Merge branch 'maint'
Conflicts:
	lisp/org-element.el
	lisp/ox-html.el
2014-04-17 11:34:54 +02:00
Nicolas Goaziou
9dac00129d Update export back-ends wrt "file" link changes
* lisp/ox-latex.el (org-latex-link):
* lisp/ox-html.el (org-html-link):  Do not expand absolute file names
  and do not try to fix hierarchy part, as it is already taken care of
  at the parser level.

* lisp/ox-md.el (org-md-link): Ditto.  Also fix absolute file names.

* lisp/ox-odt.el (org-odt-link):
* lisp/ox-man.el (org-man-link):
* lisp/ox-texinfo.el (org-texinfo-link):
* contrib/lisp/ox-groff.el (org-groff-link): Ditto.  Do not prepend
  scheme part to relative file names either.

* contrib/lisp/ox-deck.el (org-deck-link): Small refactoring.
2014-04-17 11:30:15 +02:00
Nicolas Goaziou
b49cbf1338 org-element: Fix ill-defined "file" type links
* lisp/org-element.el (org-element-link-parser): Fix ill-defined
  "file" type links.  Expand absolute file names in the process.

Org accepts invalid URI syntax for absolute "file" links, e.g.,
file:/home/user/file.txt.  This patch normalizes them.
2014-04-17 11:30:15 +02:00
Nicolas Goaziou
018a80541a Small refactoring
* lisp/org.el (org-make-link-regexps): Use `regexp-opt' instead of
  `mapconcat' and `regexp-quote'.
2014-04-17 11:30:15 +02:00
Nicolas Goaziou
1ca819e398 Revert "Make Org links compatible with URI syntax"
This reverts commit 3589f64e42.
2014-04-17 11:30:15 +02:00
Nicolas Goaziou
73c141e43e Revert "Fix link export"
This reverts commit fc1f7d752f.
2014-04-17 11:30:14 +02:00
Nicolas Goaziou
7b3c11f797 Revert "Fix mailto links"
This reverts commit f61cd6b7a1.
2014-04-17 11:30:14 +02:00
Bastien Guerry
5ec31814f9 org.el (org-sort-entries): Allow to sort by clocking time
* org.el (org-sort-entries): Allow to sort by clocking time.

Thanks to Noah Slater for this idea.
2014-04-17 10:32:36 +02:00
Bastien Guerry
817619a50b Revert "org.el (org-sort-entries): Allow to sort by clocking time"
This reverts commit 1cca8f534f.
2014-04-17 10:32:23 +02:00
Bastien Guerry
1cca8f534f org.el (org-sort-entries): Allow to sort by clocking time
* org.el (org-sort-entries): Allow to sort by clocking time.

Thanks to Noah Slater for this idea.
2014-04-17 10:30:44 +02:00
Bastien Guerry
b3f18b310b Merge branch 'maint' 2014-04-17 10:20:32 +02:00
Bastien Guerry
8f19a42304 Minor enhancements to displaying clocks as overlays
* org-faces.el (org-clock-overlay): Use a gray background and
don't inherit the foreground.

* org-clock.el (org-clock-put-overlay): Don't add the stars.
2014-04-17 10:19:58 +02:00
Bastien Guerry
f2ec685008 Fix previous commit 2014-04-17 10:18:32 +02:00
Bastien Guerry
3f3a8f4616 Merge branch 'maint' 2014-04-17 09:56:11 +02:00
Bastien Guerry
63e9763b2a org-agenda.el (org-agenda-finalize): Apply all filters correctly
* org-agenda.el (org-agenda-finalize): Apply all filters
correctly.
2014-04-17 09:55:57 +02:00
Bastien Guerry
06bbbee67a Merge branch 'maint' 2014-04-17 09:18:19 +02:00
Bastien Guerry
c3810f71b6 org.el (org-update-dblock): Use `save-excursion'
* org.el (org-update-dblock): Use `save-excursion' instead of
`save-window-excursion' so that blocks can edit other windows and
change the window layout.

Thanks to Martin for reporting this.
2014-04-17 09:18:08 +02:00
Bastien Guerry
1a910df1c0 Merge branch 'master' of orgmode.org:org-mode 2014-04-17 08:42:49 +02:00
Michael Weylandt
255dd41afd Org babel: Add function and keybinding to remove result blocks
* ob-core.el (org-babel-remove-result-one-or-many): New function.

* ob-keys.el (org-babel-key-bindings): Add a keybinding for the
new function `org-babel-remove-result-one-or-many'.

TINYCHANGE
2014-04-17 08:41:05 +02:00
Michael Weylandt
ed44c161f0 Keybinding to remove result blocks
* ob-core.el (org-babel-remove-result-one-or-many): New function.
* ob-keys.el: Keybinding for new function org-babel-remove-result-one-or-many

TINYCHANGE
2014-04-17 08:26:12 +02:00
Rick Frankel
8d20a8419f Add classes to checkbox list elements.
* lisp/ox-html.el (org-html-format-list-item): Add the appropriate
  class `on', `off' or `trans' (the tri-state checkbox types) to the
  list elements in checkbox lists.
2014-04-16 21:10:34 -04:00
Rick Frankel
93ff3e5cb7 Process html attributes on paragraphs.
* lisp/ox-html.el (org-html-paragraph): Add processed html attributes
  to paragraph tag.
2014-04-16 21:09:57 -04:00
Bastien Guerry
2335961c4c Merge branch 'maint' 2014-04-17 02:31:37 +02:00
Bastien Guerry
eb0f8afdf4 org-agenda.el: Fix bug when displaying the changed date
* org-agenda.el (org-agenda-mode): Disable `indent-tabs-mode'.
(org-agenda-dim-blocked-tasks): Make overlays intangible.
(org-agenda-show-new-time): Fix bug when deleting a timestamp
right after changing it.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item)
(org-agenda-get-sexps, org-agenda-filter-by-regexp)
(org-agenda-filter-top-headline-apply): Fix indentation.

Thanks to Fletcher Charest and Nick Dokos for reporting issues
in this area.

There is one bug left: in a filtered agenda, changing a timestamp
will not always correctly display the warning.  This happens when
the headline at point is followed by hidden headlines, because
`org-agenda-show-new-time' tries to set a text property at a
point where there is an overlay that hides then text.  Because
the overlay is now intangible, the warning text will be displayed
too far on the right, and may be outside of the window.
2014-04-17 02:31:23 +02:00
Bastien Guerry
11f7fe8408 Merge branch 'maint' 2014-04-17 00:35:39 +02:00
Bastien Guerry
241764b2d1 Revert "org-agenda.el: Fix bug when using `org-agenda-do-date-later' in filtered agendas"
This reverts commit 3559ff84b2.
2014-04-17 00:35:14 +02:00
Bastien Guerry
675e8b2b86 org.el (org-insert-heading): Fix code typo
* org.el (org-insert-heading): Fix code typo.

Thanks to Thorsten Jolitz for reporting this and to Nicolas Richard
for his comments.
2014-04-16 18:28:26 +02:00
Bastien Guerry
132da2db35 Let sort-by-time handle [H]H:MM strings and add a :sort parameter for clocktables
* org-clock.el (org-clocktable-write-default): New parameter
":sort" to sort a column by a sorting type.  E.g., a value of
:sort (1 . ?a) will sort the first column alphabetically.  The
sorting line is the third one, table-wise, which is usually
the first line that contains user data.

* org.texi (The clock table): Document the new :sort
parameter.

* org.el (org-do-sort): Recognize [H]H:MM strings as time
values and allow sort-by-time to process them.

* org-table.el (org-table-sort-lines): Mention that sorting by
time also recognize [H]H:MM time values.
2014-04-16 18:23:47 +02:00
Bastien Guerry
6ff38b1f6d org.el (org-create-dblock): Tiny docstring fix
* org.el (org-create-dblock): Tiny docstring fix.
2014-04-16 17:49:19 +02:00
Rainer M. Krug
7cf4d591eb Add clarification to `:no-expand' header argument
* doc/org.texi (no-expand): Added statement to clarify that this
  header argument has no impact on the execution of a code block.

TINYCHANGE
2014-04-16 17:41:57 +02:00
Alan Schmitt
ca2763280d ob-dot.el: Substitute variables literally
* lisp/ob-dot.el (org-babel-expand-body:dot): Do not change the case
nor interpret '\' when substituting block variables.
2014-04-16 17:37:00 +02:00
Bastien Guerry
d1600af7b6 org.el (org-cycle): Try `org-try-cdlatex-tab' before trying to edit/move as in a table
* org.el (org-cycle): Try `org-try-cdlatex-tab' before trying
to edit/move as in a table.

Thanks to Konstantin Kliakhandler for reporting this.
2014-04-16 17:25:08 +02:00
Bastien Guerry
f86b6d8aa3 org.texi (Agenda dispatcher): Small rewrite
* org.texi (Agenda dispatcher): Small rewrite.  Add a concept
to the concept index.
2014-04-16 16:44:11 +02:00
Nicolas Goaziou
c4f7880429 Fix fontification of radio links
* lisp/org.el (org-set-font-lock-defaults): Fix fontification of radio
  links.

Thanks to Daniel Clemente for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/84927
2014-04-15 20:01:16 +02:00
Eric Schulte
a7189aafc3 whitespace, indentation and a function renaming
* lisp/ob-shell.el (org-babel-variable-assignments:sh-generic):
  Whitespace and renaming to be shell specific.
  (org-babel-variable-assignments:bash_array): Whitespace.
  (org-babel-variable-assignments:bash_assoc): Whitespace.
  (org-babel-sh-var-to-sh): Whitespace.
2014-04-14 21:30:32 -06:00
Pascal Fleury
3c7e75ab0b ob-shell.el: export vars as arrays for 'sh' code blocks
* lisp/ob-shell.el: added support to serialize vars as arrays or associative arrays as appropriate if it is using bash.
* testing/examples/ob-shell-test.org: a file containing a few code blocks both illustrating the use of arrays as well as serving as test for the new export functionality.
* testing/lisp/test-ob-shell.el: added a few unit tests that verify that this new logic only triggers for bash and no other shell at this time.

When variables are defined in a 'sh' code block, they are exported as strings. when the variable itself is an array or a table, then we simply get a shell variable that contains the list of all values in a non-structured form.
When calling the code block with bash, however, it will now export the list as an array, the table as an associative array. A scalar is exported the same way as before.

Signed-off-by: Pascal Fleury <fleury@google.com>
2014-04-14 21:24:00 -06:00
Alan Schmitt
de71f03d2a Org-expiry: make code and doc consistent
* contrib/lisp/org-expiry.el (org-expiry-expired-p): make code and doc
string consistent.
2014-04-14 14:03:45 +02:00
Nicolas Goaziou
ee3cf87d40 Merge branch 'maint'
Conflicts:
	lisp/ox-html.el
2014-04-14 13:56:05 +02:00