From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 1 Jan 2023 10:47:47 +0000 (-0500)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2;p=emacs.git

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
---

3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2
diff --cc doc/misc/texinfo.tex
index cfe83359f65,7858bf152c3..7c4520637a7
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@@ -3,9 -3,9 +3,9 @@@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
 -\def\texinfoversion{2022-11-12.22}
 +\def\texinfoversion{2022-12-19.22}
  %
- % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
+ % Copyright 1985--1986, 1988, 1990--2023 Free Software Foundation, Inc.
  %
  % This texinfo.tex file is free software: you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as
diff --cc etc/refcards/ru-refcard.tex
index 50a22891a6b,3124ce4f7c7..815a2db2f6d
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@@ -40,8 -40,8 +40,8 @@@
  \newlength{\ColThreeWidth}
  \setlength{\ColThreeWidth}{25mm}
  
 -\newcommand{\versionemacs}[0]{29} % version of Emacs this is for
 +\newcommand{\versionemacs}[0]{30} % version of Emacs this is for
- \newcommand{\cyear}[0]{2022}       % copyright year
+ \newcommand{\cyear}[0]{2023}       % copyright year
  
  \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
    \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --cc nt/README.W32
index 30f33ca706f,523f833ca24..da1ede1ea4d
--- a/nt/README.W32
+++ b/nt/README.W32
@@@ -1,7 -1,7 +1,7 @@@
- Copyright (C) 2001-2022 Free Software Foundation, Inc.
+ Copyright (C) 2001-2023 Free Software Foundation, Inc.
  See the end of the file for license conditions.
  
 -		Emacs version 29.0.60 for MS-Windows
 +		Emacs version 30.0.50 for MS-Windows
  
    This README file describes how to set up and run a precompiled
    distribution of the latest version of GNU Emacs for MS-Windows.  You