From 7b2ad8f199e52398c226413d515eccc589730ffa Mon Sep 17 00:00:00 2001 From: Mohsen Banan Date: Tue, 25 Apr 2023 14:49:28 -0700 Subject: [PATCH 1/4] ; Add missing <> line to TUTORIAL.fa. --- etc/tutorials/TUTORIAL.fa | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/etc/tutorials/TUTORIAL.fa b/etc/tutorials/TUTORIAL.fa index 5c9c0e1941a..1333b47cae2 100644 --- a/etc/tutorials/TUTORIAL.fa +++ b/etc/tutorials/TUTORIAL.fa @@ -15,13 +15,8 @@ برای خروج از یک فرمانِ ناکامل، C-g را تایپ کنید. برای توقف آموزش، C-x k و سپس در پاسخ به نشانگر را تایپ کنید. کاراکترهای ">>" در حاشیه سمت راست فرمانهایی را برای شمامشخص می کند. برای مثال: - - - +<<خطهای خالی بعد از خط بعدی توسط help-with-tutorial درج میشود>> [وسط صفحه برای اهداف آموزشی خالی مانده است. ادامه متن در زیر] - - - >> اکنون C-v را تایپ کنید (نمایش صفحه بعدی) تا یک صفحه کامل به پایین بروید. (این کار را با نگه داشتن کلید CONTROL و فشار کلید v انجام دهید). از این پس، لطفاً هر زمان که به انتهای صفحه رسیدید، این کار را انجام دهید. From b5ace2eed8066259b3aaef0c18652e280cdaefec Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 26 Apr 2023 09:39:35 +0300 Subject: [PATCH 2/4] Document problems with /bin/sh on Solaris 10 * etc/PROBLEMS (Solaris): Document problems with '/bin/sh'. Suggested by Paul Eggert . (Bug#63067) --- etc/PROBLEMS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 3c75e81b8b9..c0cb5b0d8bb 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2688,6 +2688,15 @@ Emacs so that it isn't compiled with '-O5'. We list bugs in current versions here. See also the section on legacy systems. +*** On Solaris 10, running 'configure' with "/bin/sh" produces errors. +The "/bin/sh" shell on Solaris is an ancient and non-POSIX shell, so +we recommend not to use it. The Emacs 'configure' script should find +an appropriate shell and re-exec itself with that shell, unless you +force it to use "/bin/sh" by using "CONFIG_SHELL=/bin/sh" on the +'configure' command line. So either don't use CONFIG_SHELL, or, if +you'd rather pick the shell yourself, choose "/bin/bash" or "/bin/ksh" +or "/usr/xpg4/bin/sh" instead. + *** On Solaris 10 sparc, Emacs crashes during the build while saving state. This was observed for Emacs 28.1 on Solaris 10 32-bit sparc, with Oracle Developer Studio 12.6 (Sun C 5.15). The failure was intermittent, From 10948948c12ec8698616c09f96225ee3b4fc32a5 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Wed, 26 Apr 2023 12:27:30 +0200 Subject: [PATCH 3/4] Improve outline-default-state docstring * lisp/outline.el (outline-default-state): Explain which functions are available to affect heading visibility. --- lisp/outline.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/outline.el b/lisp/outline.el index 0e90c59c285..97a51c9b92a 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -1500,8 +1500,10 @@ corresponding level. See `outline-default-rules' to customize visibility of the subtree at that level. If equal to a lambda function or function name, this function is -expected to toggle headings visibility, and will be -called without arguments after the mode is enabled." +expected to toggle headings visibility, and will be called +without arguments after the mode is enabled. Heading visibility +can be changed with functions such as `outline-show-subtree', +`outline-show-entry', `outline-hide-entry' etc." :version "29.1" :type '(choice (const :tag "Disabled" nil) (const :tag "Show all" outline-show-all) From af43f0a2954f4a4e735a6e3d159edc3392eaeb6c Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 21 Apr 2023 07:39:05 -0700 Subject: [PATCH 4/4] * doc/misc/erc.texi: Elaborate on upgrading via ELPA. --- doc/misc/erc.texi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index b80affbc954..ad30546c9d5 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -1477,10 +1477,30 @@ questions. You can also try the relatively quiet @samp{#erc}, on the same network, for more involved questions. @item +@anchor{Upgrading} You can check GNU ELPA between Emacs releases to see if a newer version is available that might contain a fix for your issue: @uref{https://elpa.gnu.org/packages/erc.html}. +To upgrade, run @kbd{M-x list-packages @key{RET}}. In the +@file{*Packages*} (@code{package-menu-mode}) buffer, click the +@samp{erc} package link for the desired version. If unsure, or if the +version column is too narrow to tell, try the bottom-most candidate. +In the resulting @code{help-mode} buffer, confirm the version and +click @samp{Install}. Make sure to restart Emacs before reconnecting +to IRC, and don't forget that you can roll back to the previous +version by running @kbd{M-x package-delete @key{RET}}. +@xref{Packages,,,emacs, the Emacs manual} for more information. + +In the rare instance you need an emergency fix or have volunteered to +test an edge feature between ERC releases, you can try adding +@samp{("devel" . "https://elpa.gnu.org/devel/")} to +@code{package-archives} prior to performing the steps above. For +this, you'll want to instead select a ``snapshot'' version from the +menu. Please be aware that when going this route, the latest changes +may not yet be available and you run the risk of incurring other bugs +and encountering unstable features. + @item To report a bug in ERC, use @kbd{M-x erc-bug}.