branch: externals/company
commit 4ff89f7369227fbb89fe721d1db707f1af74cd0f
Merge: 03bedfce76 2f01207a56
Author: Dmitry Gutov <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1521 from leuven65/master
Fix issue of "all" in 'company-dabbrev-other-buffers' for Emacs 31
---
company-dabbrev.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/company-dabbrev.el b/company-dabbrev.el
index 2bd8e8d780..c228ada019 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -198,9 +198,11 @@ This variable affects both `company-dabbrev' and
`company-dabbrev-code'."
(company-dabbrev--search (company-dabbrev--make-regexp)
company-dabbrev-time-limit
(pcase company-dabbrev-other-buffers
- (`t (list major-mode))
+ ('t (list major-mode))
+ ;; `all' is a function starting with Emacs 31.
+ ('all 'all)
((pred functionp) (funcall
company-dabbrev-other-buffers (current-buffer)))
- (`all `all))))
+ )))
;;;###autoload
(defun company-dabbrev (command &optional arg &rest _ignored)
