[elpa] externals/bind-key 042778a64c 11/13: Merge pull request #1013 from skangas/ci

[ELPA Syncer]

branch: externals/bind-key
commit 042778a64c0e548a2cebf4c4ca8dd38fc142cecb
Merge: 116e042f72 0572eaf4e0
Author: John Wiegley <johnw@newartisans.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #1013 from skangas/ci
---
 .elpaignore                |  1 -
 .github/workflows/test.yml | 29 +++++++++++++++++++---------
 .travis.yml                | 48 ----------------------------------------------
 bind-key.el                | 12 ++++++------
 use-package-core.el        | 17 +++++++++++-----
 5 files changed, 38 insertions(+), 69 deletions(-)

diff --git a/.elpaignore b/.elpaignore
index d9ca1c78a6..30d29dea9b 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -1,2 +1 @@
-.travis.yml
 doc/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 51fc206849..e5ecf99e6b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,7 @@
 
 name: Main workflow
 on: [push, pull_request]
+permissions: {}
 
 jobs:
   build:
@@ -9,19 +10,29 @@ jobs:
     strategy:
       matrix:
         emacs_version:
-          - '26.1'
-          - '26.2'
-          - '26.3'
-          - '27.1'
-          - '27.2'
-          - '28.1'
-          - 'snapshot'
+          - 24.3
+          - 24.4
+          - 24.5
+          - 25.1
+          - 25.3
+          - 26.1
+          - 26.2
+          - 26.3
+          - 27.1
+          - 27.2
+          - 28.1
+          - 28.2
+          - snapshot
         include:
           - emacs_version: 'snapshot'
             allow_failure: true
     steps:
-    - uses: actions/checkout@v2
-    - uses: purcell/setup-emacs@master
+    - uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+
+    - name: Install Emacs
+      uses: purcell/setup-emacs@master
       with:
         version: ${{ matrix.emacs_version }}
 
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c6c20c4a01..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: generic
-sudo: false
-env:
-  global:
-    - CURL="curl -fsSkL --retry 9 --retry-delay 9"
-  matrix:
-    - EMACS_VERSION=27.1
-    - EMACS_VERSION=26.3
-    - EMACS_VERSION=25.3
-    - EMACS_VERSION=24.5
-    - EMACS_VERSION=24.4
-    - EMACS_VERSION=24.3
-    - EMACS_VERSION=master
-install:
-  - $CURL -O 
https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
-  - tar xf emacs-bin-${EMACS_VERSION}.tar.gz -C /
-  - export EMACS=/tmp/emacs/bin/emacs
-  - $EMACS --version
-dist: bionic
-addons:
-  apt:
-    packages:
-      - texinfo
-      - libgnutls30
-script:
-  - make
-  - make test
-  - make info
-before_deploy: cd doc && make doc
-deploy:
-  provider: pages
-  skip_cleanup: true
-  github_token: $GITHUB_TOKEN
-  local_dir: doc/public
-  on:
-    branch: master
-    condition: $EMACS_VERSION = 26
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/848b93e13f8e6ab0cc86
-    on_success: always
-    on_failure: always
-    on_start: always
-  email:
-    on_success: change
-    on_failure: always
-    on_start: never
diff --git a/bind-key.el b/bind-key.el
index cca5ad8618..567ef9e4e8 100644
--- a/bind-key.el
+++ b/bind-key.el
@@ -223,11 +223,11 @@ See `bind-key' for more details."
 In contrast to `define-key', this function removes the binding from the 
keymap."
   (define-key keymap key nil)
   ;; Split M-key in ESC key
-  (setq key (mapcan (lambda (k)
-                      (if (and (integerp k) (/= (logand k ?\M-\0) 0))
-                          (list ?\e (logxor k ?\M-\0))
-                        (list k)))
-                    key))
+  (setq key (cl-mapcan (lambda (k)
+                         (if (and (integerp k) (/= (logand k ?\M-\0) 0))
+                             (list ?\e (logxor k ?\M-\0))
+                           (list k)))
+                       key))
   ;; Delete single keys directly
   (if (= (length key) 1)
       (delete key keymap)
@@ -241,7 +241,7 @@ In contrast to `define-key', this function removes the 
binding from the keymap."
       (delete (last key) submap)
       ;; Delete submap if it is empty
       (when (= 1 (length submap))
-          (bind-key--remove prefix keymap)))))
+        (bind-key--remove prefix keymap)))))
 
 ;;;###autoload
 (defmacro bind-key* (key-name command &optional predicate)
diff --git a/use-package-core.el b/use-package-core.el
index 7d7217d094..43106b7234 100644
--- a/use-package-core.el
+++ b/use-package-core.el
@@ -53,11 +53,18 @@
 ;; iterating over them to "disable all themes" won't disable it.
 (setq custom-enabled-themes (remq 'use-package custom-enabled-themes))
 
-(if (and (eq emacs-major-version 24) (eq emacs-minor-version 3))
-    (defsubst hash-table-keys (hash-table)
-      "Return a list of keys in HASH-TABLE."
-      (cl-loop for k being the hash-keys of hash-table collect k))
-  (eval-when-compile (require 'subr-x)))
+(eval-when-compile
+  (if (and (eq emacs-major-version 24) (eq emacs-minor-version 3))
+      (progn
+        (defsubst hash-table-keys (hash-table)
+          "Return a list of keys in HASH-TABLE."
+          (cl-loop for k being the hash-keys of hash-table collect k))
+        (defsubst string-suffix-p (suffix string  &optional ignore-case)
+          (let ((start-pos (- (length string) (length suffix))))
+            (and (>= start-pos 0)
+                 (eq t (compare-strings suffix nil nil
+                                        string start-pos nil ignore-case))))))
+    (require 'subr-x)))
 
 (eval-when-compile
   (require 'regexp-opt))