Commit Graph

10259 Commits

Author SHA1 Message Date
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
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
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
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 ab771171cf Merge branch 'hotfix-7.8.06' 2012-03-21 23:50:57 +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 eb5a450686 test-ob-lilypond.el: Whitespace cleanup. 2012-03-21 15:27:23 +01:00
Bastien Guerry 72ca335e6c Merge branch 'master' of orgmode.org:org-mode 2012-03-21 15:26:55 +01:00
Bastien Guerry e19820b384 Merge branch 'hotfix-7.8.06'
Conflicts:
	lisp/ob-lilypond.el
	testing/lisp/test-ob-lilypond.el
2012-03-21 15:26:25 +01:00
Martyn Jago 51c5680aa0 Re-direct homepage to Worg.
* lisp/ob-lilypond.el:
 Re-direct homepage to Worg.
2012-03-21 15:24:33 +01:00
Martyn Jago 988f742ccf Leave versioning to Org.
* lisp/ob-lilypond.el:
 Leave versioning to Org.

* testing/lisp/test-ob-lilypond.el:
 Leave versioning to Org.
2012-03-21 15:24:30 +01:00
Martyn Jago d1aa517381 Fix compiler warning.
* lisp/ob-lilypond.el: Fix compiler warning.
2012-03-21 15:24:27 +01:00
Jambunathan K eeb08e5c6e Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 15:39:17 +05:30
Jambunathan K 34ab9a0eb2 org-odt.el: Enumerate labeled/captioned entities correctly
* lisp/org-odt.el (org-odt-format-entity-caption): Enumerate
entities that have either a caption or a label.
(org-odt-label-styles, org-odt-category-map-alist): Add a
separator between sequence number and caption.  Introduced two
new label styles for handling of math formula and math label.
(org-odt-format-label-definition)
(org-export-odt-format-formula): Propagate above changes.
2012-03-21 15:21:10 +05:30
FengShu eb84020a9f org-exp.el: Add traditional Chinese translation. 2012-03-21 10:23:31 +01:00
Bastien Guerry ba51d8e9c8 Merge branch 'hotfix-7.8.06' 2012-03-21 08:27:30 +01:00
Bastien Guerry d83284b728 org.el (org-enforce-todo-dependencies): Fix docstring.
* org.el (org-enforce-todo-dependencies): Fix docstring.

Thanks to Bernt Hansen for spotting this.
2012-03-21 08:27:17 +01:00
Bastien Guerry c4978d6210 Merge branch 'hotfix-7.8.06' 2012-03-21 01:14:31 +01:00
Bastien Guerry 431407cc27 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-21 01:12:08 +01:00
Jambunathan K e2f490826c Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:51:09 +05:30
Jambunathan K aa20053803 org.texi (Customizing tables in ODT export): Fix errors
* doc/org.texi (Customizing tables in ODT export): Correct few
errors.
2012-03-21 02:47:55 +05:30