summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2006-06-10 21:23:01 +0000
committerKim F. Storm <storm@cua.dk>2006-06-10 21:23:01 +0000
commit7225c342daeb852ecf23824933923adab0c310df (patch)
treea3829d12036689e033d97a345725a67395275635 /lisp
parent503b5e1c9023ca602657bc1d535b574543758a15 (diff)
downloademacs-7225c342daeb852ecf23824933923adab0c310df.tar.gz
emacs-7225c342daeb852ecf23824933923adab0c310df.tar.bz2
emacs-7225c342daeb852ecf23824933923adab0c310df.zip
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
1 files changed, 3 insertions, 5 deletions
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