Commit Graph

6567 Commits

Author SHA1 Message Date
Bastien Guerry 4f4b817315 Merge branch 'hotfix' 2012-04-10 18:32:54 +02:00
Bastien Guerry d4ddcbb8b3 Revert "org.el: Include tags from `org-tag-alist' when completing with the TAB key."
This reverts commit 647396464d.
2012-04-10 18:20:04 +02:00
Bastien Guerry 1f80206166 Revert "org.el (org-fast-tag-selection): Fix an bug when listing tags for completion."
This reverts commit dca5af369c.
2012-04-10 18:10:30 +02:00
Bastien Guerry b05cbf73a0 Revert "org.el: Fix bug when gathering tag completion options."
This reverts commit e48d67ed6d.

This commit doesn't take care of tag groups.
2012-04-10 18:04:28 +02:00
Bastien Guerry 6c67af5627 Revert "org.el: Include `org-tag-alist' in the list for tag completions."
This reverts commit acc7a0b2bb.

See http://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
Bastien Guerry 4a6f76bab8 Merge branch 'hotfix' 2012-04-09 20:48:51 +02:00
Bastien Guerry 6144a83c5d Fix bug in using ̀org-cycle-level' in non-org modes.
* org.el (org-point-at-end-of-empty-headline): Only try to
match ̀org-todo-line-regexp' when the value is non-nil, e.g.
in non-org modes.

Thanks to Jambunathan for bringing this up.
2012-04-09 20:48:43 +02:00
Bastien Guerry 8ab0dedc4e Merge branch 'hotfix' 2012-04-09 20:06:21 +02:00
Bastien Guerry bf4d38b1fb org-table.el: Fix bug: make sure references to $0 are correctly handled.
* org-table.el (org-table-get-range): Fix bug: make sure
references to $0 are correctly handled.

Thanks to Nick Dokos for the suggestion.

This fixes the computation of values in this table:

| Record   |        Slope |    ConfLower |    ConfUpper |
|----------+--------------+--------------+--------------|
| GISTEMP  | 0.0173837600 | 0.0133209130 | 0.0214466060 |
| HadCrut3 | 0.0158602890 | 0.0118664610 | 0.0198541180 |

See this message/thread:
http://article.gmane.org/gmane.emacs.orgmode/54341
2012-04-09 20:04:22 +02:00
Bastien Guerry a1c3723b05 Merge branch 'hotfix' 2012-04-09 19:20:47 +02:00
Bastien Guerry e6f5c4f1be org.el: Prevent more fontification errors.
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent more
fontification errors.

Thanks to Henning Redestig for reporting this and to Nick Dokos for
digging further.
2012-04-09 19:20:37 +02:00
Bastien Guerry 17443083c0 org-table.el: Add two autoload cookies.
* org-table.el (org-table-recalculate-buffer-tables)
(org-table-iterate-buffer-tables): Add autoload cookie.

Thanks to Sébastien Vauban who suggested adding an autoload
cookie for `org-table-iterate-buffer-tables'.
2012-04-09 17:32:18 +02:00
Bastien Guerry c3cf7b1476 org.el: Exclude tables in src and example blocks.
* org.el (org-table-map-tables): Exclude tables in src and
example blocks.

Thansk to Sebastian for reporting this.
2012-04-09 17:27:32 +02:00
Bastien Guerry 1a8a39d2df Merge branch 'hotfix' 2012-04-09 16:57:19 +02:00
Matt Lundin 275905ed8d Fix hook docstring to reflect renaming of state to org-state.
* lisp/org.el: (org-after-todo-state-change-hook): Fix docstring to
  reflect name change of state to org-state.

The renamed variable can cause user hooks added to
org-after-todo-state-change-hook to break, so it is essential to have
the correct variable name in the docstring.
2012-04-09 16:57:11 +02:00
Matt Lundin 76503ed1b4 Fix org-bbdb anniversaries to work with the new BBDB
* org-bbdb.el (org-bbdb-anniv-extract-date, org-bbdb-make-anniv-hash):
  Fix org-bbdb anniversary functionality to accommodate bbdb 3.x.
  There are two major changes in bbdb 3.x that need to be taken into
  account.  The first is that `bbdb-split' reverses the order of its
  parameters in 3.x.  The second is that `bbdb-record-getprop' is
  replaced by bbdb-record-note in 3.x.
2012-04-09 12:53:08 +02:00
Bastien Guerry 14e4d7ece9 Merge branch 'hotfix' 2012-04-09 12:47:58 +02:00
Mike Sperber 8dda2fc1ee Fix bug ion `org-footnote-normalize'.
* org-footnote.el (org-footnote-normalize): Correctly pass keyword
arguments to `org-export-preprocess-string'.

TINYCHANGE
2012-04-09 12:47:44 +02:00
Mike Sperber 872a6f75c9 Only use `visual-line-mode' if it's bound.
* org.el (org-kill-line): Access `visual-line-mode' only if it's
bound.

TINYCHANGE
2012-04-09 12:46:23 +02:00
Nicolas Goaziou d6faea24d4 org-footnote: Fix bug related to sorting and folded view
* lisp/org-footnote.el (org-footnote-delete-definitions): Remove blank
  lines before the footnote definition instead of removing those after
  it.
* testing/lisp/test-org-footnote.el: Adapt tests.
2012-04-08 12:01:57 +02:00
Nicolas Goaziou 4019559ee2 org-footnote: Don't grab trailing blank lines in a footnote definition
* lisp/org-footnote.el (org-footnote-at-definition-p): Don't grab
  trailing blank lines in a footnote definition.
(org-footnote-delete-definitions): Remove both footnote definition and
trailing blank lines.
* testing/lisp/test-org-export.el (test-org-export/fuzzy-links): Fix
  a docstring.
* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
  Apply change to footnote definitions.
2012-04-06 19:14:51 +02:00
Bastien Guerry e6fdf918a4 Merge branch 'hotfix' 2012-04-06 10:53:24 +02:00
Bastien Guerry 35a5f069d8 Revert "Fix global dynamic variables in org-special-blocks.el."
This reverts commit 9054ba39d0.

The variable `line' is dynamically scoped in org-html and should
not be renamed here.
2012-04-06 10:52:34 +02:00
Stephen Eglen 76e7b07872 org-icalendar-timezone: doc string fix
* lisp/org-icalendar.el (org-icalendar-timezone): Fix typo and clarify
meaning.

