Commit Graph

7482 Commits

Author SHA1 Message Date
Nicolas Goaziou 95c305490e org-element: Add :parent text property to strings in parse tree
* lisp/org-element.el (org-element-property): Access to text
  properties when argument is a string.
(org-element-put-property): Correctly set property when target is
a string.
(org-element-adopt-elements): Also put :parent properties on strings.
* testing/lisp/test-org-element.el: Add test.
2012-10-27 11:42:30 +02:00
Bastien Guerry 7221b88f6d Merge branch 'maint' 2012-10-27 09:39:12 +02:00
Erik Hetzner dda453eb7e org.el (org-log-into-drawer): Honor the nil value for the :LOG_INTO_DRAWER: property.
* org.el (org-log-into-drawer): Honor the nil value for the
:LOG_INTO_DRAWER: property.

TINYCHANGE
2012-10-27 09:37:54 +02:00
Bastien Guerry b0eeb260ef Merge branch 'maint' 2012-10-27 09:25:18 +02:00
Bastien Guerry b1f20bde27 org-install.el: Enhance warning
* org-install.el: Enhance warning.

Thanks to Simon Thum for requesting this.
2012-10-27 09:25:14 +02:00
Bastien Guerry 8866f86624 Merge branch 'maint' 2012-10-26 15:12:02 +02:00
Bastien Guerry 7a9d345707 Remove the obsolete argument `hidden' from `org-export-as-latex'.
* org-latex.el (org-export-as-latex): Remove obsolete argument
`hidden'.  Also fix the docstring: using 'string as the value
for `to-buffer' outputs a string with no LaTeX header.
(org-export-as-latex-batch)
(org-export-as-latex-to-buffer, org-export-region-as-latex)
(org-export-as-pdf): Don't use the obsoleted argument.

