summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Gruner <lukasz@gruner.lu>2015-02-16 06:05:30 +0100
committerŁukasz Gruner <lukasz@gruner.lu>2015-02-16 06:05:30 +0100
commit451c7b324735d4a750e1521b8bd67dc19ee138fc (patch)
tree786e17b61cbbce04af9540e23c987771277d17aa
parentda6e5a7eafad02192f9fa9dbd8c55672c5e6fc3c (diff)
downloadorg-mode-451c7b324735d4a750e1521b8bd67dc19ee138fc.tar.gz
Fix documentation-function for elisp-mode in emacs24
-rw-r--r--contrib/lisp/org-eldoc.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el
index 4cc6d97..c970b27 100644
--- a/contrib/lisp/org-eldoc.el
+++ b/contrib/lisp/org-eldoc.el
@@ -127,6 +127,12 @@
(org-eldoc-get-src-header)
(let ((lang (org-eldoc-get-src-lang)))
(cond ((or
+ (string= lang "emacs-lisp")
+ (string= lang "elisp")) (if (fboundp 'elisp-eldoc-documentation-function)
+ (elisp-eldoc-documentation-function)
+ (let (eldoc-documentation-function)
+ (eldoc-print-current-symbol-info))))
+ ((or
(string= lang "c") ;; http://github.com/nflath/c-eldoc
(string= lang "C")) (when (require 'c-eldoc nil t)
(c-eldoc-print-current-symbol-info)))