Small typo (of -> or); clarify meaning of how timezone is calculated if
this variable is left as nil.

TINYCHANGE
2012-04-04 09:20:36 +02:00
Chris Gray 6fabe46cc7 Export: Allow for TOC generation if body-only is set
* lisp/org-html.el (org-export-as-html): Remove the check for
body-only in the code for generating tables of contents.

The docstring for org-export-as-html states that the body-only flag
removes everything outside the <body></body> tags (inclusive).  Since
the table of contents is inside these tags, it should be exported when
requested even if the body-only flag is set.
2012-04-04 08:54:14 +02:00
Bastien Guerry 187f77a20a org.el: Leave scheduled/deadline lines untouched when filling an adjacent paragraph.
* org.el (org-fill-paragraph): Leave scheduled/deadline lines
untouched when filling an adjacent paragraph.

Thanks to Stuart McLean for suggesting this.
2012-04-04 08:51:20 +02:00
Bastien Guerry ce06791334 Merge branch 'hotfix' 2012-04-04 08:28:45 +02:00
Bastien Guerry fc374109cd org.el: Prevent an error when trying to fontify beyond (point-max).
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent an
error when trying to fontify beyond (point-max).

TINYCHANGE

Thanks to Leo and Henning for reporting this, and to Nick Dokos
for providing the fix.
2012-04-04 08:28:17 +02:00
Bastien Guerry 72d911cfa2 Merge branch 'hotfix'
Conflicts:
	lisp/org-capture.el
	lisp/org-clock.el
2012-04-03 14:09:12 +02:00
Bastien Guerry e48d67ed6d org.el: Fix bug when gathering tag completion options.
* org.el (org-fast-tag-selection): Fix bug when gathering tag
completion options.

TINYCHANGE

