# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1149948964 0
# Node ID 289fa893412bcfc5b94f77518a11b649cfafc22c
# Parent  0d898412763091c9e55e4f07cca8adb5155c7e43
*** empty log message ***

diff -r 0d8984127630 -r 289fa893412b lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 10 14:15:25 2006 +0000
+++ b/lisp/ChangeLog	Sat Jun 10 14:16:04 2006 +0000
@@ -1,3 +1,27 @@
+2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el: (org-agenda-mode-map): Add bindings for
+	clocking
+	functions.
+	(org-agenda-clock-in, org-check-running-clock)
+	(org-clock-out-if-current, org-remove-clock-overlays)
+	(org-put-clock-overlay): New functions.
+	(org-clock-marker, org-clock-file-total-minutes)
+	(org-clock-overlays): New variables
+	(org-clock-display, org-clock-sum, org-clock-cancel)
+	(org-clock-out, org-clock-in): New commands.
+	(org-export): New function.
+	(org-emph-re): New constant.
+	(org-set-emph-re, org-do-emphasis-faces): New functions.
+	(org-emphasis-regexp-components, org-emphasis-alist): New options.
+	(org-set-font-lock-defaults): Call `org-do-emphasis-faces'.
+	(org-export-html-convert-emphasize): Use the configurable
+	emphasis.
+	(org-cleaned-string-for-export): Make multiline emphasis visible
+	to the exporter.  New optional argument PARAMETERS.
+	(org-export-as-html): Specify :emph-multiline parameter to
+	`org-cleaned-string-for-export'.
+
 2006-06-10  Richard Stallman  <rms@gnu.org>
 
 	* help.el (help-for-help-internal): Clean up help text.
diff -r 0d8984127630 -r 289fa893412b man/ChangeLog
--- a/man/ChangeLog	Sat Jun 10 14:15:25 2006 +0000
+++ b/man/ChangeLog	Sat Jun 10 14:16:04 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: (Progress logging): New section.
+
 2006-06-10  Richard Stallman  <rms@gnu.org>
 
 	* mule.texi (Recognize Coding): Clarify previous change.