11cd659553
Merge branch 'master' of orgmode.org:org-mode
2013-02-28 09:33:51 +01:00
cbba811a73
ox-html: Do not display title in body-only export
...
* lisp/ox-html.el (org-html-inner-template): Remove title.
(org-html-template): Add title.
2013-02-28 08:48:43 +01:00
4ba1e40cff
ox-latex.el: Improve two docstrings
...
* ox-latex.el (org-latex-logfiles-extensions)
(org-latex-remove-logfiles): Improve docstrings.
2013-02-28 08:41:57 +01:00
9bc7f70639
Merge branch 'master' of orgmode.org:org-mode
2013-02-28 00:29:31 +01:00
ffefa9ed86
org-capture.el (org-capture): Cosmetic fix
...
* org-capture.el (org-capture): Cosmetic fix.
2013-02-28 00:29:24 +01:00
f4fc83ec64
org-protocol.el: Small docstrings enhancements
...
* org-protocol.el (org-protocol-create-for-org)
(org-protocol-create): Small docstrings enhancements.
2013-02-28 00:28:17 +01:00
db750eba28
org-protocol.el (org-protocol-capture): Small docstring fix
...
* org-protocol.el (org-protocol-capture): Small docstring fix.
2013-02-28 00:24:46 +01:00
302d3780ec
ob-core: add binding for merged-params to avoid multiple evaluation
...
* lisp/ob-core.el (org-babel-execute-src-block): Add binding for
merged-params to avoid multiple evaluation of
`org-babel-merge-params´.
2013-02-27 23:48:02 +01:00
0fcfafe331
ob-core: Rename cache? to cache-p, add binding for cache-current-p
...
* lisp/ob-core.el (org-babel-execute-src-block): Rename cache? to
cache-p, add binding for cache-current-p and use it.
2013-02-27 23:48:02 +01:00
8ac66556bb
org.el (org-speed-command-activate): Only forbid in src code blocks
...
* org.el (org-speed-command-activate): Only forbid in src code
blocks.
2013-02-27 23:43:25 +01:00
ad5085517f
Merge branch 'master' of orgmode.org:org-mode
2013-02-27 23:27:16 +01:00
fcd2ca5026
org-mew.el: Add declarations
...
Thanks to Achim for pointing this.
2013-02-27 23:27:02 +01:00
a7535ca353
ox: Fix min level computation
...
* lisp/ox.el (org-export--get-min-level): Ignore footnote section when
computing minimal headline level.
2013-02-27 23:22:51 +01:00
ea6be4d3a8
Merge branch 'maint'
2013-02-27 23:06:11 +01:00
7524ef25ff
org-indent.el: Bugfix
...
* org-indent.el
(org-indent-add-properties): Bugfix: prevent negative value for
`added-ind-per-lvl'.
Thanks to Torsten Bronger for reporting this.
2013-02-27 23:06:03 +01:00
ce6339e292
org-contacts.el: Rename a function to follow emacs-lisp coding conventions
...
* contrib/lisp/org-contacts.el (org-contacts-db-need-update-p):
Replace the '?' by a '-p'.
(org-contacts-db): Use the new name.
2013-02-27 22:12:54 +01:00
eee580c8b3
Revert "ob-core.el: Do not ask for confirmation if cached value is current"
...
Reverting "Fix a typo I introduced while editing Achim's commit 091bf0"
Reverting "ob-core.el: Do not ask for confirmation if cached value is current"
This reverts commit 091bf02514
2013-02-27 22:10:05 +01:00
a002158b9f
Merge branch 'maint'
2013-02-27 18:14:16 +01:00
8e22aafe9a
Fix b6b509b one more time.
2013-02-27 18:13:48 +01:00
6cc600d074
Merge branch 'maint'
2013-02-27 17:28:38 +01:00
01748861d4
Fix b6b509b again.
...
Thanks to Nicolas Richard for reporting this.
2013-02-27 17:28:33 +01:00
692f053d80
Merge branch 'maint'
2013-02-27 14:49:46 +01:00
c8c26c8e19
Enhance the fix implemented in 41882a99
...
* org.el (org-mode): Add `org-fix-ellipsis-at-bol' to
`isearch-mode-end-hook' so that any isearch fixes the problem with
ellipsis on the first line.
(org-fix-ellipsis-at-bol): New defsubst.
(org-show-context, org-isearch-end): Use it.
2013-02-27 14:49:30 +01:00
c8c991e049
org-agenda.el (org-agenda-deadline-leaders): New formatting string for past deadlines
...
* org-agenda.el (org-agenda-deadline-leaders): New formatting
string for past deadlines.
(org-agenda-scheduled-leaders): Small change.
(org-agenda-get-deadlines): Use the new formatting string.
Thanks to Sébastien Vauban who suggested this idea and proposed
a preliminary patch for it.
2013-02-27 14:29:46 +01:00
bdce4dbf9b
Fix a typo I introduced while editing Achim's commit 091bf0
...
Thanks to Achim for reporting this!
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=091bf0
2013-02-27 13:29:23 +01:00
936f13c629
Merge branch 'master' of orgmode.org:org-mode
2013-02-27 13:27:56 +01:00
aecccc10d0
org-contacts.el: Let the users decide if they want to use `org-contacts' to complete mail addresses
...
* contrib/lisp/org-contacts.el (org-contacts-enable-completion): A
custom boolean variable to enable the completion with
`org-contacts'. Enabled by default.
2013-02-27 13:28:13 +01:00
e4cebbe40e
org-contacts.el: Started to silent byte-compiler
...
* contrib/lisp/org-contacts.el: Remove some compile-time warnings by adding the proper declarations.
(org-contacts-anniversaries): Hack around an undefined variable
because I wasn't able to understand how this function works.
(org-contacts-wl-get-from-header-content): Check whether the variable
`wl-summary-buffer-elmo-folder' is bound or not.
2013-02-27 13:28:11 +01:00
0f76e8ca42
org-contacts.el: Check if the database need a refresh in a dedicated function
...
* contrib/lisp/org-contacts.el (org-contacts-db-need-update?): New
function to determine whether we need to refresh `org-contacts-db'.
(org-contacts-db): Use `org-contacts-db-need-updated?'.
2013-02-27 13:27:00 +01:00
8506223b27
Fix function declaration
2013-02-27 10:36:07 +01:00
0284bc9d4d
ob-lob.el (org-babel-lob-execute): Rename cache? to cache-p
...
* ob-lob.el (org-babel-lob-execute): Rename cache? to cache-p.
Thanks to Achim for pointing this.
2013-02-27 10:24:04 +01:00
7c8e854d9c
org.el (org-speed-command-activate): Don't activate speed commands within blocks
...
* org.el (org-speed-command-activate): Don't activate speed
commands within blocks.
Thanks to Sébastien Vauban for reporting this.
2013-02-27 10:22:20 +01:00
c086ea0832
Fix infloop when user provides a wrong value for `org-highlight-latex-and-related'
...
* lisp/org.el (org-do-latex-and-related): Fix infloop when user
provides a wrong value for `org-highlight-latex-and-related'. In
this case, `org-latex-and-related-regexp' is the empty string and
generates an infloop since matching it doesn't move point.
2013-02-27 10:00:40 +01:00
091bf02514
ob-core.el: Do not ask for confirmation if cached value is current
...
* ob-core.el (org-babel-execute-src-block): Do not run
`org-babel-confirm-evaluate´ if source block has a cache and the
cache value is current (there is no evaluation involved in this
case).
2013-02-27 09:44:27 +01:00
72cc2e99d8
Merge branch 'maint'
2013-02-27 08:46:36 +01:00
5f47cb2b9f
Fix commit 41882a99
...
Thanks to Tassilo Horn for reporting this.
2013-02-27 08:46:26 +01:00
43297f9ab7
Slideshow bugfixes and sync with ox-html function name changes.
...
* contrib/lisp/ox-deck.el: Default org-deck-directories to "./deck.js".
(org-deck-toc): Sync w/ ox-html name change (org-html--toc-text.)
(org-deck-inner-template): Remove duplicate toc generation code.
* contrib/lisp/ox-s5.el: Add inner template to fix duplicate content
div error.
(org-s5-toc): Sync w/ ox-html name change (org-html--toc-text) and
make toc entries static since s5 doesn't support deep linking.
2013-02-27 00:15:37 +01:00
86563e0119
org-element: OPTIONAL_TITLE becomes ALT_TITLE property
...
* lisp/org-element.el (org-element-headline-parser):
Rename :optional-title into :alt-title.
* lisp/ox.el (org-export-get-alt-title): Renamed from
`org-export-get-optional-title'.
* lisp/ox-ascii.el (org-ascii--build-title): Apply name change.
* lisp/ox-html.el (org-html--format-toc-headline): Apply name change.
* lisp/ox-latex.el (org-latex-headline): Apply name change.
* lisp/ox-texinfo.el (org-texinfo--get-node,
org-texinfo--generate-menu-items): Apply name change.
* testing/lisp/test-ox.el: Update tests.
* doc/org.texi (Table of contents): Update documentation.
2013-02-27 00:03:59 +01:00
bb45dd1074
Fix function declaration
2013-02-26 23:47:07 +01:00
677433d9b4
ox: Fix bug where properties read from setupfile overwrite previous properties
...
* lisp/ox.el (org-export--get-inbuffer-options): Remove an optional
argument. Rewrite function. Properties read from a setupfile do
not overwrite anymore previously computed properties.
(org-export-get-environment): Apply changes to previous function.
* lisp/org.el (org-create-formula--latex-header): Apply arity change
from `org-export--get-inbuffer-options'.
* testing/lisp/test-ox.el: Add test.
* testing/examples/setupfile.org: New file.
2013-02-26 23:35:36 +01:00
7604fe1e80
org-mew.el: Major enhancement
...
* org-mew.el (org-mew-inbox-folder, org-mew-use-id-db)
(org-mew-subject-alist, org-mew-capture-inbox-folders)
(org-mew-capture-guess-alist): New options.
(org-mew-store-link, org-mew-open): Rewrite.
(org-mew-folder-name, org-mew-follow-link)
(org-mew-folder-eixsts-p, org-mew-get-msgnum)
(org-mew-open-by-message-id, org-mew-search, org-mew-capture)
(org-mew-capture-guess-selection-keys): New functions.
2013-02-26 23:28:58 +01:00
4a40c215f9
Merge branch 'maint'
2013-02-26 23:17:42 +01:00
c30ba6f156
contrib/org-toc.el: add forward and back commands
...
These commands navigate among siblings in the outline, and are bound to
the ‘f’ and ‘b’ keys. Move the function for toggling toc-follow to ‘F’.
2013-02-26 23:17:30 +01:00
78c4199310
Merge branch 'maint'
...
Conflicts:
lisp/org.el
2013-02-26 22:45:41 +01:00
41882a99d3
Fix a longstanding issue with ellispsis on top of the window
...
* org.el (org-show-context): Remove useless catch. Make sure the
top of the window is a visible headline.
* org.el (org-activate-plain-links): Remove unused catch.
* org-macs.el (org-get-alist-option): Return nil, not (nil), so
that `org-show-context' DTRT.
Thanks to Samuel Wales for his patience in reporting this.
2013-02-26 22:45:04 +01:00
ebe0fbd6a8
Merge branch 'maint'
2013-02-26 22:02:25 +01:00
2b13d090d1
org.el (org-imenu-get-tree): Fix bug when matching against empty headlines
...
* org.el (org-imenu-get-tree): Fix bug when matching against empty
headlines.
Thanks to Jambunathan for reporting this.
2013-02-26 22:02:13 +01:00
5bdb84ba74
org.el: Add :version and :package-version to `orgstruct-heading-prefix-regexp'
2013-02-26 18:23:53 +01:00
3ee229dcd1
Merge branch 'master' of orgmode.org:org-mode
2013-02-26 18:21:40 +01:00
295b0ba5d1
Bump :version to "24.4" and add :package-version.
...
The options updated are those who won't be in Emacs 24.3.
2013-02-26 18:21:28 +01:00
Bastien Guerry
Nicolas Goaziou
Achim Gratz
Grégoire Jadi
Nicolas Richard
Rick Frankel
Tokuya Kameshima
Aaron Ecay