branch: externals/eldoc-eval
commit 92b7c0ca4a1dbb4838bfe8cd59fd7e07e186ee9b
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Fix error and even emacs crash when composition-function-table is modified
Ensure we always use the default value.
---
eldoc-eval.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index 2acbb79240..ef9a32e297 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -57,6 +57,8 @@
(defalias 'eldoc-get-fnsym-args-string 'elisp-get-fnsym-args-string)
(defalias 'eldoc-get-var-docstring 'elisp-get-var-docstring)))
+(defvar composition-function-table)
+
;;; Minibuffer support.
;; Enable displaying eldoc info in something else
;; Than minibuffer when this one is in use.
@@ -188,6 +190,7 @@ See `with-eldoc-in-minibuffer'."
(str (and (stringp input) (concat " " input)))
(len (length str))
(tmp-str str)
+ (composition-function-table (default-value
'composition-function-table))
(mode-line-format (or str mode-line-format))
roll mode-line-in-non-selected-windows)
(catch 'break
