Merge from origin/emacs-24

[gnu-emacs] / lisp / org / ChangeLog

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index b1de69a1b84cf135f32314a28c1396f132558b36..35e6ef1eccd9e68899ae97bebf06dbdf2c3ad244 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,28 @@
+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.
+       * org-archive.el (org-archive-subtree)
+       (org-archive-to-archive-sibling):
+       * org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
+       (org-clock-special-range):
+       * org-timer.el (org-timer-seconds):
+       * org.el (org-read-date-analyze, org-get-cursor-date):
+       * ox-html.el (org-html-format-spec):
+       * ox-icalendar.el (org-icalendar--vtodo):
+       Omit unnecessary call to current-time.
+       * org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
+       conversion from floating point to Emacs time and back.
+       (org-resolve-clocks): Prefer two-argument floor.
+       * org-compat.el (org-float-time): Simplify to an alias because
+       time-to-seconds now behaves like float-time with respect to nil arg.
+       * org.el (org-get-cursor-date):
+       Don't call current-time twice to get the current time stamp,
+       as this can lead to inconsistent results.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
        * Merge in all changes up to 24.4 release.
@@ -827,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.
@@ -6680,7 +6705,7 @@
        (org-mew-open-by-message-id, org-mew-search, org-mew-capture)
        (org-mew-capture-guess-selection-keys): New functions.
 
-2013-11-12  Trevor Murphy  <trevor.m.murphy@gmail.com>  (tiny change)
+2013-11-12  Trevor Murphy  <trevor.m.murphy@gmail.com>
 
        * org.el (org-get-compact-tod): Always pad minutes to two places.
 
@@ -13084,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>
 
@@ -25376,7 +25401,7 @@
        (org-ascii-replace-entities): New function.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
-            Ulf Stegemann  <ulf@zeitform.de>
+           Ulf Stegemann  <ulf@zeitform.de>
 
        * org-entities.el: New file.
 
@@ -32808,7 +32833,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-       Copyright (C) 2008-2014 Free Software Foundation, Inc.
+       Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.