From 733bd28dd2d5333c3ec4635f9e2caa40bbb1a4fe Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Mon, 17 Jan 2022 11:50:01 +0100 Subject: [PATCH] update a Signed-off-by: Andreas Gerler --- elpa/a-20180907.953/a-pkg.el | 2 -- .../a-autoloads.el | 0 elpa/a-20210929.1510/a-pkg.el | 2 ++ elpa/{a-20180907.953 => a-20210929.1510}/a.el | 22 ++++++++++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 elpa/a-20180907.953/a-pkg.el rename elpa/{a-20180907.953 => a-20210929.1510}/a-autoloads.el (100%) create mode 100644 elpa/a-20210929.1510/a-pkg.el rename elpa/{a-20180907.953 => a-20210929.1510}/a.el (95%) diff --git a/elpa/a-20180907.953/a-pkg.el b/elpa/a-20180907.953/a-pkg.el deleted file mode 100644 index f07f8644..00000000 --- a/elpa/a-20180907.953/a-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "a" "20180907.953" "Associative data structure functions" '((emacs "25")) :commit "18966975db7110d0aac726be95b593e2fc3d44ed" :keywords '("lisp") :authors '(("Arne Brasseur" . "arne@arnebrasseur.net")) :maintainer '("Arne Brasseur" . "arne@arnebrasseur.net") :url "https://github.com/plexus/a.el") diff --git a/elpa/a-20180907.953/a-autoloads.el b/elpa/a-20210929.1510/a-autoloads.el similarity index 100% rename from elpa/a-20180907.953/a-autoloads.el rename to elpa/a-20210929.1510/a-autoloads.el diff --git a/elpa/a-20210929.1510/a-pkg.el b/elpa/a-20210929.1510/a-pkg.el new file mode 100644 index 00000000..279b129e --- /dev/null +++ b/elpa/a-20210929.1510/a-pkg.el @@ -0,0 +1,2 @@ +;;; Generated package description from a.el -*- no-byte-compile: t -*- +(define-package "a" "20210929.1510" "Associative data structure functions" '((emacs "25")) :commit "9ad2d18252b729174fe22ed0b2b7670c88f60c31" :authors '(("Arne Brasseur" . "arne@arnebrasseur.net")) :maintainer '("Arne Brasseur" . "arne@arnebrasseur.net") :keywords '("lisp") :url "https://github.com/plexus/a.el") diff --git a/elpa/a-20180907.953/a.el b/elpa/a-20210929.1510/a.el similarity index 95% rename from elpa/a-20180907.953/a.el rename to elpa/a-20210929.1510/a.el index b699160e..305b4b94 100644 --- a/elpa/a-20180907.953/a.el +++ b/elpa/a-20210929.1510/a.el @@ -1,12 +1,13 @@ ;;; a.el --- Associative data structure functions -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Arne Brasseur +;; Copyright (C) 2017-2021 Arne Brasseur ;; Author: Arne Brasseur ;; URL: https://github.com/plexus/a.el -;; Package-Version: 20180907.953 +;; Package-Version: 20210929.1510 +;; Package-Commit: 9ad2d18252b729174fe22ed0b2b7670c88f60c31 ;; Keywords: lisp -;; Version: 0.1.1 +;; Version: 1.0.0 ;; Package-Requires: ((emacs "25")) ;; This file is not part of GNU Emacs. @@ -46,7 +47,8 @@ (defun a-associative-p (obj) (or (not obj) (hash-table-p obj) - (and (consp obj) (consp (car obj))))) + (and (consp obj) + (consp (car obj))))) (defalias 'a-associative? 'a-associative-p) @@ -129,7 +131,7 @@ Internal helper function." (cons (cons k v) coll))) ((vectorp coll) - (if (and (integerp k) (> k 0)) + (if (and (integerp k) (>= k 0)) (if (< k (length coll)) (let ((copy (copy-sequence coll))) (aset copy k v) @@ -210,7 +212,14 @@ Anything that isn't associative or a sequence is compared with (when (eq (a-count a) (a-count b)) (cl-block nil (seq-doseq (k (a-keys a)) - (when (not (a-equal (a-get a k) (a-get b k))) + (when (not (and + (a-has-key b k) + (a-equal (a-get a k) (a-get b k)))) + (cl-return nil))) + (seq-doseq (k (a-keys b)) + (when (not (and + (a-has-key a k) + (a-equal (a-get a k) (a-get b k)))) (cl-return nil))) t)))) ((and (sequencep a) (sequencep b)) @@ -344,4 +353,5 @@ association lists will be created." args))))) (provide 'a) + ;;; a.el ends here -- 2.47.3