Thanks to Noorul Islam K M for the patch.
2012-04-03 14:07:26 +02:00
Bastien Guerry c55604074d Add :version to org.el options. 2012-04-03 13:53:49 +02:00
Bastien Guerry 38e95cd088 Add :version to org-timer.el option. 2012-04-03 13:48:32 +02:00
Bastien Guerry 1d98ecf980 Add :version to org-src.el option. 2012-04-03 13:44:58 +02:00
Bastien Guerry 7a6b863a76 Add :version to ob-scheme.el option. 2012-04-03 13:44:15 +02:00
Bastien Guerry 6e2207fc0a Add :version to org-attach.el option. 2012-04-03 13:43:54 +02:00
Bastien Guerry a0d59ff6a3 Add :version to ob-plantuml.el option. 2012-04-03 13:43:36 +02:00
Bastien Guerry 8ca9c1b195 Add :version to org-capture.el options. 2012-04-03 13:43:06 +02:00
Bastien Guerry 117f14d345 Add :version to ob-exp.el option. 2012-04-03 13:41:59 +02:00
Bastien Guerry 7ffea1b7b9 Add :version to ob-js.el option. 2012-04-03 13:41:37 +02:00
Bastien Guerry 198f585350 Add :version to org-icalendar.el options. 2012-04-03 13:41:12 +02:00
Bastien Guerry ae4ba1b35c Add :version to org-agenda.el options. 2012-04-03 13:40:11 +02:00
Bastien Guerry 08ba2acbb3 Add :version to org-taskjuggler.el options. 2012-04-03 13:35:41 +02:00
Bastien Guerry e77534b8b4 Add :version to org-exp-blocks.el option. 2012-04-03 13:33:59 +02:00
Bastien Guerry c19f5c3c0d Add :version to org-list.el options. 2012-04-03 13:32:23 +02:00
Bastien Guerry cbd1a12295 Add :version to org-archive.el options. 2012-04-03 13:31:35 +02:00
Bastien Guerry db138ea1f9 Add :version to org-wl.el options. 2012-04-03 13:31:06 +02:00
Bastien Guerry 5bb982881a Add :version to ob-lisp.el option. 2012-04-03 13:30:07 +02:00
Bastien Guerry e97aec45a4 Add :version to org-gnus.el option. 2012-04-03 13:29:41 +02:00
Bastien Guerry 346dc97753 Add :version to ob-picolisp.el option. 2012-04-03 13:29:15 +02:00
Bastien Guerry 5e3cf1bd26 Add :version to org-entities.el options. 2012-04-03 13:28:51 +02:00
Bastien Guerry b846a86cfa Add :version to ob.el options. 2012-04-03 13:28:23 +02:00
Bastien Guerry bdd922e3f7 Add :version to org-clock.el options. 2012-04-03 13:27:34 +02:00
Bastien Guerry d5220e906f Add :version to org-exp.el options. 2012-04-03 13:26:05 +02:00
Bastien Guerry 8275726e7e Add :version to org-habit.el options. 2012-04-03 13:24:40 +02:00
Bastien Guerry cd2f395416 Add :version to org-table.el options. 2012-04-03 13:24:12 +02:00
Bastien Guerry 2894045bba Add :version to org-docbook.el options. 2012-04-03 13:23:15 +02:00
Bastien Guerry 18a0b31022 Add :version to org-inlinetask.el option. 2012-04-03 13:22:38 +02:00
Bastien Guerry 4b849731f3 Add :version to org-faces.el options. 2012-04-03 13:22:15 +02:00
Bastien Guerry b74be30199 Add :version to org-bibtex.el options. 2012-04-03 13:21:04 +02:00
Bastien Guerry b0c26bd967 Add :version to org-html.el options. 2012-04-03 13:17:00 +02:00
Bastien Guerry 1755b53625 Add :version to ob-tangle.el options. 2012-04-03 13:14:06 +02:00
Bastien Guerry f117fcb98b Add :version to org-mobile.el options. 2012-04-03 13:12:47 +02:00
Bastien Guerry a7076d693d Add :version to ob-lob.el option. 2012-04-03 13:11:32 +02:00
Bastien Guerry d5579cb431 Add :version to org-publish.el options. 2012-04-03 13:10:55 +02:00
Bastien Guerry b2500c21b1 Add :version to org-freemind.el option. 2012-04-03 13:09:15 +02:00
Bastien Guerry 9b40893709 Add :version to org-beamer.el options. 2012-04-03 13:08:32 +02:00
Bastien Guerry 6d1ec16a5a Add :version to org-ctags.el option. 2012-04-03 13:05:23 +02:00
Bastien Guerry 6c70ecffa7 Fix previous merge: add :version back to `org-use-effective-time'. 2012-04-03 09:48:48 +02:00
Bastien Guerry 2da8a36229 Merge branch 'hotfix'
Conflicts:
	lisp/org.el
2012-04-03 09:46:34 +02:00
Bastien Guerry a8c6802345 org.el (org-use-effective-time): Fix group and type.
* org.el (org-use-effective-time): Fix group and type.
2012-04-03 09:45:42 +02:00
Bastien Guerry bbfd7881be org.el (org-todo): Fix regression: rename `state' to `org-state'.
* org.el (org-todo): Fix regression: rename `state' to
`org-state'.
2012-04-03 09:43:20 +02:00
Bastien Guerry 3b04635542 Small doc improvement about HTML pre/postamble.
* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.

* org.texi (HTML preamble and postamble): Small doc improvement.

Thanks to Zachary Jones who asked for this.
2012-04-02 23:28:52 +02:00
Bastien Guerry 11a4749353 Merge branch 'hotfix-7.8.06' 2012-04-02 23:05:19 +02:00
Bastien Guerry be07df1a49 org.el (org-todo): Fix regression: rename `state' to `org-state'.
* org.el (org-todo): Fix regression: rename `state' to
`org-state'.
2012-04-02 23:05:06 +02:00
Bastien Guerry c187c512af Merge branch 'hotfix-7.8.06' 2012-04-02 17:58:01 +02:00
Bastien Guerry 60b6f60dfe Bump to version number 7.8.08. 2012-04-02 17:57:49 +02:00
Bastien Guerry 7d64e883b0 org-clock.el (org-show-notification): Use `fboundp' instead of `featurep' and the additional `require'.
* org-clock.el (org-show-notification): Use `fboundp' instead
of `featurep' and the additional `require'.