* ob-haskell.el (org-export-as-latex): Don't use the obsoleted
argument `hidden'.
2012-10-26 15:05:10 +02:00
Bastien Guerry 116c09053f Run `bookmark-set' within `with-demoted-errors'.
* org.el (org-refile): Run within `with-demoted-errors' so
that a corrupted bookmark file does not stop the refile
process.

* org-capture.el (org-capture-bookmark-last-stored-position):
Ditto for the capture process.

Note: we do not prevent such errors in org-remember.el as this
libary will be obsoleted for the next major release of Org.
2012-10-26 14:55:08 +02:00
Myles English db8e06147a Clocking: Move to task before calling org-clock-in-prepare-hook
* lisp/org-clock.el (org-clock-in): Moved the call to
org-clock-in-prepare-hook until the task's properties
can be accessed.

The problem was when using a function to add an effort
property via the hook, it would not recognise an existing
effort property when called with the prefix (C-u C-c C-x C-i)
with the point at a place other than at the task.

TINYCHANGE
2012-10-26 14:47:23 +02:00
Toby S. Cubitt 58551f1e5f Fix bug in org-agenda-diary-sexp-prefix
* lisp/org-agenda.el (org-agenda-get-sexps): Reset `extra' to nil at
beginning of re-search-forward loop, otherwise next iteration picks up
`extra' value from previous entry.
2012-10-26 14:46:24 +02:00
Achim Gratz b5aded108d Merge branch 'maint' 2012-10-26 08:18:59 +02:00
Achim Gratz 73cfba486b ob-ditaa: needs to require org-compat for org-find-library-dir
* lisp/ob-ditaa.el: Needs to (require 'org-compat) for org-find-library-dir.
2012-10-26 08:18:07 +02:00
Nicolas Goaziou 78c5838e4e ob-exp: Escape code when re-creating a src blocks
* lisp/ob-exp.el (org-babel-exp-code): Escape code when re-creating
  a src blocks.
2012-10-25 16:24:48 +02:00
Bastien Guerry 44ad106d69 Merge branch 'maint' 2012-10-25 10:56:47 +02:00
Caio Tiago Oliveira de7766f4b0 Babel: add results value support to Scala
* lisp/ob-scala.el (org-babel-scala-wrapper-method): Use a Scala
block enclosing the submitted code.

The string representing an well formed block was not an Scala code. I
put the string from the user into an block, surrounded by an call to
replace the default output stream.

TINYCHANGE
2012-10-25 10:56:24 +02:00
Bastien Guerry 5c171435ba Merge branch 'maint' 2012-10-25 10:49:35 +02:00
Bastien Guerry aba9e2b94d org-src.el (org-edit-src-exit): Fix bug when saving an empty source buffer
* org-src.el (org-edit-src-exit): Fix bug when saving an empty
source buffer.

Thanks to Hsiu-Khuern Tang for reporting this.
2012-10-25 10:48:33 +02:00
Bastien Guerry 53f7880d6f Merge branch 'maint' 2012-10-24 15:56:11 +02:00
Bastien Guerry c3390982cb org-lparse.el (org-lparse): Fix bug by returning the output of `org-do-lparse'.
* org-lparse.el (org-lparse): Fix bug by returning the output
of `org-do-lparse'.

Thanks to Jambunathan for reporting this.
2012-10-24 15:55:59 +02:00
Jarmo Hurri e375cfd834 Table lookup functions
* lisp/org-table.el: added macro org-define-lookup-function and the
calls to this macro that generate the lookup functions
org-lookup-first, org-lookup-last and org-lookup-all
* doc/org.texi: documented lookup functions
2012-10-24 14:59:33 +02:00
Bastien Guerry 1886af4337 Merge branch 'maint'
Conflicts:
	lisp/org.el
2012-10-24 12:49:30 +02:00
Bastien Guerry 1fc41ca61e org.el: Add more explicit errors. Fix some declarations and one autoload.
* org.el (org-refile-check-position): Throw an error when the
refile target is the current buffer and is not a file.
(org-agenda-file-to-front, org-remove-file): Throw an error
when the current buffer is not a file.
(org-check-agenda-file): Enhance the message.
(org-element-type): Autoload.
(org-element-context, org-element-paragraph-parser): Don't
declare as these two functions are not used in org.el.
2012-10-24 12:45:08 +02:00
Bastien Guerry b714a09af2 org-lparse.el (browse-url-file-url): Declare.
* org-lparse.el (browse-url-file-url): Declare.
2012-10-24 12:44:22 +02:00
Bastien Guerry d65f5c9298 org.el (org-refile-check-position): Fix typo in docstring.
* org.el (org-refile-check-position): Fix typo in docstring.
2012-10-24 12:23:08 +02:00
Bastien Guerry 886e4f56e5 Merge branch 'maint' 2012-10-24 11:21:48 +02:00
Bastien Guerry facb889b19 Use "mode-line" instead of "modeline".
* org-clock.el (org-clock-modeline-total): Make obsolete.
(org-clock-mode-line-total): Rename from
`org-clock-modeline-total'.
(org-clock-get-sum-start): Fix references to
`org-clock-modeline-total'.

* org-faces.el (org-agenda-filter-tags)
(org-agenda-filter-category, mode-line): Use the 'mode-line
face instead of the obsolete 'modeline.

Thanks to Brendan Halpin for reporting this.
2012-10-24 11:21:44 +02:00
Nicolas Goaziou 866d28d48e ob-exp: Fix small bug
* lisp/ob-exp.el (org-export-blocks-preprocess): Pos can sometimes be
  set to a value greater than start, because of indentation, and lead
  to a search bound error.
2012-10-23 22:27:58 +02:00
Bastien Guerry 2608bed9ea Merge branch 'maint' 2012-10-23 18:41:45 +02:00
Bastien Guerry 93b0934d12 Fix typos fixed in Emacs (part 2)
Thanks to Paul Eggert for the fixes:
http://lists.gnu.org/archive/html/emacs-diffs/2012-10/msg00069.html
2012-10-23 18:41:33 +02:00
Bastien Guerry 47486f4b90 Merge branch 'maint' 2012-10-23 18:39:32 +02:00
Bastien Guerry 95ca977411 Fix typos fixed in Emacs (part 1)
Thanks to Paul Eggert for the fixes:
http://lists.gnu.org/archive/html/emacs-diffs/2012-10/msg00069.html
2012-10-23 18:39:20 +02:00
Nicolas Goaziou 4dead66693 ob-exp: Remove comma-escaping special rule for Org blocks
* lisp/ob-exp.el (org-babel-exp-code): Remove comma-escaping special
  rule for Org blocks.
2012-10-22 19:23:05 +02:00
John Wiegley 09e3a24a2f Support using git-annex with Org attachments 2012-10-20 15:00:49 -04:00
Nicolas Goaziou bef53d7f67 Merge branch 'maint' 2012-10-20 11:59:07 +02:00
Nicolas Goaziou 93040f4671 Fix auto filling in a paragraph directly following a comment
* lisp/org.el (org-auto-fill-function): Make sure `adaptive-fill-mode'
  mode is nil when pre-computed `fill-prefix' is the empty string.
  Otherwise filling functions from fill.el think it has to be computed
  again and overwrite it.
2012-10-20 11:58:16 +02:00
Eric Schulte 6f7e92bdb6 adding ob-makefile to `org-babel-load-languages'
* lisp/org.el (org-babel-load-languages): Adding ob-makefile to
  `org-babel-load-languages'.
2012-10-17 15:07:58 -06:00
Thomas Dye 9b727c7554 * lisp/ob-makefile.el: Org-babel support for Makefile tangling. 2012-10-17 15:07:40 -06:00
Achim Gratz 4d6165b106 org-reload: don't report an error for features found in load-path
* lisp/org.el (org-reload): Remove babel-dir, since it would always
  coincide with org-dir.  Features found in load-path are not reported
  as a (possible) error, but keep a list of these to issue a message
  that the actual location may need checking.
2012-10-17 20:27:49 +02:00
Nicolas Goaziou 10f1c32f6d Merge branch 'maint' 2012-10-17 17:22:58 +02:00
Nicolas Goaziou 92199873c5 Fix bug related to agenda bulding with hour repeaters
* lisp/org.el: Make `org-closest-date' aware of hours repeaters.
2012-10-17 17:21:18 +02:00
Nicolas Goaziou 94232ab5c6 Merge branch 'maint' 2012-10-16 21:12:21 +02:00
Nicolas Goaziou 8f96754932 Do not call `end-of-visual-line' when moving to the end of line
* lisp/org.el (org-end-of-line): Do not call `end-of-visual-line' when
  moving to the end of line.  Also improve behaviour on elements that
  can be hidden.
* testing/lisp/test-org.el: Add tests.
2012-10-16 21:11:06 +02:00
Nicolas Goaziou 93ebf24758 Merge branch 'maint' 2012-10-15 22:32:25 +02:00
Nicolas Goaziou 1fb3cca7c0 Allow to call `org-show-todo-tree' with an argument
* lisp/org.el (org-sparse-tree): Allow to call `org-show-todo-tree'
  with an argument.
* doc/orgcard.tex: Fix keybindings about `org-show-todo-tree'.
2012-10-15 22:31:37 +02:00
Nicolas Goaziou 0920e60c01 ob-exp: Fix removal of block results when exporting
* lisp/ob-exp.el (org-export-blocks-preprocess): Results of an
  evaluated code block can be inserted within the blank lines after
  the block.  Hence, if the block has to be removed, delete everything
  down to the first non-blank line after the end of block closing
  string, instead of removing everything down to the very end of the
  block.
* testing/lisp/test-ob-exp.el: Add test.
2012-10-15 22:29:30 +02:00
Nicolas Goaziou 23aa910259 Merge branch 'maint' 2012-10-14 21:51:59 +02:00
Nicolas Goaziou b7c5cf5d44 org-element: Fix parsing of objects of the same type in a single paragraph
* lisp/org-element.el (org-element--get-next-object-candidates): Fix
  parsing of objects of the same type in a single paragraph.
* testing/lisp/test-org-element.el: Add tests.
2012-10-14 21:49:41 +02:00
Nicolas Goaziou c65abd8577 org-element: Fix parsing of syntax at beginning of item
* lisp/org-element.el (org-element-sub/superscript-successor): Fix
  parsing of sub/superscript at beginning of item.
(org-element-latex-or-entity-successor): Fix parsing of latex
  fragments at beginning of item.
* testing/lisp/test-org-element.el: Add test.
2012-10-14 21:38:42 +02:00
Nicolas Goaziou f287ab418d Merge branch 'maint' 2012-10-13 12:54:21 +02:00
Nicolas Goaziou 9d00dd4a88 org-agenda: Fix `org-agenda-later' when called with an argument
* lisp/org-agenda.el (org-agenda-later): Fix function when span is
  a number and an argument was provided.  Also fix typo in docstring.
2012-10-13 12:52:43 +02:00