[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/company cacdef4 2/4: Fix compaile error on Emacs 25
From: |
ELPA Syncer |
Subject: |
[elpa] externals/company cacdef4 2/4: Fix compaile error on Emacs 25 |
Date: |
Wed, 25 Aug 2021 11:57:07 -0400 (EDT) |
branch: externals/company
commit cacdef43e002d1a77e50a49de4e5cf065fd0c640
Author: Gong Qijian <gongqijian@gmail.com>
Commit: Gong Qijian <gongqijian@gmail.com>
Fix compaile error on Emacs 25
---
company-keywords.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/company-keywords.el b/company-keywords.el
index 1b53533..9f96441 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -27,6 +27,7 @@
(require 'company)
(require 'cl-lib)
+(eval-when-compile (require 'make-mode))
(defun company-keywords-upper-lower (&rest lst)
;; Upcase order is different for _.
@@ -298,17 +299,17 @@
"Alist mapping major-modes to sorted keywords for `company-keywords'.")
(with-eval-after-load 'make-mode
- (require 'seq)
(mapc
(lambda (mode-stmnts)
(setf (alist-get (car mode-stmnts) company-keywords-alist)
- (seq-uniq
- (append
- makefile-special-targets-list
- (mapcan #'identity
- (mapcar #'split-string
- (seq-filter #'stringp
- (symbol-value (cdr
mode-stmnts)))))))))
+ (cl-remove-duplicates
+ (append makefile-special-targets-list
+ (cl-mapcan #'identity
+ (mapcar
+ #'split-string
+ (cl-remove-if-not
+ #'stringp
+ (symbol-value (cdr mode-stmnts)))))))))
'((makefile-automake-mode . makefile-automake-statements)
(makefile-gmake-mode . makefile-gmake-statements)
(makefile-makepp-mode . makefile-makepp-statements)