Thanks to Peter Münster for reporting this.
2012-04-02 16:52:16 +02:00
Bastien Guerry a5774431b3 Merge branch 'hotfix-7.8.06' 2012-04-02 16:46:02 +02:00
Bastien Guerry 7ea4efd411 Don't rename `entry' to `org-entry'.
This issue should be handled more carefully.
2012-04-02 16:45:47 +02:00
Bastien Guerry 88b2228297 Merge branch 'hotfix-7.8.06' 2012-04-02 11:27:48 +02:00
Bastien Guerry e74121b0cc Fix bug in `org-todo'.
s/state/org-state.
2012-04-02 11:27:41 +02:00
Yury Bulka 9d6e554e1e org-exp.el: Add ukrainian language. 2012-04-02 10:01:23 +02:00
Bastien Guerry 42d60368a3 Merge branch 'hotfix-7.8.06' 2012-04-02 08:07:57 +02:00
Bastien Guerry 3658686f59 Fix name of dynamically bound variable in org-clock.el. 2012-04-02 08:07:52 +02:00
Bastien Guerry 5651adb133 Merge branch 'hotfix-7.8.06' 2012-04-02 07:52:09 +02:00
Bastien Guerry ccd84a9f63 Fix spelling mistakes.
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00
Bastien Guerry 388ccbc435 Fix leftover from wrong merge. 2012-04-02 07:31:06 +02:00
Bastien Guerry e3913a2ab5 Merge branch 'hotfix-7.8.06' 2012-04-02 00:53:37 +02:00
Bastien Guerry 5c38bf0ef7 Fix copyright and authors lines. 2012-04-02 00:53:28 +02:00
Bastien Guerry 3306fc1040 Merge branch 'hotfix-7.8.06' 2012-04-01 22:25:03 +02:00
Bastien Guerry 1e62a6e446 Add a declaration line in org-special-blocks.el 2012-04-01 22:24:57 +02:00
Bastien Guerry 5d4e5cbe41 Merge branch 'hotfix-7.8.06' 2012-04-01 22:12:16 +02:00
Bastien Guerry 68d8b10c9e Fix copyright and author lines. 2012-04-01 22:12:07 +02:00
Bastien Guerry b891d7a0db Merge branch 'master' of orgmode.org:org-mode 2012-04-01 21:52:38 +02:00
Bastien Guerry 63fdc375a3 Merge branch 'hotfix-7.8.06'
Conflicts:
	lisp/ob-exp.el
2012-04-01 21:52:01 +02:00
Bastien Guerry 0335acb394 Fix copyright declaration in ob-fortran.el. 2012-04-01 21:48:15 +02:00
Bastien Guerry 560cbe1c38 org.el: Fix bug in `org-todo'.
* org.el (org-todo): Fix bug in `org-todo'.

Thanks to Moritz Ulrich for this patch.
2012-04-01 20:35:21 +02:00
Eric Schulte 829285e56f ensure noweb expanded body is used on export
* lisp/ob-exp.el (org-babel-exp-results): Ensure noweb expanded body
  is used on export.
