# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1149582405 0
# Node ID 92cdf6b947543bf3a27991fac18d264d0a92f972
# Parent  11ad1dbc7d4590269d2771a48b30ea79bae6c447
*** empty log message ***

diff -r 11ad1dbc7d45 -r 92cdf6b94754 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 06 08:26:10 2006 +0000
+++ b/lisp/ChangeLog	Tue Jun 06 08:26:45 2006 +0000
@@ -1,3 +1,24 @@
+2006-06-06  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el: (org-archive-subtree): Use end-of-subtree as
+	insertion point and control the number of empty lines.
+	(org-paste-subtree): Limit the number of empty lines at the end of
+	the inserted tree.
+	(org-agenda): Use buffer name of current file for narrowing.
+	(org-export-as-xml): Command removed.
+	(org-export-xml-type): Option removed.
+	(org-mode-map): Call `org-export-as-xoxo' directly.
+	(org-get-indentation): New optional argument LINE.
+	(org-fix-indentation, org-remove-tabs): New functions.
+	(org-export-as-ascii, org-ascii-level-start): Determine and apply
+	correct indentation for headlines that are converted it items.
+	(org-skip-comments): Remove table lines that contain narrowing
+	cookies but no other non-empty fields.
+	(org-set-tags): Allow groups of mutually exclusive tags.
+	(org-cmp-time): Sort 24:21 before items without time.
+	(org-get-time-of-day): Fixed the interpretation of 12pm and 12am.
+	(org-open-at-point): Require double colon also for numbers.
+
 2006-06-06  Kim F. Storm  <storm@cua.dk>
 
 	* ido.el (ido-default-file-method, ido-default-buffer-method):
diff -r 11ad1dbc7d45 -r 92cdf6b94754 man/ChangeLog
--- a/man/ChangeLog	Tue Jun 06 08:26:10 2006 +0000
+++ b/man/ChangeLog	Tue Jun 06 08:26:45 2006 +0000
@@ -1,3 +1,8 @@
+2006-06-06  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: (ASCII export): Document indentation adaptation.
+	(Setting tags): Document mutually-exclusive tags.
+
 2006-06-05  Romain Francoise  <romain@orebokech.com>
 
 	* url.texi (irc): Mention new funs `url-irc-rcirc' and `url-irc-erc'.