From 928562a5817b22785825db00e56ee9a8763bfdc7 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 13 Nov 2018 11:06:10 +0100 Subject: [PATCH] update cl-lib. Signed-off-by: Andreas Gerler --- elpa/cl-lib-0.5/cl-lib-pkg.el | 1 - .../cl-lib-autoloads.el | 8 +++++-- elpa/cl-lib-0.6.1/cl-lib-pkg.el | 2 ++ elpa/{cl-lib-0.5 => cl-lib-0.6.1}/cl-lib.el | 22 +++++++++++++++---- 4 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 elpa/cl-lib-0.5/cl-lib-pkg.el rename elpa/{cl-lib-0.5 => cl-lib-0.6.1}/cl-lib-autoloads.el (67%) create mode 100644 elpa/cl-lib-0.6.1/cl-lib-pkg.el rename elpa/{cl-lib-0.5 => cl-lib-0.6.1}/cl-lib.el (94%) diff --git a/elpa/cl-lib-0.5/cl-lib-pkg.el b/elpa/cl-lib-0.5/cl-lib-pkg.el deleted file mode 100644 index 9aadf9c2..00000000 --- a/elpa/cl-lib-0.5/cl-lib-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "cl-lib" "0.5" "Properly prefixed CL functions and macros" 'nil :url "http://elpa.gnu.org/packages/cl-lib.html" :keywords nil) diff --git a/elpa/cl-lib-0.5/cl-lib-autoloads.el b/elpa/cl-lib-0.6.1/cl-lib-autoloads.el similarity index 67% rename from elpa/cl-lib-0.5/cl-lib-autoloads.el rename to elpa/cl-lib-0.6.1/cl-lib-autoloads.el index c9da3a8f..3c85f50b 100644 --- a/elpa/cl-lib-0.5/cl-lib-autoloads.el +++ b/elpa/cl-lib-0.6.1/cl-lib-autoloads.el @@ -1,9 +1,12 @@ ;;; cl-lib-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + -;;;### (autoloads nil "cl-lib" "cl-lib.el" (21970 60779 0 0)) +;;;### (autoloads nil "cl-lib" "cl-lib.el" (0 0 0 0)) ;;; Generated autoloads from cl-lib.el (let ((d (file-name-directory #$))) (when (member d load-path) @@ -15,5 +18,6 @@ ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t +;; coding: utf-8 ;; End: ;;; cl-lib-autoloads.el ends here diff --git a/elpa/cl-lib-0.6.1/cl-lib-pkg.el b/elpa/cl-lib-0.6.1/cl-lib-pkg.el new file mode 100644 index 00000000..fa4ee190 --- /dev/null +++ b/elpa/cl-lib-0.6.1/cl-lib-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "cl-lib" "0.6.1" "Properly prefixed CL functions and macros" 'nil :url "http://elpa.gnu.org/packages/cl-lib.html" :keywords nil) diff --git a/elpa/cl-lib-0.5/cl-lib.el b/elpa/cl-lib-0.6.1/cl-lib.el similarity index 94% rename from elpa/cl-lib-0.5/cl-lib.el rename to elpa/cl-lib-0.6.1/cl-lib.el index ce11309f..ec330d72 100644 --- a/elpa/cl-lib-0.5/cl-lib.el +++ b/elpa/cl-lib-0.6.1/cl-lib.el @@ -1,10 +1,11 @@ ;;; cl-lib.el --- Properly prefixed CL functions and macros -*- coding: utf-8 -*- -;; Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2012, 2013, 2014, 2017 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; vcomment: Emacs-24.3's version is 1.0 so this has to stay below. -;; Version: 0.5 +;; Version: 0.6.1 +;; Y-Package-Requires: ((emacs "21")) ¡`emacs' package only exists in Emacs≥24! ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -23,7 +24,7 @@ ;; This is a forward compatibility package, which provides (a subset of) the ;; features of the cl-lib package introduced in Emacs-24.3, for use on -;; previous emacsen. +;; previous emacsen (it should work on Emacs≥21 as well as XEmacs). ;; Make sure this is installed *late* in your `load-path`, i.e. after Emacs's ;; built-in .../lisp/emacs-lisp directory, so that if/when you upgrade to @@ -100,7 +101,10 @@ ;; custom-print-functions )) (let ((new (intern (format "cl-%s" var)))) - (unless (boundp new) (defvaralias new var)))) + (if (fboundp 'defvaralias) + (unless (boundp new) (defvaralias new var)) + (if (fboundp 'cl-float-limits) (cl-float-limits)) + (eval `(defvar ,new ,var ,(format "`cl-lib' alias of `%s'" var)))))) ;; The following cl-lib functions were already defined in the old cl.el, ;; with a different meaning: @@ -370,6 +374,16 @@ ;;;; ChangeLog: +;; 2017-01-06 Stefan Monnier +;; +;; * cl-lib/cl-lib.el: Don't use `emacs` package for Emacs<24 +;; +;; 2017-01-04 Stefan Monnier +;; +;; * cl-lib/cl-lib.el: Make it work for Emacs-21. Bump version to 0.6 +;; +;; (var aliases): Don't assume `defvaralias' is available. +;; ;; 2014-02-25 Stefan Monnier ;; ;; Fixes: debbugs:16671 -- 2.47.3