2012-04-01 12:21:13 -04:00
Eric Schulte 670c7f31cc simplified implementation of :file-desc header argument
This will no longer insert the value of the :file header argument as
  the description if the description is left blank (as this changes
  the meaning of the :file header argument).

  The desc handling logic is moved to the `org-babel-result-to-file'
  function.

* lisp/ob.el (org-babel-result-to-file): New optional description
  argument.
  (org-babel-insert-result): Moved description logic to another
  function.
2012-03-31 14:59:26 -04:00
Eric Schulte 59800b2816 change name of filelinkdescr to file-desc
* lisp/ob.el (org-babel-insert-result): Change name of filelinkdescr
  to file-desc.
  (org-babel-common-header-args-w-values): Change name of
  filelinkdescr to file-desc.
2012-03-31 14:30:05 -04:00
Andreas Leha a58a4f0ad4 new source block header argument :filelinkdescr 2012-03-31 14:30:04 -04:00
Eric Schulte e5dc30f238 add .exe to the end of compiled C files on windows
Thanks to Richard Stanton for pointing out this problem and
  suggesting the fix.

* lisp/ob-C.el (org-babel-C-execute): Add .exe to the end of compiled
  C files on windows.
2012-03-31 13:03:49 -04:00
Eric Schulte da0e6fbde1 add .exe to the end of compiled C files on windows
Thanks to Richard Stanton for pointing out this problem and
  suggesting the fix.

* lisp/ob-C.el (org-babel-C-execute): Add .exe to the end of compiled
  C files on windows.
2012-03-31 13:03:31 -04:00
Eric Schulte 90336ceb49 Fixed bug in export of Org-mode code blocks
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
  Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-parse-inline-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-strip-protective-commas): Now accepts a language
  argument.

Conflicts:

	lisp/ob-exp.el
2012-03-31 12:55:23 -04:00
Eric Schulte d6ddb59203 Fixed bug in export of Org-mode code blocks
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
  Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-parse-inline-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-strip-protective-commas): Now accepts a language
  argument.
2012-03-31 12:49:07 -04:00
Eric Schulte ae1be39fad Revert "add the local directory to the library search path for C/C++ block compilation"
This reverts commit 4202665f5b.
2012-03-31 11:40:14 -04:00
Eric Schulte 18c68c13aa Revert "add the local directory to the library search path for C/C++ block compilation"
This reverts commit 4202665f5b.

The buffer file name is not always available (e.g., during export), so
it should not be relied upon, rather a header argument should be used.
2012-03-31 11:39:13 -04:00
Eric Schulte cb77b49774 separate noweb handling for code and results on export
* lisp/ob-exp.el (org-babel-exp-src-block): Remove noweb handling from
  the top level.
  (org-babel-exp-code): Noweb handling for code export.
  (org-babel-exp-results): Noweb handling for results export.
2012-03-31 11:28:37 -04:00
Bastien Guerry 61106491b3 Merge branch 'hotfix-7.8.06' 2012-03-31 11:25:28 +02:00
Bastien Guerry a3ca0e43e5 Update version to 7.8.07 from hotfix. 2012-03-31 11:24:57 +02:00
Bastien Guerry 22427a66ff org.el (org-read-date): Fix bug from the last merge. 2012-03-31 11:09:25 +02:00
Bastien Guerry 967783215b Merge branch 'hotfix-7.8.06'
Conflicts:
	lisp/org.el
2012-03-31 11:04:40 +02:00
Bastien Guerry dca5af369c org.el (org-fast-tag-selection): Fix an bug when listing tags for completion.
* org.el (org-fast-tag-selection): Fix an bug when listing
tags for completion.

Thanks to Mike McLean for reporting this.
2012-03-31 11:02:52 +02:00
Bastien Guerry bc5b93c6fe Merge branch 'fix-compiler-warnings' into hotfix-7.8.06 2012-03-31 11:01:31 +02:00
Ilya Shlyakhter 39baf67b35 Deleting properties: Fixed bug that left blank lines after deleting properties
* lisp/org.el (org-delete-property-globally): Fixed a bug that left blank line
  in place of the property, instead of removing the line.

TINYCHANGE
2012-03-31 10:36:49 +02:00
Bastien Guerry 6cbf1f4172 Fix global dynamic variables in org-agenda.el and org.el.
Thanks to Martyn Jago for preliminary work on this.
2012-03-30 23:04:55 +02:00
Bastien Guerry b689cbfb6c Fix global dynamic variables in org-table.el.
Thanks to Martyn Jago for this patch.
2012-03-30 22:47:18 +02:00
Bastien Guerry 9054ba39d0 Fix global dynamic variables in org-special-blocks.el.
Thanks to Martyn Jago for this patch.
2012-03-30 22:44:16 +02:00
Bastien Guerry b46fa17a97 Fix global dynamic variables in org-clock.el.
Thanks to Martyn Jago for this patch.
2012-03-30 22:43:03 +02:00
Bastien Guerry 61aabd7f85 ob-maxima.el: Add group information to a defcustom.
* ob-maxima.el (org-babel-maxima-command): Add group
information to the defcustom.
2012-03-30 22:36:52 +02:00
Jambunathan K 8a02f48547 org-odt.el: Consider short captions not as org text but as plain text
* lisp/org-lparse.el (org-lparse-insert-org-table): Consider
short caption as plain text and not as org text.
* lisp/org-odt.el (org-export-odt-format-formula)
(org-export-odt-format-image): ditto.

Fixes earlier checkin.  See
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg01212.html

Handling of short captions is only a convenience feature.

From within LibreOffice one can always create an "unprotected"
editable index and later manually delete unwanted index entries (for
example, delete uncaptioned entries which are given automatic names)
or modify existing entries (for example, fix long captions to their
short versions).
2012-03-31 02:03:10 +05:30
Bastien Guerry 08d9b46622 Fix global dynamic variables prefixes in org-bibtex.el.
Thanks to Martyn Jago for the patch.
2012-03-30 21:48:58 +02:00
Bastien Guerry c24fa194a6 Fix global dynamic variables prefixes in org-mouse.el.
Thanks to Martyn Jago for the patch.
2012-03-30 21:48:15 +02:00
Bastien Guerry fcf13e02aa Fix global dynamic variables prefixes in org-beamer.el.
Thanks to Martyn Jago for the patch.
2012-03-30 21:46:17 +02:00
Jambunathan K 67694297fa org-odt.el: Honor short caption for table, figure etc
* lisp/org-odt.el (org-odt-begin-table)
(org-export-odt-format-formula, org-export-odt-format-image)
(org-odt-format-entity): Handle short caption.
* lisp/org-lparse.el (org-lparse-insert-org-table)
(org-lparse-insert-list-table, org-lparse-insert-table-table):
Ditto.

Handle short caption for tables, figures and formulae.
  #+CAPTION: [Caption for index entry]{Regular caption.}

Fix for bug
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg01169.html
2012-03-30 00:52:02 +05:30
Bastien Guerry 22bfdc41e4 Merge branch 'hotfix-7.8.06' 2012-03-29 12:43:09 +02:00
Bastien Guerry f9cea3ea1e org.el: Use `buffer-face-mode' to remap the 'default face to 'org-default.
* org.el (org-mode): Use `buffer-face-mode' to remap the
'default face to 'org-default.

Thanks to Du Yanning for raising an issue that this patch circumvents.
2012-03-29 12:42:35 +02:00
Bastien Guerry 57f8bbf7ea Merge branch 'hotfix-7.8.06' 2012-03-28 02:05:43 +02:00
Bastien Guerry 8ab92f8b55 Delete trailing whitespaces in core files. 2012-03-28 02:05:36 +02:00
Bastien Guerry d0a7d7cddd Merge branch 'hotfix-7.8.06' 2012-03-28 01:44:56 +02:00
Bastien Guerry ad3f9322ad org-ascii.el: Fix escaping of underscores in links.
* org-ascii.el (org-export-as-ascii): Fix escaping of
underscores in links.

Thanks to Daniel Dehennin who reported this problem.
2012-03-28 01:44:41 +02:00
Bastien Guerry d562648f5e Merge branch 'hotfix-7.8.06' 2012-03-28 01:24:09 +02:00
Bastien Guerry 6b83267f9e Fix missing parenthesis. *Blush*. 2012-03-28 01:24:02 +02:00
Bastien Guerry d0ae7ab479 Merge branch 'hotfix-7.8.06' 2012-03-28 01:04:43 +02:00
Bastien Guerry 165cb4610a Fix bug in the menu and a small change to org-beamer.
* org.el: Prevent a bug while defining the menu by requiring
`org-beamer' when necessary.

