branch: externals/auctex
commit 44879847609f0ac14a18841a363012e5e979b8ca
Author: Ikumi Keita <ik...@ikumi.que.jp>
Commit: Ikumi Keita <ik...@ikumi.que.jp>
Adjust ConTeXt options (bug#70399)
* tex.el (TeX-command-list): Remove obsolete option "--texutil".
* context.el (ConTeXt-expand-options): Use "repeat" for synctex option
for the latest ConTeXt.
Don't add nonstop option when synctex option exists.
* doc/changes.texi: Mention the above changes.
---
context.el | 9 +++++++--
doc/changes.texi | 14 ++++++++++++++
tex.el | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/context.el b/context.el
index 29bbccd66a..0d5b9adbd1 100644
--- a/context.el
+++ b/context.el
@@ -1747,8 +1747,13 @@ Use `ConTeXt-Mark-version' to choose the command."
((string= ConTeXt-Mark-version "IV")
(concat
(if TeX-source-correlate-mode
- "--synctex=1 ")
- (unless TeX-interactive-mode
+ "--synctex=repeat ")
+ ;; Omit nonstop option when we set synctex option. According to
+ ;; Jim <zlists+cont...@jdvb.ca> in bug#70399 report,
+ ;; "if context is called with "--nonstopmode" (or "--nonstop")
+ ;; the "--synctex=..." request to create a synctex file is
+ ;; over-ridden."
+ (unless (or TeX-interactive-mode TeX-source-correlate-mode)
ConTeXt-texexec-option-nonstop)))
;; In any other case fall back on Mark II.
(t
diff --git a/doc/changes.texi b/doc/changes.texi
index 098195ac0a..cae91aa2fe 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -187,6 +187,20 @@ In Fold mode, the original source text is revealed when
you click the
folded portion by mouse. You can customize the detailed behavior by
new customize option @code{TeX-fold-auto-reveal}.
+@item
+@AUCTeX{} adjusts @ConTeXt{} option.
+@itemize @minus
+@item
+Obsolete option @option{--texutil} was removed.
+@item
+Now synctex option is @option{--synctex=repeat} instead of
+@option{--synctex=1} for @ConTeXt{}.
+@item
+@AUCTeX{} omits @option{--nonstop} option when
+@code{TeX-source-correlate-mode} is enabled because @command{context}
+ignores @option{--synctex} option if @option{--nonstop} is present.
+@end itemize
+
@item
@AUCTeX{} now requires GNU Emacs 27.1 or higher.
@end itemize
diff --git a/tex.el b/tex.el
index 2ab358756a..985cb71e9b 100644
--- a/tex.el
+++ b/tex.el
@@ -211,7 +211,7 @@ If nil, none is specified."
TeX-run-TeX nil (AmSTeX-mode) :help "Run AMSTeX")
;; support for ConTeXt --pg
;; first version of ConTeXt to support nonstopmode: 2003.2.10
- ("ConTeXt" "%(cntxcom) --once --texutil %(extraopts) %(execopts)%t"
+ ("ConTeXt" "%(cntxcom) --once %(extraopts) %(execopts)%t"
TeX-run-TeX nil (ConTeXt-mode) :help "Run ConTeXt once")
("ConTeXt Full" "%(cntxcom) %(extraopts) %(execopts)%t"
TeX-run-TeX nil
