From 1ce9da0048b41a42f661c71ab64b917ee66b30c2 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 6 Dec 2022 16:55:39 +0100 Subject: [PATCH 1/2] Backport commit 8fb2afe05 from Emacs ; Fix typos 8fb2afe051168b2eac2bba0ee102039d0af90a05 Stefan Kangas Thu Dec 8 07:17:47 2022 +0100 --- lisp/ox.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index 5c0a8f242..f6629cde4 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -2559,7 +2559,7 @@ variable and do not do anything that might alter it (like calling a major mode) to prevent data corruption. Also, do note that Emacs may jump into the created buffer if the original file buffer is closed and then re-opened. Making edits in the buffer copy may also trigger -Emacs save dialogue. Prefer using `org-export-with-buffer-copy' macro +Emacs save dialog. Prefer using `org-export-with-buffer-copy' macro when possible. When optional key `:to-buffer' is non-nil, copy into BUFFER. From c056afc153041d707c1463a522f78cd380171c96 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 8 Dec 2022 23:56:24 +0100 Subject: [PATCH 2/2] Backport commit 262670405 from Emacs ; Normalize GPLv3 license statements in new files 26267040549da6e7f8223bea3b5344d0d5bef527 Stefan Kangas Fri Dec 9 00:13:00 2022 +0100 --- lisp/oc-bibtex.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/oc-bibtex.el b/lisp/oc-bibtex.el index 33fba8c40..4d2297a82 100644 --- a/lisp/oc-bibtex.el +++ b/lisp/oc-bibtex.el @@ -6,18 +6,18 @@ ;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . +;; along with GNU Emacs. If not, see . ;;; Commentary: