Merge branch 'maint' into master
This commit is contained in:
commit
3f04ad8d2c
|
@ -136,10 +136,16 @@
|
||||||
(let ((lang (org-eldoc-get-src-lang)))
|
(let ((lang (org-eldoc-get-src-lang)))
|
||||||
(cond ((or
|
(cond ((or
|
||||||
(string= lang "emacs-lisp")
|
(string= lang "emacs-lisp")
|
||||||
(string= lang "elisp")) (if (fboundp 'elisp-eldoc-documentation-function)
|
(string= lang "elisp"))
|
||||||
(elisp-eldoc-documentation-function)
|
(cond ((boundp 'eldoc-documentation-functions) ; Emacs>=28
|
||||||
(let (eldoc-documentation-function)
|
(let ((eldoc-documentation-functions
|
||||||
(eldoc-print-current-symbol-info))))
|
'(elisp-eldoc-var-docstring elisp-eldoc-funcall)))
|
||||||
|
(eldoc-print-current-symbol-info)))
|
||||||
|
((fboundp 'elisp-eldoc-documentation-function)
|
||||||
|
(elisp-eldoc-documentation-function))
|
||||||
|
(t ; Emacs<25
|
||||||
|
(let (eldoc-documentation-function)
|
||||||
|
(eldoc-print-current-symbol-info)))))
|
||||||
((or
|
((or
|
||||||
(string= lang "c") ;; http://github.com/nflath/c-eldoc
|
(string= lang "c") ;; http://github.com/nflath/c-eldoc
|
||||||
(string= lang "C")) (when (require 'c-eldoc nil t)
|
(string= lang "C")) (when (require 'c-eldoc nil t)
|
||||||
|
|
Loading…
Reference in New Issue