From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 15 Jul 2023 09:30:14 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=748d2ed5158ebde03094aaf6956b39e5b96b70c7;p=emacs.git

Merge from origin/emacs-29

7ac947f34c7 ; * src/lisp.h (struct Lisp_Overlay): Update commentary (...
9bc93c7996c Replace duplicate text from epa.texi by a reference
74cc1d27f1f Add basic usage information and fix references
f24bdbfaf57 Add concept index, title-case structure titles
0165b50b0ff ; * lisp/emacs-lisp/lisp.el (raise-sexp): Fix typo in doc...
4cf33b6bd02 ; * doc/misc/modus-themes.org: Fix whitespace (bug#64548).
4821da1ad7f Fix show-paren-mode when the parentheses is partially vis...
419b4d44914 ; Improve documentation of with-restriction
be34e8294af ; * admin/git-bisect-start: Update failing commits
8e06809fccd Merge branch 'scratch/bug64391' into emacs-29
dbac8076057 * lisp/net/tramp.el (tramp-get-buffer-string): Stabilize.
01fb898420f Simplify after adding internal function to enter a labele...
b741dc7fcde Add internal function to enter a labeled restriction

# Conflicts:
#	doc/misc/modus-themes.org
---

748d2ed5158ebde03094aaf6956b39e5b96b70c7
diff --cc doc/misc/modus-themes.org
index 7809bd03918,8cfa22df923..ae760624b6f
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@@ -1,23 -1,23 +1,23 @@@
- #+title:                 Modus themes for GNU Emacs
- #+author:                Protesilaos Stavrou
- #+email:                 info@protesilaos.com
- #+language:              en
- #+options:               ':t toc:nil author:t email:t num:t
- #+startup:               content
- #+macro:                 stable-version 4.2.0
- #+macro:                 release-date 2023-05-30
- #+macro:                 development-version 4.3.0-dev
- #+macro:                 file @@texinfo:@file{@@$1@@texinfo:}@@
- #+macro:                 space @@texinfo:@: @@
- #+macro:                 kbd @@texinfo:@kbd{@@$1@@texinfo:}@@
- #+texinfo_filename:      modus-themes.info
- #+texinfo_dir_category:  Emacs misc features
- #+texinfo_dir_title:     Modus Themes: (modus-themes)
- #+texinfo_dir_desc:      Elegant, highly legible and customizable themes
- #+texinfo_header:        @set MAINTAINERSITE @uref{https://protesilaos.com,maintainer webpage}
- #+texinfo_header:        @set MAINTAINER Protesilaos Stavrou
- #+texinfo_header:        @set MAINTAINEREMAIL @email{info@protesilaos.com}
- #+texinfo_header:        @set MAINTAINERCONTACT @uref{mailto:info@protesilaos.com,contact the maintainer}
+ #+title: Modus themes for GNU Emacs
+ #+author: Protesilaos Stavrou
+ #+email: info@protesilaos.com
+ #+language: en
+ #+options: ':t toc:nil author:t email:t num:t
+ #+startup: content
 -#+macro: stable-version 3.0.0
 -#+macro: release-date 2022-10-28
 -#+macro: development-version 3.1.0-dev
++#+macro: stable-version 4.2.0
++#+macro: release-date 2023-05-30
++#+macro: development-version 4.3.0-dev
+ #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@
+ #+macro: space @@texinfo:@: @@
+ #+macro: kbd @@texinfo:@kbd{@@$1@@texinfo:}@@
+ #+texinfo_filename: modus-themes.info
+ #+texinfo_dir_category: Emacs misc features
+ #+texinfo_dir_title: Modus Themes: (modus-themes)
+ #+texinfo_dir_desc: Elegant, highly legible and customizable themes
+ #+texinfo_header: @set MAINTAINERSITE @uref{https://protesilaos.com,maintainer webpage}
+ #+texinfo_header: @set MAINTAINER Protesilaos Stavrou
+ #+texinfo_header: @set MAINTAINEREMAIL @email{info@protesilaos.com}
+ #+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:info@protesilaos.com,contact the maintainer}
  
  #+texinfo: @insertcopying