Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /
Date: Fri, 07 Apr 2017 18:33:23
Message-Id: 1491589826.a09895211e963261fa946240da7758001785b696.ulm@gentoo
1 commit: a09895211e963261fa946240da7758001785b696
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 7 18:30:26 2017 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 7 18:30:26 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a0989521
7
8 Fix for XEmacs 21.4.
9
10 * ebuild-mode.el (ebuild-mode-make-keywords-list): XEmacs 21.4
11 doesn't have delete-dups, use delete-duplicates instead.
12
13 ChangeLog | 3 +++
14 ebuild-mode.el | 5 ++++-
15 2 files changed, 7 insertions(+), 1 deletion(-)
16
17 diff --git a/ChangeLog b/ChangeLog
18 index fa707b1..ac09a5c 100644
19 --- a/ChangeLog
20 +++ b/ChangeLog
21 @@ -1,5 +1,8 @@
22 2017-04-07 Ulrich Müller <ulm@g.o>
23
24 + * ebuild-mode.el (ebuild-mode-make-keywords-list): XEmacs 21.4
25 + doesn't have delete-dups, use delete-duplicates instead.
26 +
27 * Version 1.36 released.
28
29 * ebuild-mode-keywords.el (ebuild-mode-keywords-*): Regenerated.
30
31 diff --git a/ebuild-mode.el b/ebuild-mode.el
32 index c65d08b..8fcf281 100644
33 --- a/ebuild-mode.el
34 +++ b/ebuild-mode.el
35 @@ -213,7 +213,10 @@ of lines."
36 (error "Keywords argument must be a list of strings"))
37 (cons (concat prefix "\\<"
38 (let ((max-specpdl-size (max max-specpdl-size 2000)))
39 - (regexp-opt (delete-dups keywords-list) t))
40 + (regexp-opt (if (fboundp 'delete-dups) ; not in XEmacs 21.4
41 + (delete-dups keywords-list)
42 + (delete-duplicates keywords-list))
43 + t))
44 "\\>" suffix)
45 face))