* org-beamer.el (org-insert-beamer-options-template): Make the
parameter optional since the interactive call defines it.
2012-03-28 01:04:36 +02:00
Bastien Guerry 7686a81c14 New option to format the total time cells.
* org-clock.el (org-clock-in-prepare-hook): New option to
format the total time cells.
(org-clocktable-write-default): Use the new option.
2012-03-28 00:49:55 +02:00
Bastien Guerry 122f5fd5b5 Merge branch 'hotfix-7.8.06' 2012-03-27 23:51:00 +02:00
Bastien Guerry 8d74c84962 Use `backward-delete-char' instead of `delete-backward-char' to silent compiler.
* org-table.el (orgtbl-self-insert-command): Use
`backward-delete-char' instead of `delete-backward-char' as
this last command gets caught by the compiler which says to
not use it in programs.  `backward-delete-char' is just an
alias for `delete-backward-char' which is internally remapped
to `org-delete-backward-char' for optimization purpose.

* org.el (org-self-insert-command): Ditto.
2012-03-27 23:50:52 +02:00
Bastien Guerry 2a94e997f4 Revert "Use `delete-char' instead of `delete-backward-char'"
This reverts commit 00040e708c.

See this email by Achim Gratz:
http://comments.gmane.org/gmane.emacs.orgmode/52717
2012-03-27 23:24:33 +02:00
Bastien Guerry bd7913c294 Merge branch 'hotfix-7.8.06' 2012-03-27 23:08:52 +02:00
Bastien Guerry 83af2107de org-latex.el: Bugfix: when `org-export-latex-low-levels' is nil, do not export low levels.
* org-latex.el (org-export-latex-subcontent): Bugfix: when
`org-export-latex-low-levels' is nil, do not export low levels.

Thanks to Nick Dokos for spotting this.
2012-03-27 23:08:41 +02:00
Bastien Guerry 30a813c57b Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-27 17:44:35 +02:00
Eric Schulte a4efcc3a39 Merge branch 'origin-hotfix-7.8.06' 2012-03-27 07:12:17 -04:00
Eric Schulte dbe4bf805f fix bug in indented wrapped results insertion
* lisp/ob.el (org-babel-insert-result): Fix bug in indented wrapped
  results insertion.
* testing/lisp/test-ob.el (test-ob/org-babel-results-indented-wrap):
  Test correct indentation behavior.
2012-03-27 07:09:22 -04:00
Bastien Guerry 3d5a3474ca Merge branch 'hotfix-7.8.06' 2012-03-27 12:31:03 +02:00
Bastien Guerry acc7a0b2bb org.el: Include `org-tag-alist' in the list for tag completions.
* org.el (org-set-tags): Include `org-tag-alist' in the list
of possible completions, even when there are tags defined in
the buffer.

Thanks to Mike McLean for reporting this.
2012-03-27 12:30:57 +02:00
Bastien Guerry c760f9be7e Merge branch 'hotfix-7.8.06' 2012-03-27 12:10:31 +02:00
Bastien Guerry d069301060 org.el: Don't add a column when there is only one tag offered for completion.
* org.el (org-set-tags): Don't add a column when there is only
one tag offered for completion.
2012-03-27 12:10:14 +02:00
Bastien Guerry 647396464d org.el: Include tags from `org-tag-alist' when completing with the TAB key.
* org.el (org-fast-tag-selection): Include tags from
`org-tag-alist' when completing with the TAB key.

Thanks to Mike McLean for reporting this problem.
2012-03-27 12:09:02 +02:00
Bastien Guerry ef0ab2fc4c Merge branch 'hotfix-7.8.06' 2012-03-26 23:02:35 +02:00
Bastien Guerry f2598e41ac Fix commit 6632ea. 2012-03-26 23:02:28 +02:00
Bastien Guerry 2ae78a5dab Merge branch 'hotfix-7.8.06' 2012-03-26 22:56:12 +02:00
Bastien Guerry 4637de726c Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline."
This reverts commit 6632ea95d3.
2012-03-26 22:56:02 +02:00
Bastien Guerry e7a3dd3750 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-26 22:40:46 +02:00
Bastien Guerry 5c54e1eeda Merge branch 'hotfix-7.8.06' 2012-03-26 22:28:49 +02:00
Shoji Nishimura e92ae2e762 org.el (org-display-inline-images): Honor the ̀beg' parameter.
* org.el (org-display-inline-images): Honor the ̀beg' parameter.

