From: Kim F. Storm <storm@cua.dk>
Date: Sat, 10 Jun 2006 21:23:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~1986
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7225c342daeb852ecf23824933923adab0c310df;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c50cf000adf..8bc6f57044f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,12 @@
 2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: (org-agenda-mode-map): Add bindings for
-	clocking
-	functions.
+	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-overlays): New variables.
 	(org-clock-display, org-clock-sum, org-clock-cancel)
 	(org-clock-out, org-clock-in): New commands.
 	(org-export): New function.
@@ -15,8 +14,7 @@
 	(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-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