Commit Graph

6379 Commits

Author SHA1 Message Date
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