TINYCHANGE
2012-03-26 22:28:16 +02:00
Bastien Guerry 6632ea95d3 org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline.
* org-latex.el (org-export-latex-subcontent): Don't insert a
linebreak when itemizing a subtree that is just a headline.

Thanks to Richard Stanton for spotting this.
2012-03-26 19:40:05 +02:00
Eric Schulte 2aa20d6f44 Merge branch 'origin-hotfix-7.8.06' 2012-03-26 13:35:11 -04:00
Bastien Guerry 959ed59861 Merge branch 'hotfix-7.8.06' 2012-03-26 19:55:18 +02:00
Eric Schulte 665fba0c2c removed extra []s when parsing inline call_foo lines
* lisp/ob-lob.el (org-babel-lob-get-info): Removed extra []s when
  parsing inline call_foo lines.
2012-03-26 13:34:19 -04:00
Bastien Guerry 50e766a79b Declare function `org-string-nw-p'. 2012-03-26 17:21:44 +02:00
Eric Schulte 2ef04872ed Merge branch 'origin-hotfix-7.8.06' 2012-03-26 07:45:54 -04:00
Eric Schulte ab76b8f29e The maxima command used should be configurable--defaults to maxima-command if defined
* lisp/ob-maxima.el (org-babel-maxima-command): The maxima command
  used should be configurable (defaults to maxima-command if defined).
  (org-babel-execute:maxima): The maxima command used should be
  configurable (defaults to maxima-command if defined).
2012-03-26 07:45:40 -04:00
Eric Schulte c077d5714c Merge branch 'origin-hotfix-7.8.06' 2012-03-26 07:39:29 -04:00
Eric Schulte 4202665f5b add the local directory to the library search path for C/C++ block compilation
* lisp/ob-C.el (org-babel-C-execute): Add the local directory to the
  library search path for C/C++ block compilation.

This patch was submitted to the list by Daimrod.
2012-03-26 07:39:14 -04:00
Eric Schulte 7b172ade00 Merge branch 'origin-hotfix-7.8.06' 2012-03-26 07:20:37 -04:00
Eric Schulte 1ca7485a88 don't truncate results name on call line execution
* lisp/ob.el (org-babel-where-is-src-block-result): Don't truncate
  results name on call line execution.
2012-03-26 07:18:31 -04:00
Bastien Guerry 9a8ba56d9e Merge branch 'hotfix-7.8.06' 2012-03-26 10:28:39 +02:00
Bastien Guerry 76b2943545 Clean up test left over. 2012-03-26 10:27:12 +02:00
Bastien Guerry 3df72679bb Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-25 01:51:11 +01:00
Bastien Guerry 32bbca6be7 Merge branch 'master' of orgmode.org:org-mode 2012-03-25 01:49:58 +01:00
Bastien Guerry ba813ffd20 Merge branch 'hotfix-7.8.06' 2012-03-25 01:49:28 +01:00
Ilya Shlyakhter e8337f6920 Colview bugfix: A headline with just a TODO keyword and blank headline content would crash
* lisp/org-colview.el (org-columns-cleanup-item): Handle case of empty
headline

* lisp/org-colview-xemacs.el (org-columns-cleanup-item): Handle case of empty
headline

TINYCHANGE
2012-03-25 01:49:14 +01:00
Nicolas Goaziou 6427c6aeaa Merge branch 'hotfix-7.8.06' 2012-03-24 20:35:31 +01:00
Nicolas Goaziou 6ad53828cc org-footnote: Fix LaTeX export error when a src block produces fake footnotes
* lisp/org-footnote.el (org-footnote-delete-definitions): Fix LaTeX
  export error when a src block produces fake footnotes.
2012-03-24 20:34:41 +01:00
Bastien Guerry ec65badbaa Removing duplicate key definitions for 'pcomplete.
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9809 for details.
2012-03-23 23:36:14 +01:00
Bastien Guerry d6a79b7ae9 Removing duplicate key definitions for 'pcomplete.
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9809 for details.
2012-03-23 23:29:45 +01:00
Bastien Guerry 2bb3a09d53 Merge branch 'hotfix-7.8.06' 2012-03-23 22:44:04 +01:00
Bastien Guerry ce1f368013 org.el (org-read-date): Don't mention `parse-time-weekdays' and `parse-time-months' in the docstring.
* org.el (org-read-date): Don't mention `parse-time-weekdays'
and `parse-time-months' in the docstring.

This problem has been reported by Michael Heerdegen -- see
Emacs bug#11042 against 24.0.94.
2012-03-23 22:43:56 +01:00
Bastien Guerry 6e276f3b45 Merge branch 'hotfix-7.8.06' 2012-03-23 22:14:22 +01:00
Bastien Guerry 86643eba4f org-agenda.el (org-agenda-filter-apply): Bugfix: Add a missing let binding.
* org-agenda.el (org-agenda-filter-apply): Bugfix: Add let
binding.
2012-03-23 22:13:59 +01:00
Bastien Guerry 5197a7c8fb Silent compiler by moving `org-odt-entity-labels-alist' up in the file. 2012-03-23 22:12:07 +01:00
Bastien Guerry 8dc05ad5f4 org-colview.el: Also consider inline tasks when computing the sum.
* org-colview.el (org-columns-compute): Also consider inline
tasks when computing the sum.

