[AUCTeX-diffs] GNU AUCTeX branch, master, updated. f9356664c8b0cf0e610010b86b255fa67ed9432f

[Ikumi Keita]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  f9356664c8b0cf0e610010b86b255fa67ed9432f (commit)
      from  b7d45e19c69da59026129e38289cd195c736bd46 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9356664c8b0cf0e610010b86b255fa67ed9432f
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Thu Mar 3 20:57:14 2022 +0900

    Update documentation
    
    * doc/faq.texi: Mention how to invoke vanilla emacs for EPLA
    installation and on windows.
    * latex.el (LaTeX-maybe-install-toolbar):
    * plain-tex.el (plain-TeX-maybe-install-toolbar):
    Fix typos.

diff --git a/doc/faq.texi b/doc/faq.texi
index a9b2aa2d..a81bfadf 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -43,9 +43,26 @@ in the bug report.
 
 Second, you can try to figure out if something in your personal or site
 configuration triggers the error by starting Emacs without such
-customizations.  You can do this by invoking Emacs with the command line
-@samp{emacs -q -no-site-file -l auctex}.  The @option{-l} option
-loads @file{auctex.el} which you normally do in your init file.  After you
+customizations.  You can do this by invoking Emacs with the following
+command line, depending on the installation scheme of @AUCTeX{} and your
+@acronym{OS}:
+@itemize
+@item
+If you installed @AUCTeX{} from @acronym{ELPA}, use @samp{emacs -q
+-no-site-file --eval "(progn (setq package-load-list '((auctex t)))
+(package-initialize))"}.  The @option{--eval} activates only @AUCTeX{}
+among all installed @acronym{EPLA} packages.
+@item
+If you installed @AUCTeX{} via traditional
+@command{configure}--@command{make} scheme, use @samp{emacs -q
+-no-site-file -l auctex}.  The @option{-l} option loads @file{auctex.el}
+which you normally do in your init file.
+@item
+In both above cases, use @samp{runemacs} instead of @samp{emacs} on
+windows.
+@end itemize
+
+After you
 have started Emacs like this, you can load the file triggering the
 error.  If everything is working now, you know that you have to search
 either in the site configuration file or your personal init file for
diff --git a/latex.el b/latex.el
index 56a7a300..d48522fe 100644
--- a/latex.el
+++ b/latex.el
@@ -6464,8 +6464,8 @@ If prefix argument FORCE is non-nil, always insert a 
regular hyphen."
 
 (defun LaTeX-maybe-install-toolbar ()
   "Conditionally install tool bar buttons for LaTeX mode.
-Install tool bar if `LaTeX-enable-toolbar' and `tool-bar-mode' is
-non-nil."
+Install tool bar if `LaTeX-enable-toolbar' and `tool-bar-mode'
+are non-nil."
   (when (and LaTeX-enable-toolbar tool-bar-mode)
     ;; Defined in `tex-bar.el':
     (LaTeX-install-toolbar)))
diff --git a/plain-tex.el b/plain-tex.el
index 7feb14d6..dd55edee 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -41,7 +41,7 @@
 (defun plain-TeX-maybe-install-toolbar ()
   "Conditionally install tool bar buttons for plain TeX mode.
 Install tool bar if `plain-TeX-enable-toolbar' and
-`tool-bar-mode' is non-nil."
+`tool-bar-mode' are non-nil."
   (when (and plain-TeX-enable-toolbar tool-bar-mode)
     ;; Defined in `tex-bar.el':
     (TeX-install-toolbar)))

-----------------------------------------------------------------------

Summary of changes:
 doc/faq.texi | 23 ++++++++++++++++++++---
 latex.el     |  4 ++--
 plain-tex.el |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX