Commit a9789a1d authored by Bastien Guerry's avatar Bastien Guerry
Browse files

Merge Org 8.2.9

parent 20f02f27
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
@c %**start of header @c %**start of header
@setfilename ../../info/org @setfilename ../../info/org
@settitle The Org Manual @settitle The Org Manual
@set VERSION 8.2.8
@set VERSION 8.2.9
   
@c Version and Contact Info @c Version and Contact Info
@set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
......
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> 2014-10-02 Achim Gratz <Stromeko@Stromeko.DE>
   
* ob-sh.el (org-babel-sh-initiate-session): After initiating a * ob-sh.el (org-babel-sh-initiate-session): After initiating a
...@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed: ...@@ -1472,6 +1472,7 @@ symbols specifying conditions when the grid should be displayed:
weekly if the agenda shows an entire week weekly if the agenda shows an entire week
today show grid on current date, independent of daily/weekly display 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 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. The second item is a string which will be placed behind the grid time.
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of org-mode. "The release version of org-mode.
Inserted by installing org-mode or when a release is made." 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)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of org-mode. "The Git version of org-mode.
Inserted by installing org-mode or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)
......
...@@ -7571,7 +7571,7 @@ headline or the item and create a new headline/item with the text ...@@ -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' in the current line after point \(see `org-M-RET-may-split-line'
on how to modify this behavior). 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 `org-insert-heading-respect-content' to t for the duration of
the command. This modifies the behavior described above in this the command. This modifies the behavior described above in this
ways: on list items and at the beginning of normal lines, force ways: on list items and at the beginning of normal lines, force
...@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty." ...@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(if fallback (if fallback
(let* ((orgstruct-mode) (let* ((orgstruct-mode)
(binding (binding
(loop with key = ,key (let ((key ,key))
for rep in (catch 'exit
'(nil (dolist
("<\\([^>]*\\)tab>" . "\\1TAB") (rep
("<\\([^>]*\\)return>" . "\\1RET") '(nil
("<\\([^>]*\\)escape>" . "\\1ESC") ("<\\([^>]*\\)tab>" . "\\1TAB")
("<\\([^>]*\\)delete>" . "\\1DEL")) ("<\\([^>]*\\)return>" . "\\1RET")
do ("<\\([^>]*\\)escape>" . "\\1ESC")
("<\\([^>]*\\)delete>" . "\\1DEL"))
nil)
(when rep (when rep
(setq key (read-kbd-macro (setq key (read-kbd-macro
(let ((case-fold-search)) (let ((case-fold-search))
...@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty." ...@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(car rep) (car rep)
(cdr rep) (cdr rep)
(key-description key)))))) (key-description key))))))
thereis (key-binding key)))) (when (key-binding key)
(throw 'exit (key-binding key))))))))
(if (keymapp binding) (if (keymapp binding)
(org-set-transient-map binding) (org-set-transient-map binding)
(let ((func (or binding (let ((func (or binding
......
...@@ -5532,7 +5532,7 @@ and `org-export-to-file' for more specialized functions." ...@@ -5532,7 +5532,7 @@ and `org-export-to-file' for more specialized functions."
;; Register running process in stack. ;; Register running process in stack.
(org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process) (org-export-add-to-stack (get-buffer ,proc-buffer) nil ,process)
;; Set-up sentinel in order to catch results. ;; Set-up sentinel in order to catch results.
(let ((handler ,fun)) (let ((handler ',fun))
(set-process-sentinel (set-process-sentinel
,process ,process
`(lambda (p status) `(lambda (p status)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment