]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sun, 1 Jan 2023 10:47:47 +0000 (05:47 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sun, 1 Jan 2023 10:47:47 +0000 (05:47 -0500)
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

158 files changed:
1  2 
README
admin/admin.el
admin/find-gc.el
admin/gitmerge.el
admin/merge-gnulib
configure.ac
doc/emacs/misc.texi
doc/emacs/programs.texi
doc/misc/calc.texi
doc/misc/eshell.texi
doc/misc/mh-e.texi
doc/misc/rcirc.texi
doc/misc/sc.texi
doc/misc/texinfo.tex
doc/misc/trampver.texi
doc/misc/transient.texi
etc/DEBUG
etc/NEWS
etc/PROBLEMS
etc/refcards/ru-refcard.tex
lib-src/etags.c
lib/file-has-acl.c
lib/gnulib.mk.in
lib/string.in.h
lib/time.in.h
lib/verify.h
lisp/abbrev.el
lisp/bindings.el
lisp/bs.el
lisp/calc/calc-units.el
lisp/calendar/cal-dst.el
lisp/calendar/diary-lib.el
lisp/calendar/solar.el
lisp/cedet/semantic/complete.el
lisp/cedet/semantic/decorate/include.el
lisp/cedet/semantic/lex-spp.el
lisp/cedet/semantic/lex.el
lisp/comint.el
lisp/cus-edit.el
lisp/descr-text.el
lisp/desktop.el
lisp/elide-head.el
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/byte-run.el
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/easy-mmode.el
lisp/emacs-lisp/gv.el
lisp/emacs-lisp/macroexp.el
lisp/emacs-lisp/package.el
lisp/emulation/viper-cmd.el
lisp/eshell/em-alias.el
lisp/eshell/em-cmpl.el
lisp/eshell/em-unix.el
lisp/eshell/esh-arg.el
lisp/eshell/esh-cmd.el
lisp/eshell/esh-io.el
lisp/eshell/esh-opt.el
lisp/eshell/esh-proc.el
lisp/eshell/esh-util.el
lisp/eshell/esh-var.el
lisp/files.el
lisp/frame.el
lisp/gnus/gnus-registry.el
lisp/gnus/mml.el
lisp/gnus/nndiary.el
lisp/help-fns.el
lisp/image-mode.el
lisp/mail/rmailout.el
lisp/mh-e/mh-identity.el
lisp/mouse.el
lisp/net/ange-ftp.el
lisp/net/eww.el
lisp/net/gnutls.el
lisp/net/newst-backend.el
lisp/net/rcirc.el
lisp/net/soap-client.el
lisp/net/tramp-adb.el
lisp/net/tramp-crypt.el
lisp/net/tramp-fuse.el
lisp/net/tramp-gvfs.el
lisp/net/tramp-sh.el
lisp/net/tramp-smb.el
lisp/net/tramp-sudoedit.el
lisp/net/tramp.el
lisp/net/trampver.el
lisp/proced.el
lisp/progmodes/c-ts-mode.el
lisp/progmodes/csharp-mode.el
lisp/progmodes/flymake.el
lisp/progmodes/gdb-mi.el
lisp/progmodes/gud.el
lisp/progmodes/java-ts-mode.el
lisp/progmodes/js.el
lisp/progmodes/prog-mode.el
lisp/progmodes/sh-script.el
lisp/progmodes/typescript-ts-mode.el
lisp/progmodes/verilog-mode.el
lisp/server.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/tab-bar.el
lisp/transient.el
lisp/treesit.el
lisp/url/url-future.el
lisp/use-package/bind-key.el
lisp/vc/vc-git.el
lisp/vc/vc.el
lisp/whitespace.el
m4/gnulib-common.m4
m4/gnulib-comp.m4
m4/string_h.m4
msdos/sed2v2.inp
nt/README.W32
src/alloc.c
src/buffer.h
src/data.c
src/dispnew.c
src/emacs-module.h.in
src/eval.c
src/fileio.c
src/fns.c
src/frame.c
src/frame.h
src/gnutls.c
src/gtkutil.c
src/itree.c
src/itree.h
src/lisp.h
src/nsterm.m
src/pdumper.c
src/sysdep.c
src/xdisp.c
src/xfns.c
src/xftfont.c
src/xselect.c
src/xterm.c
src/xterm.h
test/lisp/elide-head-tests.el
test/lisp/emacs-lisp/bytecomp-tests.el
test/lisp/emacs-lisp/cl-lib-tests.el
test/lisp/emacs-lisp/multisession-tests.el
test/lisp/eshell/em-alias-tests.el
test/lisp/eshell/em-extpipe-tests.el
test/lisp/eshell/em-script-tests.el
test/lisp/eshell/em-tramp-tests.el
test/lisp/eshell/esh-cmd-tests.el
test/lisp/eshell/esh-io-tests.el
test/lisp/eshell/esh-var-tests.el
test/lisp/eshell/eshell-tests-helpers.el
test/lisp/eshell/eshell-tests.el
test/lisp/net/tramp-tests.el
test/lisp/url/url-future-tests.el
test/lisp/whitespace-tests.el
test/manual/noverlay/itree-tests.c
test/src/process-tests.el
test/src/regex-emacs-tests.el

diff --cc README
Simple merge
diff --cc admin/admin.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index cfe83359f655d03fc7c5d2c05fb232951f3cfff0,7858bf152c3961f3df559b7de18176c6a6f132c9..7c4520637a730b53020c773f0eccf4355a45f57c
@@@ -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
Simple merge
Simple merge
diff --cc etc/DEBUG
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
index 50a22891a6bba4e42be7fbaa25701db463c2fa8e,3124ce4f7c7ccbf39437903bb035cec036a36842..815a2db2f6da85963224ac3d5dffb57f26a470b0
@@@ -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 lib-src/etags.c
Simple merge
Simple merge
Simple merge
diff --cc lib/string.in.h
Simple merge
diff --cc lib/time.in.h
Simple merge
diff --cc lib/verify.h
Simple merge
diff --cc lisp/abbrev.el
Simple merge
Simple merge
diff --cc lisp/bs.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/comint.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/desktop.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/frame.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/mouse.el
Simple merge
Simple merge
diff --cc lisp/net/eww.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/proced.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/server.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc lisp/tab-bar.el
Simple merge
Simple merge
diff --cc lisp/treesit.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc m4/string_h.m4
Simple merge
Simple merge
diff --cc nt/README.W32
index 30f33ca706f7d3ed644b17efb093268dd8c3fa53,523f833ca24887d2259139f045765413494c67ac..da1ede1ea4d5dc09ed2a037f165c1c8e553fb5dc
@@@ -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
diff --cc src/alloc.c
Simple merge
diff --cc src/buffer.h
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/dispnew.c
Simple merge
Simple merge
diff --cc src/eval.c
Simple merge
diff --cc src/fileio.c
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/frame.h
Simple merge
diff --cc src/gnutls.c
Simple merge
diff --cc src/gtkutil.c
Simple merge
diff --cc src/itree.c
Simple merge
diff --cc src/itree.h
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/nsterm.m
Simple merge
diff --cc src/pdumper.c
Simple merge
diff --cc src/sysdep.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xftfont.c
Simple merge
diff --cc src/xselect.c
Simple merge
diff --cc src/xterm.c
Simple merge
diff --cc src/xterm.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge