summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2023-05-02 08:50:09 -0400
committerEli Zaretskii <eliz@gnu.org>2023-05-02 08:50:09 -0400
commitdaf602a5c8ec9e5d94f5e1e412182760a02c2505 (patch)
tree84b0c694f5ed9a911011078e8b0f1df18bc9ca71 /etc
parent4f44c56c867b99bc7b813d8b104b9939479f86f2 (diff)
parent46392c1623bc3f9764b8c7df293a89fcd47ab0ad (diff)
downloademacs-daf602a5c8ec9e5d94f5e1e412182760a02c2505.tar.gz
Merge from origin/emacs-29
46392c1623b Fix vertical-motion when tab-line is displayed in a window 0e52beeacea Update to Org 9.6.5-3-g2993f4 dd21003878d Prevent generating empty autoload files 2bcf11d0efe * lisp/org/org-macs.el (org--inhibit-version-check): Fix ... ca43435816b Fix redisplay of mode line after its format changes from nil 610a7657e0a Fix c-ts-mode--emacs-c-range-query 7f94558b775 Improve documentation of warnings 5a3f0e2c558 ; Doc fix in c-ts-mode.el 21361d05635 Fix FOR_EACH_TAIL fontification (bug#62951) d0df3404fde ; * etc/EGLOT-NEWS: chsharp-le -> csharp-ls c229e83c3ce ; * etc/EGLOT-NEWS (https): Elglot -> Eglot. b4f2f499783 Fix documentation of libxml-parse-* functions 5dd784961d1 ; * src/treesit.c (syms_of_treesit): Fix error messages. ddfa0d8da9a ; Remove some leftover text
Diffstat (limited to 'etc')
-rw-r--r--etc/EGLOT-NEWS4
-rw-r--r--etc/refcards/orgcard.tex2
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index 27796adef4b..7a1aaffaea3 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -119,7 +119,7 @@ The position-encoding scheme (UTF-8, UTF-16 or UTF-32) can now
be negotiated with the server.
** More of the user's Eldoc configuration is respected.
-This change addresses the problems reported in many Elglot reports
+This change addresses the problems reported in many Eglot reports
dating back to early 2021 at least.
(github#646, github#894, github#920, github#1031, github#1171).
@@ -165,7 +165,7 @@ systems (bug#58790).
These modes are usually handled by the same server that handles the
"classical mode".
-** New servers chsharp-ls and texlab added to 'eglot-server-programs'.
+** New servers csharp-ls and texlab added to 'eglot-server-programs'.
** Assorted bugfixes.
(bug#59824, bug#59338)
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index c5d112dba72..6ee77758e06 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{9.6.4}
+\def\orgversionnumber{9.6.5}
\def\versionyear{2023} % latest update
\input emacsver.tex