diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-01-01 05:47:47 -0500 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-01 05:47:47 -0500 |
| commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
| tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /lisp/startup.el | |
| parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
| parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
| download | emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz | |
Merge from origin/emacs-29
cae528457c ; Add 2023 to copyright years.
b394359261 Improve documentation of 'isearch-open-overlay-temporary'
ab3210e709 Document 'use-package' in the 2 main manuals
# Conflicts:
# etc/refcards/ru-refcard.tex
# lib/explicit_bzero.c
# m4/explicit_bzero.m4
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 5a383630774..fa84985580e 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1,6 +1,6 @@ ;;; startup.el --- process Emacs shell arguments -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992, 1994-2022 Free Software Foundation, +;; Copyright (C) 1985-1986, 1992, 1994-2023 Free Software Foundation, ;; Inc. ;; Maintainer: emacs-devel@gnu.org |