0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 15:10:42 +00:00
Commit graph

10112 commits

Author SHA1 Message Date
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 2120c372e5 Merge branch 'hotfix-7.8.06' 2012-03-26 22:39:52 +02:00
Bastien Guerry 3c57eb297b doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:59 +02:00
Bastien Guerry d1ed590320 doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:29 +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 9602e1cb38 org-collector.el: Don't narrow to subtree when collecting properties on the whole buffer.
* org-collector.el (org-dblock-write:propview): Don't narrow
to subtree when collecting properties on the whole buffer.

TINYCHANGE
2012-03-26 17:24:26 +02: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 ac24a454ac Merge branch 'hotfix-7.8.06' 2012-03-24 07:48:18 +01:00
Bastien Guerry 973695beb3 Add org-notify.el by Peter Münster to contrib/lisp/.
It's useful for getting notifications for todo items and more flexible
than org-agenda-to-appt.

Here a summary:
- different warning periods for different todo-types
- fine grained warning periods (smallest unit is second)
- continue notifications, when deadline is overdue
- easy modification of timestamps (just one click, to say
  "let's do it tomorrow")
- switch from "todo" to "done" by clicking on the notification window
- configurable notification types (email, notifications-notify, beep,
  etc.)
- configurable notification period
- configurable notification duration
- crescendo notifications (be more aggressive, when time gets closer to
  deadline)

There was a little thread about this subject:
http://thread.gmane.org/gmane.emacs.orgmode/48832

Example usage:
  (org-notify-add 'appt
                  '(:time "-1s" :period "20s" :duration 10
                    :actions (-message -ding))
                  '(:time "15m" :period "2m" :duration 100
                    :actions -notify/window)
                  '(:time "2h" :period "5m" :actions -message)
                  '(:time "1d" :actions -email))

This means for todo-items with `notify' property set to `appt': 1 day before
deadline, send a reminder-email, 2 hours before deadline, start to send
messages every 5 minutes, then, 15 minutes before deadline, start to pop up
notification windows every 2 minutes. The timeout of the window is set to
100 seconds. Finally, when deadline is overdue, send messages and make
noise.
2012-03-24 07:48:07 +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
Nicolas Goaziou 1581b16c78 org-element: Small refactoring
* contrib/lisp/org-element.el (org-element-swap-A-B,
  org-element-drag-backward, org-element-drag-forward): Small
  refactoring.
* testing/lisp/test-org-element.el: Add tests.
2012-03-22 19:32:09 +01:00
Nicolas Goaziou 5e950a9e56 org-element: Remove an unused argument
* contrib/lisp/org-element.el (org-element-parse-secondary-string):
  Remove unused optional argument.
2012-03-22 18:26:34 +01:00
Nicolas Goaziou d6ab0f534b org-e-latex: Add sidewaystable option for tables
* EXPERIMENTAL/org-e-latex.el (org-e-latex-table--format-string): Add
  sidewaystable option for tables.
2012-03-22 18:15:54 +01:00
Nicolas Goaziou dd7aa8ece9 org-export: Fix export with Babel calls outside export scope
* contrib/lisp/org-export.el (org-export-as): Fix export with Babel
  calls outside export scope by providing buffer's name holding full
  data instead of the one holding its copy limited to scope.
* testing/lisp/test-org-export.el (test-org-export/export-scope): Add
  a test.
2012-03-22 16:49:19 +01:00