feature/android 7c504d91d18: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 7c504d91d1879cd8fb9bf656734816712237b9f8
Merge: 83a9e4cee15 521386f9201
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 admin/charsets/Makefile.in |  2 +-
 admin/charsets/mapconv     |  3 ++-
 doc/misc/erc.texi          | 20 ++++++++++++++++++++
 etc/PROBLEMS               |  9 +++++++++
 etc/tutorials/TUTORIAL.fa  |  7 +------
 lisp/outline.el            |  6 ++++--
 6 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index 4c62bb19dc5..efb9106adad 100644
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -181,7 +181,7 @@ ${charsetdir}/GB180304.map: ${charsetdir}/GB180302.map 
${gb180304}
        ${AM_V_GEN}$(AWK) -f ${gb180304} < $< > $@
 
 ${charsetdir}/JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz ${mapconv} 
${compact}
-       ${AM_V_GEN}(${mapconv} $< '/^<.*[       ]\/x[0-9]/' GLIBC-1 ${compact} 
&& \
+       ${AM_V_GEN}(${run_mapconv} $< '/^<.*[   ]\/x[0-9]/' GLIBC-1 ${compact} 
&& \
          echo "# Generated by hand" && \
          echo "0xA1-0xDF 0xFF61" ) > $@
 
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 4a68d3da53b..19e2ff8d8f7 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -38,7 +38,8 @@
 ## So that eg [A-F] as used by KANJI-DATABASE branch below works as expected.
 ## Otherwise with LANG=en_US.utf8, CNS-6.map was generated with a
 ## bogus entry.  By experiment, LC_COLLATE=C was not enough.
-export LC_ALL=C
+LC_ALL=C
+export LC_ALL
 
 BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename
 FILE="admin/charsets/mapfiles/$BASE"
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index e92bf576e75..1f343fc8529 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}.
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 67ff2c1115e..c4363310541 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2708,6 +2708,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,
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 و سپس در پاسخ به نشانگر <Return> را تایپ کنید.
 کاراکترهای ">>" در حاشیه سمت راست فرمانهایی را برای شمامشخص می کند. برای مثال:
-
-
-
+<<خطهای خالی بعد از خط بعدی توسط help-with-tutorial درج میشود>>
 [وسط صفحه برای اهداف آموزشی خالی مانده است. ادامه متن در زیر]
-
-
-
 >> اکنون C-v را تایپ کنید (نمایش صفحه بعدی) تا یک صفحه کامل به پایین بروید.
       (این کار را با نگه داشتن کلید CONTROL و فشار کلید v انجام دهید).
       از این پس، لطفاً هر زمان که به انتهای صفحه رسیدید، این کار را انجام دهید.
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)