[gentoo-commits] proj/eselect:master commit in: /, misc/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     03dd0b50c278ae49bfcae50fb53eb7fb42ca3829
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 17:32:10 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May  1 17:32:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=03dd0b50

eselect-mode: Remove eselect-mode-make-keywords-list function

* misc/eselect-mode.el (eselect-mode-make-keywords-list): Remove.
(eselect-mode-font-lock-keywords): Inline its code. \< \> around
a regexp can be obtained via the paren option of regexp-opt.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog            |  3 +++
 misc/eselect-mode.el | 15 +++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ef1610..6fcf0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	write-contents-functions instead of obsolete write-contents-hooks.
 	(eselect-mode-before-save): Call delete-trailing-whitespace which
 	exists in XEmacs 21.5.
+	(eselect-mode-make-keywords-list): Remove function.
+	(eselect-mode-font-lock-keywords): Inline its code. \< \> around
+	a regexp can be obtained via the paren option of regexp-opt.
 
 2022-01-08  Ulrich Müller  <ulm@gentoo.org>
 

diff --git a/misc/eselect-mode.el b/misc/eselect-mode.el
index 3bdac81..d7ea649 100644
--- a/misc/eselect-mode.el
+++ b/misc/eselect-mode.el
@@ -69,20 +69,11 @@
      "get_repo_news_dir" "env_update")
     font-lock-type-face))
 
-(defun eselect-mode-make-keywords-list (keywords-list face
-						      &optional prefix suffix)
-  ;; based on `generic-make-keywords-list' from generic.el
-  ;; Note: XEmacs doesn't have generic.el
-  (unless (listp keywords-list)
-    (error "Keywords argument must be a list of strings"))
-  (cons (concat prefix "\\<"
-		(regexp-opt keywords-list t)
-		"\\>" suffix)
-	face))
-
 (defvar eselect-mode-font-lock-keywords
   (mapcar
-   (lambda (x) (apply 'eselect-mode-make-keywords-list x))
+   (lambda (x)
+     (cons (regexp-opt (car x) 'words)
+	   (cadr x)))
    (list
     eselect-mode-keywords-warn
     eselect-mode-keywords-core