Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-01-02 17:40:41 +01:00
commit 4b7b201c77

View file

@ -39,9 +39,10 @@
(declare-function org-link-escape "org" (text &optional table))
(declare-function org-open-link-from-string "org" (s &optional arg reference-buffer))
(declare-function org-store-link "org" (arg))
(declare-function org-up-heading-safe "org" ())
(declare-function outline-previous-heading "outline" ())
(defvar org-link-types-re)
(defcustom org-babel-tangle-lang-exts
'(("emacs-lisp" . "el")
("elisp" . "el"))