Merge from origin/emacs-24

[gnu-emacs] / lisp / org / ChangeLog

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7b87933935cb3f910d506b03a55902de573fb7c5..35e6ef1eccd9e68899ae97bebf06dbdf2c3ad244 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * org-clock.el (org-clock-save): Prefer (system-name) to system-name.
+
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify use of current-time and friends.
@@ -848,7 +852,7 @@
        in a table.el table last.
 
        * org.el (org-delete-property): Don't suggest to delete the
-       CATEGORY property when the category is not explicitely set in the
+       CATEGORY property when the category is not explicitly set in the
        property drawer.  Also enforce matching when completing.
        (org-insert-heading): Fix regression: with two universal prefixes,
        insert heading at the end of the subtree.
@@ -13105,7 +13109,7 @@
 2012-01-03  Nicolas Goaziou  <n.goaziou@gmail.com>
 
        * org.el (org-fontify-meta-lines-and-blocks-1):
-       Recognize "name" as a valid keyword that can preceed a block.
+       Recognize "name" as a valid keyword that can precede a block.
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>