emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/company 9e153fa 12/46: Restore Emacs < 26 compatibility


From: Dmitry Gutov
Subject: [elpa] externals/company 9e153fa 12/46: Restore Emacs < 26 compatibility
Date: Wed, 30 Dec 2020 18:33:03 -0500 (EST)

branch: externals/company
commit 9e153fa5352e3ac2da025feb71aba12da48cf9a2
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Restore Emacs < 26 compatibility
    
    Fixes #1003
---
 company.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/company.el b/company.el
index c1fcdd9..d451b7e 100644
--- a/company.el
+++ b/company.el
@@ -1823,6 +1823,7 @@ each one wraps a part of the input string."
 (defun company--permutations (lst)
   (if (not lst)
       '(nil)
+    ;; FIXME: Replace with `mapcan' in Emacs 26.
     (cl-mapcan
      (lambda (e)
        (mapcar (lambda (perm) (cons e perm))
@@ -2752,7 +2753,7 @@ If SHOW-VERSION is non-nil, show the version in the echo 
area."
                      :background (face-attribute 'default :background)))
            (str (apply #'concat
                        (when nl " \n")
-                       (mapcan
+                       (cl-mapcan
                         ;; 
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42552#23
                         (lambda (line) (list line (propertize "\n" 'face 
nl-face)))
                         (nreverse new)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]