[Emacs-diffs] emacs-24 r117573: Merge Org 8.2.9

[Bastien Guerry]

------------------------------------------------------------
revno: 117573
revision-id: address@hidden
parent: address@hidden
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-10-12 07:18:57 +0200
message:
  Merge Org 8.2.9
modified:
  doc/misc/org.texi              org.texi-20091113204419-o5vbwnq5f7feedwu-6313
  lisp/org/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-8688
  lisp/org/org-agenda.el         
orgagenda.el-20091113204419-o5vbwnq5f7feedwu-8640
  lisp/org/org-version.el        orgversion.el-20120930151248-fsivhdtofzv2elux-1
  lisp/org/org.el                org.el-20091113204419-o5vbwnq5f7feedwu-8617
  lisp/org/ox.el                 ox.el-20131112130502-8825zrk0dp6b9sq5-18

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2014-10-03 08:13:51 +0000
+++ b/doc/misc/org.texi 2014-10-12 05:18:57 +0000
@@ -2,7 +2,8 @@
 @c %**start of header
 @setfilename ../../info/org
 @settitle The Org Manual
address@hidden VERSION 8.2.8
+
address@hidden VERSION 8.2.9
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2014-10-03 15:46:27 +0000
+++ b/lisp/org/ChangeLog        2014-10-12 05:18:57 +0000
@@ -1,3 +1,17 @@
+2014-10-12  Christopher Schmidt  <address@hidden>
+
+       * org.el (orgstruct-make-binding): Do not use loop in interpreted
+       code.
+
+2014-10-12  Mike McLean  <address@hidden>  (tiny change)
+
+       * org-agenda.el (org-agenda-time-grid): Change docstring.
+
+2014-10-12  Nicolas Goaziou  <address@hidden>
+
+       * ox.el (org-export-async-start): Allow to use symbols as
+       function.
+
 2014-10-02  Achim Gratz  <address@hidden>
 
        * ob-sh.el (org-babel-sh-initiate-session): After initiating a

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2014-10-03 08:13:51 +0000
+++ b/lisp/org/org-agenda.el    2014-10-12 05:18:57 +0000
@@ -1472,6 +1472,7 @@
  weekly        if the agenda shows an entire week
  today         show grid on current date, independent of daily/weekly display
  require-timed show grid only if at least one item has a time specification
+ remove-match  skip grid times already present in an entry
 
 The second item is a string which will be placed behind the grid time.
 

=== modified file 'lisp/org/org-version.el'
--- a/lisp/org/org-version.el   2014-10-03 08:13:51 +0000
+++ b/lisp/org/org-version.el   2014-10-12 05:18:57 +0000
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-release "8.2.8"))
+   (let ((org-release "8.2.9"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "release_8.2.8"))
+   (let ((org-git-version "release_8.2.9"))
      org-git-version))
 
 (provide 'org-version)

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2014-10-09 15:59:41 +0000
+++ b/lisp/org/org.el   2014-10-12 05:18:57 +0000
@@ -7571,7 +7571,7 @@
 in the current line after point \(see `org-M-RET-may-split-line'
 on how to modify this behavior).
 
-With one universal prefix argument, set the user option
+With one universal prefirx argument, set the user option
 `org-insert-heading-respect-content' to t for the duration of
 the command.  This modifies the behavior described above in this
 ways: on list items and at the beginning of normal lines, force
@@ -9099,14 +9099,16 @@
            (if fallback
                (let* ((orgstruct-mode)
                       (binding
-                       (loop with key = ,key
-                             for rep in
-                             '(nil
-                               ("<\\([^>]*\\)tab>" . "\\1TAB")
-                               ("<\\([^>]*\\)return>" . "\\1RET")
-                               ("<\\([^>]*\\)escape>" . "\\1ESC")
-                               ("<\\([^>]*\\)delete>" . "\\1DEL"))
-                             do
+                       (let ((key ,key))
+                         (catch 'exit
+                           (dolist
+                               (rep
+                                '(nil
+                                  ("<\\([^>]*\\)tab>" . "\\1TAB")
+                                  ("<\\([^>]*\\)return>" . "\\1RET")
+                                  ("<\\([^>]*\\)escape>" . "\\1ESC")
+                                  ("<\\([^>]*\\)delete>" . "\\1DEL"))
+                                nil)
                              (when rep
                                (setq key (read-kbd-macro
                                           (let ((case-fold-search))
@@ -9114,7 +9116,8 @@
                                              (car rep)
                                              (cdr rep)
                                              (key-description key))))))
-                             thereis (key-binding key))))
+                             (when (key-binding key)
+                               (throw 'exit (key-binding key))))))))
                  (if (keymapp binding)
                      (org-set-transient-map binding)
                    (let ((func (or binding

=== modified file 'lisp/org/ox.el'
--- a/lisp/org/ox.el    2014-10-03 08:13:51 +0000
+++ b/lisp/org/ox.el    2014-10-12 05:18:57 +0000
@@ -5532,7 +5532,7 @@
            ;; Register running process in stack.
            (org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process)
            ;; Set-up sentinel in order to catch results.
-           (let ((handler ,fun))
+           (let ((handler ',fun))
              (set-process-sentinel
               ,process
               `(lambda (p status)