diff options
| author | Po Lu | 2022-12-11 09:34:02 +0800 |
|---|---|---|
| committer | Po Lu | 2022-12-11 09:34:02 +0800 |
| commit | 13310643cd642bb1403bb2f8a5c27d1929725897 (patch) | |
| tree | dafc767117c64ade8ce5b53487a4874450fb5d9b /src | |
| parent | 0878279809c8acc8de703ae9774e89695b4ffc37 (diff) | |
| parent | 5fbd12ff49410bbc150e677b527ca4939ffcaf5f (diff) | |
| download | emacs-13310643cd642bb1403bb2f8a5c27d1929725897.tar.gz emacs-13310643cd642bb1403bb2f8a5c27d1929725897.zip | |
Merge from origin/emacs-29
5fbd12ff494 Adapt manual names in emacs-news-mode
b36bc692671 ; * etc/NEWS: Fix typos.
f626b9f3856 ; * doc/misc/use-package.texi: Fix indexing.
56a6712bd6f ; * lisp/erc/erc.el (erc-default-target): Fix comment.
dcf69a1da4a Respect some spaces in auth-source-pass--match-regexp
acd462b0306 ; Improve the use-package manual
801c1c22de8 ; Prefer HTTPS to HTTP in some URLs
74a009dd96a Eglot: Handle LSP progress with Emacs progress reporters ...
0cfeb1c2bc9 Eglot: cleanup whitespace and indentation
465a9e78b96 Better test-custom-opts diagnostics
bdbb7099784 ; Fix groff warnings in man pages
d3d9676bf88 New script admin/check-man-pages
c2aea9d1323 ; Mention flush-lines in kill-matching-lines docstring
f5c3585e4dd ; Fix typos
58a483960dd ; Improve use-package-autoload-keymap docstring
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/itree.c | 2 | ||||
| -rw-r--r-- | src/itree.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/itree.c b/src/itree.c index 04fa9e827a2..975f3a8e4fb 100644 --- a/src/itree.c +++ b/src/itree.c | |||
| @@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
| 16 | 16 | ||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | #include <config.h> | 20 | #include <config.h> |
| 21 | #include <math.h> | 21 | #include <math.h> |
diff --git a/src/itree.h b/src/itree.h index 248ea9b84d2..f1e2bf3bfde 100644 --- a/src/itree.h +++ b/src/itree.h | |||
| @@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
| 16 | 16 | ||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | #ifndef ITREE_H | 20 | #ifndef ITREE_H |
| 21 | #define ITREE_H | 21 | #define ITREE_H |