diff options
| author | Stefan Kangas | 2023-03-04 06:30:12 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2023-03-04 06:30:12 +0100 |
| commit | 49e021e5be943477329b065fbff76862ea832acc (patch) | |
| tree | f53a4ff46c15b1fb026c422c68fc3f3b91db6b2e /doc/misc | |
| parent | 682fb19dc3215dde4b3b0330e5b513e7102c531f (diff) | |
| parent | bd5115e13479b1d81d6aa09efe362ad14d53c3c6 (diff) | |
| download | emacs-49e021e5be943477329b065fbff76862ea832acc.tar.gz emacs-49e021e5be943477329b065fbff76862ea832acc.zip | |
Merge from origin/emacs-29
bd5115e1347 Remove Eglot activation check from find-file-hook
adc04ad5247 * src/intervals.c (set_intervals_multibyte_1): Fix bug#61887
b3e930d328e Revert inadvertent change to lisp/icomplete.el in previou...
da8e4b6fe43 Revert previous change in go-ts-mode.el
7548446194a Release ERC 5.5
585faf4c173 ; More doc improvements for OClosures
2840895c1ae Don't create GUI frames in batch sessions
452b5ed1030 ; Fix wrong error name in erc-server-908 doc string.
1e9484f2fd1 ; * etc/ERC-NEWS: Mention more deprecations.
119b3a4dba1 Minor copyedits of documentation of OClosures
3a651773d29 Eglot: pay better attention to hints' paddingLeft/Right (...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/erc.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index d5ec0f48e1c..b80affbc954 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | @c %**start of header | 2 | @c %**start of header |
| 3 | @setfilename ../../info/erc.info | 3 | @setfilename ../../info/erc.info |
| 4 | @settitle ERC Manual | 4 | @settitle ERC Manual |
| 5 | @set ERCVER 5.4.1 | 5 | @set ERCVER 5.5 |
| 6 | @set ERCDIST as distributed with Emacs @value{EMACSVER} | 6 | @set ERCDIST as distributed with Emacs @value{EMACSVER} |
| 7 | @include docstyle.texi | 7 | @include docstyle.texi |
| 8 | @syncodeindex fn cp | 8 | @syncodeindex fn cp |