Commit Graph

13073 Commits

Author SHA1 Message Date
Bastien Guerry ea6be4d3a8 Merge branch 'maint' 2013-02-27 23:06:11 +01:00
Bastien Guerry 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
Bastien Guerry a002158b9f Merge branch 'maint' 2013-02-27 18:14:16 +01:00
Nicolas Richard 8e22aafe9a Fix b6b509b one more time. 2013-02-27 18:13:48 +01:00
Bastien Guerry 6cc600d074 Merge branch 'maint' 2013-02-27 17:28:38 +01:00
Bastien Guerry 01748861d4 Fix b6b509b again.
Thanks to Nicolas Richard for reporting this.
2013-02-27 17:28:33 +01:00
Bastien Guerry 692f053d80 Merge branch 'maint' 2013-02-27 14:49:46 +01:00
Bastien Guerry 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
Bastien Guerry 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
Bastien Guerry 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
Bastien Guerry 936f13c629 Merge branch 'master' of orgmode.org:org-mode 2013-02-27 13:27:56 +01:00
Grégoire Jadi 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
Grégoire Jadi 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
Grégoire Jadi 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
Nicolas Goaziou 8506223b27 Fix function declaration 2013-02-27 10:36:07 +01:00
Bastien Guerry 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
Bastien Guerry 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
Nicolas Goaziou 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
Achim Gratz 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
Bastien Guerry 72cc2e99d8 Merge branch 'maint' 2013-02-27 08:46:36 +01:00
Bastien Guerry 5f47cb2b9f Fix commit 41882a99
Thanks to Tassilo Horn for reporting this.
2013-02-27 08:46:26 +01:00
Rick Frankel 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
Nicolas Goaziou 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
Nicolas Goaziou bb45dd1074 Fix function declaration 2013-02-26 23:47:07 +01:00
Nicolas Goaziou 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
Tokuya Kameshima 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
Bastien Guerry 4a40c215f9 Merge branch 'maint' 2013-02-26 23:17:42 +01:00
Aaron Ecay 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
Bastien Guerry 78c4199310 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 22:45:41 +01:00
Bastien Guerry 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
Bastien Guerry ebe0fbd6a8 Merge branch 'maint' 2013-02-26 22:02:25 +01:00
Bastien Guerry 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
Bastien Guerry 5bdb84ba74 org.el: Add :version and :package-version to `orgstruct-heading-prefix-regexp' 2013-02-26 18:23:53 +01:00
Bastien Guerry 3ee229dcd1 Merge branch 'master' of orgmode.org:org-mode 2013-02-26 18:21:40 +01:00
Bastien Guerry 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 c7092b796d Remove :version keyword in non-emacs libraries 2013-02-26 17:57:13 +01:00
Bastien Guerry 751db690a0 contrib/babel/langs/ob-mathomatic.el: Delete whitespaces 2013-02-26 17:56:36 +01:00
Christopher Schmidt ff92e688dd org.el: Rebind structure-related variables within org-run-like-in-org-mode
* org.el (orgstruct-make-binding): Rebind structure-related
variables within org-run-like-in-org-mode.
2013-02-26 17:52:32 +01:00
Bastien Guerry f20ae92e88 Merge branch 'maint' 2013-02-26 16:28:36 +01:00
Bastien Guerry 2efbd0f138 org.el (org-overview): Stay on current line
* org.el (org-overview): Stay on current line.

This circumvents a bug in hide-sublevels which displays the
"..." ellipsis on top of the window when hiding levels that
are past the middle of the window---at least this is the
way I could understand the problem.

Thanks to Samuel Wales for reporting the problem, Arun Persaud and
William for creating reproducible recipes, Suvayu Ali, Nick Dokos
and Achim Gratz for further help.
2013-02-26 16:28:30 +01:00
Bastien Guerry 3ce1457546 Merge branch 'master' of orgmode.org:org-mode
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-02-26 16:14:40 +01:00
Bastien Guerry 76cca82fc1 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 16:14:03 +01:00
Bastien Guerry 95375260e5 Fix commit 83bebfd880 2013-02-26 16:13:39 +01:00
sabof 929b9f0a52 updated org-bullets to 0.2.2 2013-02-26 14:33:30 +00:00
Bastien Guerry 04fd44708a Merge branch 'maint' 2013-02-26 15:14:42 +01:00
Bastien Guerry 6042e93fa4 org.el (org-map-entries): Fix docstring
* org.el (org-map-entries): Fix docstring.

Thanks to Christopher Schmidt for reporting this.
2013-02-26 15:14:37 +01:00
Bastien Guerry 92d08a3efd Merge branch 'maint' 2013-02-26 14:37:15 +01:00
Bastien Guerry 889d671277 Fix typo. 2013-02-26 14:37:05 +01:00
Bastien Guerry de73b35909 Merge branch 'maint'
Conflicts:
	contrib/oldexp/org-exp.el
	lisp/org.el
2013-02-26 14:36:36 +01:00
Bastien Guerry 83bebfd880 Use `org-autoload' instead of `autoload'. 2013-02-26 14:35:25 +01:00