TINYCHANGE

Thanks to Myles English for spotting this and for his patch,
this one is a slightly modified version of his.
2012-03-23 22:04:36 +01:00
Bastien Guerry 1a81418320 Merge branch 'hotfix-7.8.06' 2012-03-23 14:07:13 +01:00
Thomas Morgan fe7d69bdea org-habit.el: Fix alignment of consistency graph in filtered agenda view.
* org-habit.el (org-habit-insert-consistency-graphs): Fix
alignment of consistency graph in filtered agenda view.

TINYCHANGE
2012-03-23 14:06:45 +01:00
Bastien Guerry c2c0a43a60 Merge branch 'hotfix-7.8.06' 2012-03-23 13:55:56 +01:00
Bastien Guerry 88d6292893 org-latex.el: Fix bug in setting the export directory according to the LaTeX options.
* org-latex.el (org-export-as-latex): Fix bug in setting the
export directory according to the LaTeX options.

Thanks to A. Major for reporting this and to Christian Moe for suggesting a
fix.
2012-03-23 13:55:50 +01:00
Bastien Guerry 3ccefc9fc0 Merge branch 'hotfix-7.8.06' 2012-03-23 13:45:26 +01:00
K.Nagashima 5bb4aabac7 org.el (org-show-subtree): Make interactive.
* org.el (org-show-subtree): Make interactive.

TINYCHANGE
2012-03-23 13:45:03 +01:00
Bastien Guerry eb7f7159c9 Merge branch 'hotfix-7.8.06' 2012-03-23 13:42:29 +01:00
Ilya Shlyakhter 532a1ac40a Tags/properties matcher: Fixed issues with todo-only matches
lisp/org.el (org-scan-tags): Require todo-only argument, and document
that it should be the same one set by make-org-tags-matcher.
Fix documentation to explain that todo-only is really
not-done-todo-only.

(org-make-tags-matcher): If todo part of matcher starts with /!,
matcher now always checks that the TODO keyword is present and
is a not-done state.  This matters e.g. for org-map-entries
which unlike org-scan-tags does not do its own separate todo-only
filtering.  Added docs to explain matcher dependencies.

(org-map-entries): Make sure todo-only is correctly passed from
org-make-tags-matcher to org-scan-tags.

* lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only
does not leak when it is set by make-org-tags-macher.

* lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make
sure todo-only is correctly passed from org-make-tags-matcher to
org-scan-tags.

* contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only
is correctly passed from org-make-tags-matcher to org-scan-tags.
2012-03-23 13:42:06 +01:00
Max Mikhanosha 013d9f03f2 When an agenda item with 'extra property (such as Scheduled 2x)
is redisplayed, it was losing the 'extra property on redisplay

* lisp/org-agenda.el (org-agenda-change-all-lines): move accessing of
'extra text property outside of with-current-buffer for original
buffer
2012-03-22 15:02:54 -04:00
Bastien Guerry 0b74959587 Merge branch 'hotfix-7.8.06' 2012-03-22 01:39:56 +01:00
Bastien Guerry 6ba1d35f64 Don't try to hide drawers within subtrees, it slows cycling down.
* org.el (org-cycle-internal-local): Don't try to hide drawers
within subtrees in this function, it slows cycling down.

This comments the change made in commit
bb28480169

Thanks to Marcel Van der Boom for reporting this.
2012-03-22 01:39:51 +01:00
Bastien Guerry b54ad29fa3 Merge branch 'hotfix-7.8.06' 2012-03-22 01:19:24 +01:00
Bastien Guerry 2fa0aa69ea org-agenda.el: Fix incorrect custom option definition.
* org-agenda.el (org-agenda-custom-commands-local-options):
Fix incorrect custom option definition.

Thanks to Joe Vornehm Jr. for this patch.
See http://patchwork.newartisans.com/patch/1231/
2012-03-22 01:19:03 +01:00
Bastien Guerry 138fd8e474 Merge branch 'hotfix-7.8.06' 2012-03-21 23:57:36 +01:00
Bastien Guerry 652e5e0ecf Bugfix: use the date as the value for the ITEM column when displaying a summary.
* org-colview.el (org-columns-display-here): Bugfix: use the date as the
value for the ITEM column when displaying a summary.

Thanks to Rasmus Rempling for reporting this and to Nick Dokos for digging
further.
2012-03-21 23:57:29 +01:00
Bastien Guerry 5f7d9bffd7 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-21 23:50:37 +01:00
Bastien Guerry 72ca335e6c Merge branch 'master' of orgmode.org:org-mode 2012-03-21 15:26:55 +01:00