Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

[gnu-emacs] / lisp / org / ChangeLog

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0e80ea2fa2e821e91c84035a44dae323bbc62ec2..86f493a0a5b60efe58784f4d085bcad9c2a2c3ff 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,7 +1,7 @@
-2012-04-11  Bastien Guerry  <bzg@gnu.org>
+2012-04-14  Bastien Guerry  <bzg@gnu.org>
 
        * org.el (org-point-at-end-of-empty-headline): Only try to match
-       ̀org-todo-line-regexp' when the value is non-nil, e.g. in non-org
+       `org-todo-line-regexp' when the value is non-nil, e.g. in non-org
        modes.
        (org-fontify-meta-lines-and-blocks-1): Prevent errors when trying
        to fontify beyond (point-max).
@@ -19,31 +19,30 @@
        (org-table-get-range): Fix bug: make sure references to $0 are
        correctly handled.
 
-       * org-pcomplete.el (pcomplete/org-mode/file-option): Fix bug in
-       `pcomplete/org-mode/file-option'.
+       * org-pcomplete.el (pcomplete/org-mode/file-option):
+       Fix bug in `pcomplete/org-mode/file-option'.
        (org-thing-at-point): Also match line options like LATEX_CLASS
        when pcompleting from LATEX_.
 
        * org-agenda.el (org-agenda-filter-make-matcher)
        (org-agenda-filter-apply): Allow filtering entries out by
        category.  Using `C-u <' from the agenda view will redisplay
-       the agenda without entries from categories of the current
-       line.
+       the agenda without entries from categories of the current line.
 
-2012-04-11  Eric Schulte  <eric.schulte@gmx.com>
+2012-04-14  Eric Schulte  <eric.schulte@gmx.com>
 
-       * ob-C.el (org-babel-C-ensure-main-wrap): Add an explicit return
-       to automatically generated main methods.
+       * ob-C.el (org-babel-C-ensure-main-wrap):
+       Add an explicit return to automatically generated main methods.
 
-2012-04-11  Matt Lundin  <mdl@imapmail.org>
+2012-04-14  Matt Lundin  <mdl@imapmail.org>
 
-       * org.el (org-after-todo-state-change-hook): Fix docstring to
-       reflect name change of state to `org-state'.
+       * org.el (org-after-todo-state-change-hook):
+       Fix docstring to reflect name change of state to `org-state'.
 
-2012-04-11  Mike Sperber  <sperber@deinprogramm.de>  (tiny change)
+2012-04-14  Mike Sperber  <sperber@deinprogramm.de>  (tiny change)
 
-       * org-footnote.el (org-footnote-normalize): Correctly pass keyword
-       arguments to `org-export-preprocess-string'.
+       * org-footnote.el (org-footnote-normalize):
+       Correctly pass keyword arguments to `org-export-preprocess-string'.
 
 2012-04-03  Bastien Guerry  <bzg@gnu.org>