branch: externals/compat commit 8e17e784de1bb2ba973b08712065ca57b47875da Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Avoid duplicating the package information in the header --- compat-24.el | 7 +------ compat-25.el | 7 +------ compat-26.el | 7 +------ compat-27.el | 7 +------ compat-28.el | 7 +------ compat-29.el | 19 ++++++++----------- compat-macs.el | 5 +---- compat-tests.el | 5 +---- compat.el | 2 +- 9 files changed, 16 insertions(+), 50 deletions(-) diff --git a/compat-24.el b/compat-24.el index e6ca7928f2..9d0157e917 100644 --- a/compat-24.el +++ b/compat-24.el @@ -1,11 +1,6 @@ ;;; compat-24.el --- Compatibility Layer for Emacs 24.4 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> -;; URL: https://git.sr.ht/~pkal/compat/ -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-25.el b/compat-25.el index 84ef300d37..fe241b0081 100644 --- a/compat-25.el +++ b/compat-25.el @@ -1,11 +1,6 @@ ;;; compat-25.el --- Compatibility Layer for Emacs 25.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> -;; URL: https://git.sr.ht/~pkal/compat/ -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-26.el b/compat-26.el index eb3bd5eb4e..7190bc2f68 100644 --- a/compat-26.el +++ b/compat-26.el @@ -1,11 +1,6 @@ ;;; compat-26.el --- Compatibility Layer for Emacs 26.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> -;; URL: https://git.sr.ht/~pkal/compat/ -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-27.el b/compat-27.el index 0997597ee7..cf92f03d62 100644 --- a/compat-27.el +++ b/compat-27.el @@ -1,11 +1,6 @@ ;;; compat-27.el --- Compatibility Layer for Emacs 27.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> -;; URL: https://git.sr.ht/~pkal/compat/ -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-28.el b/compat-28.el index 6213d7b214..aa5945e0ce 100644 --- a/compat-28.el +++ b/compat-28.el @@ -1,11 +1,6 @@ ;;; compat-28.el --- Compatibility Layer for Emacs 28.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht> -;; URL: https://git.sr.ht/~pkal/compat/ -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-29.el b/compat-29.el index 20076ff5b6..67cfd207e8 100644 --- a/compat-29.el +++ b/compat-29.el @@ -1,9 +1,6 @@ ;;; compat-29.el --- Compatibility Layer for Emacs 29.1 -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 @@ -541,11 +538,11 @@ the symbol of the calling function, for example." (let* ((file (directory-file-name (expand-file-name file))) (remote-file-name-inhibit-cache t) (fileattr (file-attributes file 'integer)) - (attr (and fileattr + (attr (and fileattr (cons (nth 7 fileattr) - (nth 5 fileattr)))) - (sym (concat (symbol-name tag) "@" file)) - (cachedattr (gethash sym compat--file-has-changed-p--hash-table))) + (nth 5 fileattr)))) + (sym (concat (symbol-name tag) "@" file)) + (cachedattr (gethash sym compat--file-has-changed-p--hash-table))) (when (not (equal attr cachedattr)) (puthash sym attr compat--file-has-changed-p--hash-table)))) @@ -827,9 +824,9 @@ in a cleaner way with command remapping, like this: (unless prefix (setq prefix "")) (let* ((scan (or oldmap keymap)) - (prefix1 (vconcat prefix [nil])) - (key-substitution-in-progress - (cons scan key-substitution-in-progress))) + (prefix1 (vconcat prefix [nil])) + (key-substitution-in-progress + (cons scan key-substitution-in-progress))) ;; Scan OLDMAP, finding each char or event-symbol that ;; has any definition, and act on it with hack-key. (map-keymap diff --git a/compat-macs.el b/compat-macs.el index ff15120adc..9a74c87e51 100644 --- a/compat-macs.el +++ b/compat-macs.el @@ -1,9 +1,6 @@ ;;; compat-macs.el --- Compatibility Macros -*- lexical-binding: t; no-byte-compile: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Keywords: lisp +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat-tests.el b/compat-tests.el index 570adb260e..5a738f9c27 100644 --- a/compat-tests.el +++ b/compat-tests.el @@ -1,9 +1,6 @@ ;;; compat-tests.el --- Tests for compat.el -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. - -;; Author: Philip Kaludercic <phil...@posteo.net> -;; Package-Requires: ((emacs "28.1")) +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; 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 diff --git a/compat.el b/compat.el index 7c400cedd7..22f9c45550 100644 --- a/compat.el +++ b/compat.el @@ -1,6 +1,6 @@ ;;; compat.el --- Emacs Lisp Compatibility Library -*- lexical-binding: t; -*- -;; Copyright (C) 2021, 2022, 2023 Free Software Foundation, Inc. +;; Copyright (C) 2021-2023 Free Software Foundation, Inc. ;; Author: Philip Kaludercic <phil...@posteo.net> ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht>