Merge Org 8.2.9

6 files changed, 33 insertions, 14 deletions

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index d8a83fc18a4..7c796070fb3 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -2,7 +2,8 @@
 @c %**start of header
 @setfilename ../../info/org
 @settitle The Org Manual
-@set VERSION 8.2.8
+
+@set VERSION 8.2.9
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0639ddf3a91..98adf5da0e4 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,17 @@
+2014-10-12  Christopher Schmidt  <ch@ristopher.com>
+
+	* org.el (orgstruct-make-binding): Do not use loop in interpreted
+	code.
+
+2014-10-12  Mike McLean  <mike.mclean@pobox.com>  (tiny change)
+
+	* org-agenda.el (org-agenda-time-grid): Change docstring.
+
+2014-10-12  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+
+	* ox.el (org-export-async-start): Allow to use symbols as
+	function.
+
 2014-10-02  Achim Gratz  <Stromeko@Stromeko.DE>
 
 	* ob-sh.el (org-babel-sh-initiate-session): After initiating a
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 6f9db514d43..e0229367eeb 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed:
  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.
 
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index b96025785c2..00f6c82272f 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -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)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c4f8325de33..2b5603ce5af 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -7571,7 +7571,7 @@ headline or the item and create a new headline/item with the text
 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 `orgstruct-heading-prefix-regexp' is not empty."
 	    (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 @@ if `orgstruct-heading-prefix-regexp' is not empty."
 					      (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
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index dd81ad13d1d..24d0c874563 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -5532,7 +5532,7 @@ and `org-export-to-file' for more specialized functions."
            ;; 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)