*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index baa0c17a66fe6a4be133720531e595044adfdbc4..6511ab2cdd1d58409116364464d7571f47e69d8d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index ba819c1c6250071b6f481c08b32f8510b46bf115..341be9a3e424319be240475d33ff839be1426699 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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):