# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1121792299 0
# Node ID 2cd737c9eaea425c2f0a1c85a22be36ea4e15fd6
# Parent  3f75dfc753c0e68a2c834670f4148935a9005c3a
*** empty log message ***

diff -r 3f75dfc753c0 -r 2cd737c9eaea lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 19 16:54:26 2005 +0000
+++ b/lisp/ChangeLog	Tue Jul 19 16:58:19 2005 +0000
@@ -1,3 +1,22 @@
+2005-07-19  Carsten Dominik  <dominik@science.uva.nl>
+
+	* textmodes/org.el: (org-table-column-names,
+	org-table-column-name-regexp)
+        (org-table-named-field-locations): New variables.
+        (org-archive-subtree): Protect `this-command' when calling
+	`org-copy-subtree' and `org-cut-subtree', to avoid appending to
+	the kill buffer.
+        (org-complete): Removed fixed-formula completion.
+        (org-edit-formulas-map): New variable.
+        (org-table-edit-formulas): New command.
+        (org-finish-edit-formulas, org-abort-edit-formulas,
+	org-show-variable, org-table-get-vertical-vector): New functions.
+        (org-table-maybe-eval-formula): Handle `:=' fields.
+        (org-table-get-stored-formulas, org-table-store-formulas)
+        (org-table-get-formula, org-table-modify-formulas)
+        (org-table-replace-in-formulas): Handle named field formulas.
+        (org-table-get-specials): Store locations of named fields.
+
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
 	* progmodes/grep.el (grep-regexp-alist)
diff -r 3f75dfc753c0 -r 2cd737c9eaea man/ChangeLog
--- a/man/ChangeLog	Tue Jul 19 16:54:26 2005 +0000
+++ b/man/ChangeLog	Tue Jul 19 16:58:19 2005 +0000
@@ -1,3 +1,13 @@
+2005-07-19  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.14
+
+<<<<<<< ChangeLog
+2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.texi: Version 3.13
+
+=======
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
 	* files.texi (Comparing Files): Mention resync for `compare-windows'.
@@ -89,6 +99,7 @@
 	* mh-e.texi (Copying):
 	* trouble.texi (Checklist): Update FSF's address.
 
+>>>>>>> 1.631
 2005-07-03  Richard M. Stallman  <rms@gnu.org>
 
 	* flymake.texi (Example -- Configuring a tool called directly):