diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-07-27 04:27:53 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-07-27 04:27:53 -0400 |
| commit | c3c27a919c2b4552da672391606ab336a5783d35 (patch) | |
| tree | 803499ee9858f0302993553dc05ced4508508664 /lisp/emacs-lisp | |
| parent | b9f2ef2a333fa7c813913dbba798c5ba8778eefd (diff) | |
| parent | 88e1ec22f271b127d961896b7dddcd58df289c42 (diff) | |
| download | emacs-c3c27a919c2b4552da672391606ab336a5783d35.tar.gz emacs-c3c27a919c2b4552da672391606ab336a5783d35.tar.bz2 emacs-c3c27a919c2b4552da672391606ab336a5783d35.zip | |
Merge from origin/emacs-30
88e1ec22f27 Update to Org 9.7.9
1ae2f004473 Fix edge-case with 'which-key-dont-use-unicode' setter
68a5f1f7d18 NS: prevent makeKeyWindow warnings (bug#69525)
59a895ec499 ; * .gitignore: Add lisp/eshell/esh-groups.el.
5c08cd4e7c3 ; * doc/emacs/cmdargs.texi (Initial Options): Fix last ch...
309d0a71864 Add PROBLEMS entry for bug#72303
87389f9ff90 ; Improve documentation of 'line-prefix' and 'wrap-prefix'.
268a2d10fc9 Improve documentation of '--init-directory' command-line ...
c27055a938a ; cperl-mode.el: Fix fontification of flip-flop (Bug#72296)
fcd4e4c895d ; * admin/MAINTAINERS: Add myself for maintaining some ar...
fdc133e97f6 Fix bug in server.el introduced by 0d7d835902df
af527051cd3 ; * admin/MAINTAINERS: Remove Nicolas Petton.
7170282a59a lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176
68906f184cb * admin/notes/spelling: Update note.
9eea6be5abf Don't produce invalid XML with multi-line commenting style
b97786d9f6e ; * etc/NEWS: Entry for 'gnus-summary-limit-to-age' (bug#...
a7996615663 Standardize possessive apostrophe usage in manuals, docs,...
67faaead754 Don't refer to obsolete finder group "wp"
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/seq.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/thunk.el | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index a20cff16982..73c22d2d4a7 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -3,12 +3,11 @@ ;; Copyright (C) 2014-2024 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> +;; Maintainer: emacs-devel@gnu.org ;; Keywords: sequences ;; Version: 2.24 ;; Package: seq -;; Maintainer: emacs-devel@gnu.org - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el index 1776ca0de40..e2a83b06b30 100644 --- a/lisp/emacs-lisp/thunk.el +++ b/lisp/emacs-lisp/thunk.el @@ -3,12 +3,11 @@ ;; Copyright (C) 2015-2024 Free Software Foundation, Inc. ;; Author: Nicolas Petton <nicolas@petton.fr> +;; Maintainer: emacs-devel@gnu.org ;; Keywords: sequences ;; Version: 1.0 ;; Package: thunk -;; Maintainer: emacs-devel@gnu.org - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify |