[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 7606a49da2b1c22c9ebae
|
From: |
Stefan Monnier |
|
Subject: |
[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 7606a49da2b1c22c9ebaeb734e77b4504c91b451 |
|
Date: |
Wed, 24 Mar 2021 22:02:43 -0400 (EDT) |
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 7606a49da2b1c22c9ebaeb734e77b4504c91b451 (commit)
via 6ca79102471a715cab87765658f42b5a720bea4a (commit)
via 2852adff623c3ad60f72c2288c8b86036b436b9b (commit)
via d7bdc79cafa1bca2a0da5caa9aa7911393175366 (commit)
via 00ef5975113bbb31a2dd9837d276260cbd5878bd (commit)
via 7a684085261992852b3b03c30e12d42e43154df5 (commit)
via e6910bb7c5357a6fe6d3919602a46aea41f480f1 (commit)
via 8de4670e3446976b53e95c4ca957f0cefdd99e03 (commit)
via 1d188f59c3c413e4dec4bd34ce0dd320ba3a7fb8 (commit)
via 7d896288610577f1a9a5b76c3a6aa0211d5d2249 (commit)
via 7c2f403f5c39a314bc0b2d9e1e7c1507f55983d1 (commit)
from c037cac4163c29776d78f795812d706f67609193 (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 7606a49da2b1c22c9ebaeb734e77b4504c91b451
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 22:56:59 2021 -0400
Use UTF-8 for all ELisp files
UTF-8 is the default encoding used for ELisp files nowadays, so
convert the few remaining exceptions.
* tests/japanese/preview-latex.el:
* tex-jp.el: Remove `coding:` cookie and re-encode into utf-8.
diff --git a/tests/japanese/preview-latex.el b/tests/japanese/preview-latex.el
index 0d03982..9b5f395 100644
--- a/tests/japanese/preview-latex.el
+++ b/tests/japanese/preview-latex.el
@@ -191,20 +191,20 @@ Did the image come out at the correct position? ")))
String encoded in `shift_jis' can have regexp meta characters in it."
(let (case-fold-search
(buffer-file-coding-system 'shift_jis))
- (dolist (str '("$BI=(B(1)" "$BM=(B{a}" "$BG=(B|" "{$B$"(B}
%$BG=(B" "$B%"!<%9(B" "$B7?(B"))
+ (dolist (str '("表(1)" "äº{a}" "è½|" "{ã} %è½" "ã¢ã¼ã¹" "å"))
(should (string-match (preview-error-quote str) str)))))
(ert-deftest japanese-preview-decode-^^ab ()
"`preview--decode-^^ab' doesn't leave regexp meta characters in results."
(let (case-fold-search)
- ;; "$B$"(B" is encoded as \x82 \xa0 in SJIS.
- (should (string= (preview--decode-^^ab "^^82^^a0" 'shift_jis) "$B$"(B"))
- ;; "$BI=(B" is encoded as \x95 '\' in SJIS.
- (should (string= (preview--decode-^^ab "^^95\\" 'shift_jis) "$BI=(B"))
- ;; "$B!<(B" is encoded as \x81 '[' in SJIS.
- (should (string= (preview--decode-^^ab "^^81[^^Ab" 'shift_jis)
"$B!<(B^^Ab"))
- ;; "$B7?(B" is encoded as \x8c '^' in SJIS.
- (should (string= (preview--decode-^^ab "$B7?(B^ab" 'shift_jis)
"$B7?(B^ab"))))
+ ;; "ã" is encoded as \x82 \xa0 in SJIS.
+ (should (string= (preview--decode-^^ab "^^82^^a0" 'shift_jis) "ã"))
+ ;; "表" is encoded as \x95 '\' in SJIS.
+ (should (string= (preview--decode-^^ab "^^95\\" 'shift_jis) "表"))
+ ;; "ã¼" is encoded as \x81 '[' in SJIS.
+ (should (string= (preview--decode-^^ab "^^81[^^Ab" 'shift_jis) "ã¼^^Ab"))
+ ;; "å" is encoded as \x8c '^' in SJIS.
+ (should (string= (preview--decode-^^ab "å^ab" 'shift_jis) "å^ab"))))
(ert-deftest japanese-preview-convert-^^ab ()
"`preview--convert-^^ab' converts ^^ab to raw 8bits and leaves ^^Ab."
@@ -282,7 +282,3 @@ String encoded in `shift_jis' can have regexp meta
characters in it."
(kill-buffer))))
;;; preview-latex.el ends here
-
-;; Local Variables:
-;; coding: iso-2022-jp
-;; End:
diff --git a/tex-jp.el b/tex-jp.el
index d6308c5..9980815 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -63,22 +63,22 @@ systems are determined by their values regardless of the
kanji option."
(jtex "jTeX" "jtex" "jlatex" nil)
(uptex "upTeX" "euptex" "uplatex" "euptex"))))
-;; customize option $B$N=i4|CM$d(B saved value
$B$=$N$b$N$r2~JQ$7$J$$$h$&$K(B
-;; $B$9$k$?$a!"(Bsetcar $B$N;HMQ$OHr$1$k!#(B
+;; customize option ã®åæå¤ã saved value
ãã®ãã®ãæ¹å¤ããªãããã«
+;; ãããããsetcar ã®ä½¿ç¨ã¯é¿ããã
(setq TeX-command-list
- ;; `TeX-command-list' $B$HF1$89=B$$N?7$7$$(B list $B$r:n$k!#(B
- ;; $B3FMWAG$N(B list $B$r(B l $B$H$7$F!"(Bl
$B$=$N$b$N$r;H$C$?$j!"(Bl $B$r(B
- ;; $B<c43=$@5$7$?(B list $B$r:n$C$?$j$7$F(B `mapcar' $B$G=8$a$k!#(B
+ ;; `TeX-command-list' ã¨åãæ§é ã®æ°ãã list ãä½ãã
+ ;; åè¦ç´ ã® list ã l ã¨ãã¦ãl ãã®ãã®ã使ã£ãããl
ã
+ ;; è¥å¹²ä¿®æ£ãã list ãä½ã£ããã㦠`mapcar' ã§éããã
(mapcar
(lambda (l)
(cond
- ;; l $B$NBh(B1$BMWAG$,(B "BibTeX" $B$d(B "Index"
$B$@$C$?$i!"(Bl $B$NBh(B2$BMWAG(B
- ;; $B$@$1$rF~$lBX$($?JL$N(B list $B$r:n$k!#(B
+ ;; l ã®ç¬¬1è¦ç´ ã "BibTeX" ã "Index" ã ã£ãããl
ã®ç¬¬2è¦ç´
+ ;; ã ããå
¥ãæ¿ããå¥ã® list ãä½ãã
((equal (car l) "BibTeX")
(append (list (car l) "%(bibtex) %s") (cddr l)))
((equal (car l) "Index")
(append (list (car l) "%(makeindex) %s") (cddr l)))
- ;; $B$=$l0J30$N>l9g$O(B l $B$=$N$b$N$r;H$&!#(B
+ ;; ãã以å¤ã®å ´å㯠l ãã®ãã®ã使ãã
(t
l)))
TeX-command-list))
@@ -93,53 +93,53 @@ systems are determined by their values regardless of the
kanji option."
(append
TeX-expand-list-builtin
'(
- ;; -kanji $B%*%W%7%g%s$NJ8;zNs$r:n$k!#(B
+ ;; -kanji ãªãã·ã§ã³ã®æååãä½ãã
("%(kanjiopt)" (lambda ()
(if japanese-TeX-use-kanji-opt-flag
(let ((str (japanese-TeX-get-encoding-string)))
(if str (format " -kanji=%s " str) ""))
"")))
- ;; pbibtex, jbibtex, upbibtex, bibtex
$B$NCf$+$iE,@Z$J$b$N$rA*Br$9$k!#(B
+ ;; pbibtex, jbibtex, upbibtex, bibtex
ã®ä¸ããé©åãªãã®ãé¸æããã
("%(bibtex)" (lambda ()
(cond
((eq TeX-engine 'ptex)
- ;; pLaTeX $BMQF|K\8l(B BibTeX $B$,(B pbibtex
$B$K$J$C$?(B
- ;; $B$N$OHf3SE*:G6a$J$N$G!"$^$@(B jbibtex
$B$N?M$b$=(B
- ;; $B$l$J$j$K$$$k$@$m$&!#(B
+ ;; pLaTeX ç¨æ¥æ¬èª BibTeX ã pbibtex ã«ãªã£ã
+ ;; ã®ã¯æ¯è¼çæè¿ãªã®ã§ãã¾ã jbibtex
ã®äººãã
+ ;; ããªãã«ããã ããã
(if (executable-find "pbibtex")
"pbibtex %(kanjiopt)" "jbibtex"))
((eq TeX-engine 'jtex) "jbibtex")
((eq TeX-engine 'uptex) "upbibtex")
(t "bibtex"))))
- ;; mendex, upmendex, makeindex $B$N$&$AE,@Z$J$b$N$rA*Br$9$k!#(B
+ ;; mendex, upmendex, makeindex
ã®ãã¡é©åãªãã®ãé¸æããã
("%(makeindex)" (lambda ()
(cond
- ;; upmendex $B$O(B XeLaTeX $B$d(B LuaLaTeX
$B$G$b(B
- ;; $B;H$($k!#(Bsee
+ ;; upmendex 㯠XeLaTeX ã LuaLaTeX ã§ã
+ ;; 使ãããsee
;;
http://www.t-lab.opal.ne.jp/tex/README_upmendex.md
- ;; FIXME: XeLaTeX $B$d(B LuaLaTeX $B$@$1$r;H$&(B
- ;; $BMxMQ<T$N>l9g$O!"(Btex-jp $B$O(B load
$B$5$l$J(B
- ;; $B$$$N$G$3$N@_Dj$O0UL#$,$J$$!#(B
+ ;; FIXME: XeLaTeX ã LuaLaTeX ã ãã使ã
+ ;; å©ç¨è
ã®å ´åã¯ãtex-jp 㯠load ãããª
+ ;; ãã®ã§ãã®è¨å®ã¯æå³ããªãã
((and (memq TeX-engine '(uptex xetex luatex))
(executable-find "upmendex"))
"upmendex %(dic)")
((memq TeX-engine '(ptex uptex))
"mendex %(mendexkopt) %(dic)")
(t "makeindex"))))
- ;; mendex $BMQF|K\8l%3!<%I%*%W%7%g%s!#(B
+ ;; mendex ç¨æ¥æ¬èªã³ã¼ããªãã·ã§ã³ã
("%(mendexkopt)" (lambda ()
(if japanese-TeX-use-kanji-opt-flag
(let ((str (japanese-TeX-get-encoding-string)))
- ;; $B#1J8;zL\$rBgJ8;z$K!#(B
+ ;; ï¼æåç®ã大æåã«ã
(if str (format " -%c " (upcase (aref str 0)))
""))
"")))
- ;; (up)mendex $BMQ<-=q;XDj%*%W%7%g%s!#(B
+ ;; (up)mendex ç¨è¾æ¸æå®ãªãã·ã§ã³ã
("%(dic)" (lambda ()
- ;; master $B$HF1L>$G3HD%;R$,(B .dic
$B$N%U%!%$%k$,$"$l$P(B
- ;; $B$=$l$r<-=qL>$H$7$F(B -d $B%*%W%7%g%s$KM?$($k!#(B
- ;; C-c C-r $BEy$N>l9g(B _region_.dic $B$K$9$Y$-$G$O(B
- ;; $B$J$$$N$G!"(B`TeX-master-file' $B$rM[$K8F$V!#(B
+ ;; master ã¨ååã§æ¡å¼µåã .dic
ã®ãã¡ã¤ã«ãããã°
+ ;; ãããè¾æ¸åã¨ã㦠-d
ãªãã·ã§ã³ã«ä¸ããã
+ ;; C-c C-r çã®å ´å _region_.dic ã«ãã¹ãã§ã¯
+ ;; ãªãã®ã§ã`TeX-master-file' ãé½ã«å¼ã¶ã
(let ((dicname (TeX-master-file "dic" t)))
(if (file-exists-p
(expand-file-name dicname (TeX-master-directory)))
@@ -150,10 +150,10 @@ systems are determined by their values regardless of the
kanji option."
(+ TeX-expand-pos (length result)))
result)
""))))
- ;; pxdvi $B$H(B %(o?)xdvi $B$NE,@Z$JJ}$rA*Br$9$k!#(B
+ ;; pxdvi 㨠%(o?)xdvi ã®é©åãªæ¹ãé¸æããã
("%(xdvi)" (lambda ()
- ;; pxdvi $B$O(B ptex, jtex $B6&MQ$J$N$G!"(B
- ;; japanese mode $B$+$I$&$+$GH=Dj$9$l$P(B OK$B!#(B
+ ;; pxdvi 㯠ptex, jtex å
±ç¨ãªã®ã§ã
+ ;; japanese mode ãã©ããã§å¤å®ããã° OKã
(if (and japanese-TeX-mode (executable-find "pxdvi"))
"pxdvi" "%(o?)xdvi"))))))
@@ -171,8 +171,8 @@ systems are determined by their values regardless of the
kanji option."
(or (TeX-match-style regex)
(and (fboundp 'LaTeX-match-class-option)
(LaTeX-match-class-option regex)))))
- ;; jarticle $B$J$I$@$H(B b4paper, b5paper $B$O(B JIS B
$B7ONs!#(B
- ;; j-article $B$J$I$NJ}$K$O(B a4j, b5j
$B$H$$$C$?%*%W%7%g%s$O$J$$!#(B
+ ;; jarticle ãªã©ã 㨠b4paper, b5paper 㯠JIS B ç³»åã
+ ;; j-article ãªã©ã®æ¹ã«ã¯ a4j, b5j
ã¨ãã£ããªãã·ã§ã³ã¯ãªãã
(paper-b5 ; ISO B5
(and (fboundp 'LaTeX-match-class-option)
(LaTeX-match-class-option "\\`b5paper\\'")
@@ -182,14 +182,14 @@ systems are determined by their values regardless of the
kanji option."
(or (LaTeX-match-class-option "\\`b5j\\'")
(and (LaTeX-match-class-option "\\`b5paper\\'")
(TeX-match-style
"\\`u?[jt]s?\\(?:article\\|report\\|book\\)\\'")))))
- ;; article $B$J$I$K$O(B b4paper $B$H$$$&%*%W%7%g%s$O$J$$!#(B
- ;; b4paper $B$H$$$&%*%W%7%g%s$,$"$C$?$i(B JIS B4 $B$H8+$J$9!#(B
+ ;; article ãªã©ã«ã¯ b4paper ã¨ãããªãã·ã§ã³ã¯ãªãã
+ ;; b4paper ã¨ãããªãã·ã§ã³ããã£ãã JIS B4
ã¨è¦ãªãã
(paper-b4jis
(and (fboundp 'LaTeX-match-class-option)
(LaTeX-match-class-option "\\`\\(?:b4j\\|b4paper\\)\\'"))))
- ;; jsclasses $B$@$HB>$K$b$b$C$HH=7?$N%*%W%7%g%s$,$"$k$,!"A4ItLLE](B
- ;; $B8+$F$k$H%-%j$,$J$$$N$G!"$3$l$/$i$$$G$$$$$@$m$&!#(B
- ;; jsarticle.el $B$d(B jsbook.el
$B$GDI2CJ,$N=hM}$r;E9~$a$P$$$$$N$+$bCN$l$J$$!#(B
+ ;; jsclasses ã
ã¨ä»ã«ããã£ã¨å¤åã®ãªãã·ã§ã³ãããããå
¨é¨é¢å
+ ;; è¦ã¦ãã¨ããªããªãã®ã§ããããããã§ããã
ããã
+ ;; jsarticle.el ã jsbook.el ã§è¿½å
åã®å¦çãä»è¾¼ãã°ããã®ããç¥ããªãã
TeX-view-predicate-list-builtin))
(unless (memq system-type '(windows-nt darwin))
@@ -201,9 +201,9 @@ systems are determined by their values regardless of the
kanji option."
(append TeX-view-program-list-builtin
'(("MuPDF" "mupdf %o" "mupdf")))))
-;; $B$3$l$O(B tex.el $B$K<h$jF~$l$F$b$i$&$N$OFq$7$$$+!)(B
-;; tex-jp.el $B$,FI$_9~$^$l$k$@$1$G!"(Bdvi viewer $B$N%G%U%)%k%H$,(B
dviout $B$K(B
-;; $B$J$C$F$7$^$&$N$ODq93$,Bg$-$$$+$b!#(B
+;; ãã㯠tex.el ã«åãå
¥ãã¦ãããã®ã¯é£ãããï¼
+;; tex-jp.el ãèªã¿è¾¼ã¾ããã ãã§ãdvi viewer ã®ããã©ã«ãã
dviout ã«
+;; ãªã£ã¦ãã¾ãã®ã¯æµæã大ããããã
(unless (get 'TeX-view-program-selection 'saved-value)
(if (eq system-type 'windows-nt)
(setq TeX-view-program-selection
@@ -265,8 +265,8 @@ See also a user custom option
`TeX-japanese-process-input-coding-system'."
(setq LaTeX-style-list
(append japanese-LaTeX-style-list LaTeX-style-list))
-;; text$B!A7O$NL@D+BN!&%4%7%C%/BN;XDj%3%^%s%I$O(B jLaTeX
$B$K$O$J$$$h$&$G!"(B
-;; (u)pLaTeX $B$G$7$+;H$($J$$$,!"LdBj$K$J$k$3$H$O$J$$$@$m$&!#(B
+;; textãç³»ã®ææä½ã»ã´ã·ãã¯ä½æå®ã³ãã³ã㯠jLaTeX
ã«ã¯ãªãããã§ã
+;; (u)pLaTeX ã§ãã使ããªãããåé¡ã«ãªããã¨ã¯ãªãã
ããã
(setq LaTeX-font-list
(append '((?m "\\textmc{" "}" "\\mathmc{" "}")
(?g "\\textgt{" "}" "\\mathgt{" "}"))
@@ -278,14 +278,14 @@ See also a user custom option
`TeX-japanese-process-input-coding-system'."
"Set proper coding system for japanese TeX PROCESS."
(with-current-buffer TeX-command-buffer
(when japanese-TeX-mode
- ;; TeX-engine $B$,(B ptex, jtex, uptex
$B$N$$$:$l$+$G$"$k>l9g$N$_9M$((B
- ;; $B$k!#(Bluatex-ja $B$J$I$N>l9g$O$=$b$=$b$?$@$N(B latex-mode
$B$G$h$/!"(B
- ;; $B$o$6$o$6(B japanese-latex-mode $B$K$9$kI,MW$,$J$$!#(B
+ ;; TeX-engine ã ptex, jtex, uptex ã®ããããã§ããå
´åã®ã¿èã
+ ;; ããluatex-ja ãªã©ã®å ´åã¯ãããããã ã® latex-mode
ã§ããã
+ ;; ãããã japanese-latex-mode ã«ããå¿
è¦ããªãã
- ;; FIXME: $B0J2<$N=hM}$O(B tex engine
$B$rBP>]$H$9$k>l9g$7$+9M$($F$$$J$$!#(B
- ;; bibtex $B$d(B mendex
$BEy$NJd=u%D!<%k$N>l9g$O@5$7$/$J$$=hM}$+$b$7$l$J$$!#(B
+ ;; FIXME: 以ä¸ã®å¦ç㯠tex engine ã対象ã¨ããå
´åããèãã¦ããªãã
+ ;; bibtex ã mendex çã®è£å©ãã¼ã«ã®å
´åã¯æ£ãããªãå¦çãããããªãã
(let*
- ;; -kanji $B%*%W%7%g%s$"$j$N;~$NJ8;z%3!<%I!#(B
+ ;; -kanji ãªãã·ã§ã³ããã®æã®æåã³ã¼ãã
((kanji (and japanese-TeX-use-kanji-opt-flag
(let ((str (japanese-TeX-get-encoding-string)))
(cond
@@ -294,61 +294,61 @@ See also a user custom option
`TeX-japanese-process-input-coding-system'."
((equal str "sjis") 'shift_jis)
((equal str "utf8") 'utf-8)))))
- ;; process $B$+$i$N=PNO$NJ8;z%3!<%I!#(B
+ ;; process ããã®åºåã®æåã³ã¼ãã
(dec (cond
- ;; windows $B$H(B mac $B$N>l9g!#(B
+ ;; windows 㨠mac ã®å ´åã
((memq system-type '(windows-nt darwin))
(cond
- ;; ptex $B$J$i(B mac $B$O(B utf-8$B!#(B
- ;; windows $B$G(B -kanji
$B%*%W%7%g%s$"$j$N;~$O$=$NJ8;z%3!<%I!"(B
- ;; $B$J$7$N;~$O(B sjis$B!#(B
- ;; texlive 2018 $B$+$i$O(B sjis $B$G$O$J$/(B utf-8
$B$K$J$C$?$N$G(B
- ;; $B$=$A$i$K9g$o$;$k!#(B
+ ;; ptex ãªã mac 㯠utf-8ã
+ ;; windows 㧠-kanji
ãªãã·ã§ã³ããã®æã¯ãã®æåã³ã¼ãã
+ ;; ãªãã®æ㯠sjisã
+ ;; texlive 2018 ãã㯠sjis ã§ã¯ãªã utf-8
ã«ãªã£ãã®ã§
+ ;; ãã¡ãã«åãããã
((eq TeX-engine 'ptex)
(cond ((eq system-type 'darwin)
'utf-8)
((and japanese-TeX-use-kanji-opt-flag kanji)
kanji)
(t 'utf-8)))
- ;; jtex $B$J$i(B sjis $B$K8GDj$9$k!#(B
+ ;; jtex ãªã sjis ã«åºå®ããã
((eq TeX-engine 'jtex)
'shift_jis)
- ;; uptex $B$J$i(B utf-8 $B$K8GDj$9$k!#(B
+ ;; uptex ãªã utf-8 ã«åºå®ããã
(t
'utf-8)))
- ;; unix $B$N>l9g!#(B
+ ;; unix ã®å ´åã
(t
- ;; jtex $B$J$i(B euc $B$K8GDj$9$k!#(B
+ ;; jtex ãªã euc ã«åºå®ããã
(cond
((eq TeX-engine 'jtex)
'euc-jp)
- ;; $B$=$l0J30$O!"(Buptex $B$G$b(B locale $B$K=>$&!#(B
- ;; $B$?$@$7!"(Blocale $B$,F|K\8l$r%5%]!<%H$7$J$$>l9g$O(B
- ;; euc $B$K8GDj$9$k!#(B
+ ;; ãã以å¤ã¯ãuptex ã§ã locale ã«å¾ãã
+ ;; ãã ããlocale ãæ¥æ¬èªããµãã¼ãããªãå
´åã¯
+ ;; euc ã«åºå®ããã
(t
(let ((lcs locale-coding-system))
(if (and lcs (japanese-TeX-coding-ejsu lcs))
lcs 'euc-jp)))))))
- ;; process $B$KM?$($kF~NO$NJ8;z%3!<%I!#(B
+ ;; process ã«ä¸ããå
¥åã®æåã³ã¼ãã
(enc (cond
- ;; ptex $B$G(B -kanji
$B%*%W%7%g%s$"$j$J$i!"$=$NJ8;z%3!<%I!#(B
- ;; $B$J$7$J$i(B utf-8 $B$+(B sjis$B!#(B
- ;; texlive 2018 $B$G(B w32 $B$G$b(B utf-8
$B$,%G%U%)%k%H$K$J$C(B
- ;; $B$?$h$&$J$N$G!"$=$l$K9g$o$;$k!#(B
+ ;; ptex 㧠-kanji
ãªãã·ã§ã³ãããªãããã®æåã³ã¼ãã
+ ;; ãªããªã utf-8 ã sjisã
+ ;; texlive 2018 㧠w32 ã§ã utf-8
ãããã©ã«ãã«ãªã£
+ ;; ããããªã®ã§ãããã«åãããã
((eq TeX-engine 'ptex)
(if (and japanese-TeX-use-kanji-opt-flag kanji)
kanji
'utf-8))
- ;; jtex $B$J$i(B euc $B$+(B sjis $B$K8GDj$9$k!#(B
+ ;; jtex ãªã euc ã sjis ã«åºå®ããã
((eq TeX-engine 'jtex)
(if (memq system-type '(windows-nt darwin))
'shift_jis 'euc-jp))
- ;; uptex $B$J$i(B utf-8 $B$K8GDj$9$k!#(B
+ ;; uptex ãªã utf-8 ã«åºå®ããã
(t
'utf-8))))
- ;; $B2~9T%3!<%I$r;XDj!#(B
+ ;; æ¹è¡ã³ã¼ããæå®ã
(setq dec (coding-system-change-eol-conversion
dec
(if (eq system-type 'windows-nt) 'dos 'unix))
@@ -356,7 +356,7 @@ See also a user custom option
`TeX-japanese-process-input-coding-system'."
enc
(if (eq system-type 'windows-nt) 'dos 'unix)))
- ;; Customize $BCM$,$"$l$P$=$l$rM%@h!#(B
+ ;; Customize å¤ãããã°ãããåªå
ã
(set-process-coding-system
process
(or TeX-japanese-process-output-coding-system dec)
@@ -375,7 +375,7 @@ Return nil otherwise."
(iso-2022-jp . "jis")
(japanese-shift-jis . "sjis")
(utf-8 . "utf8")
- ;; TeXLive 2018 $B$+$i(B BOM $B$D$-(B UTF-8
$B$b%5%]!<%H$5$l$?!#(B
+ ;; TeXLive 2018 ãã BOM ã¤ã UTF-8
ããµãã¼ããããã
(utf-8-with-signature . "utf8")
(euc-jis-2004 . "euc")
@@ -390,19 +390,19 @@ Return nil otherwise."
For inappropriate encoding, nil instead."
(or (japanese-TeX-coding-ejsu buffer-file-coding-system)
- ;; $BJ#?t%U%!%$%k$KJ,3d$7$?J8=q$N>l9g!"(Bemacs
$B$G3+$$$?%U%!%$%k$,F|K\(B
- ;; $B8l$r#1;z$b4^$^$J$$$3$H$,$"$k!#$3$N$?$a!"$=$N%U%!%$%k$N(B
- ;; buffer-file-coding-system $B$OF|K\8l%3!<%I$,ITDj$KN1$^$C$F(B
- ;; $B$7$^$&2DG=@-$,$"$k!#$=$N$h$&$J>l9g!"(Bmaster file $B$N(B
- ;; buffer-file-coding-system $B$r;H$&!#(B
- (if (stringp TeX-master) ; $B<+J,$,;R%U%!%$%k$N$H$-(B
+ ;; è¤æ°ãã¡ã¤ã«ã«åå²ããææ¸ã®å ´åãemacs
ã§éãããã¡ã¤ã«ãæ¥æ¬
+ ;;
èªãï¼åãå«ã¾ãªããã¨ãããããã®ããããã®ãã¡ã¤ã«ã®
+ ;; buffer-file-coding-system
ã¯æ¥æ¬èªã³ã¼ããä¸å®ã«çã¾ã£ã¦
+ ;; ãã¾ãå¯è½æ§ãããããã®ãããªå ´åãmaster file ã®
+ ;; buffer-file-coding-system ã使ãã
+ (if (stringp TeX-master) ; èªåãåãã¡ã¤ã«ã®ã¨ã
(let ((buf (get-file-buffer (TeX-master-file t))))
(if buf
(japanese-TeX-coding-ejsu
(with-current-buffer buf buffer-file-coding-system)))))
- ;; $B$=$l$G$b7h$a$i$l$J$$>l9g$O(B buffer-file-coding-system $B$N(B
- ;; default $BCM$r;H$&!#(B
+ ;; ããã§ã決ããããªãå ´å㯠buffer-file-coding-system ã®
+ ;; default å¤ã使ãã
(japanese-TeX-coding-ejsu
(default-value 'buffer-file-coding-system))))
@@ -441,20 +441,20 @@ Set `japanese-TeX-mode' to t, and enter `TeX-latex-mode'."
(defun japanese-latex-mode-initialization ()
"Japanese LaTeX specific initializations."
(when japanese-TeX-mode
- ;; `TeX-match-style' $B$r;H$&$N$O(B `TeX-update-style'
$B$N8e$KCY$i$;$k!#(B
- ;; $B$3$NCJ3,$G;H$&$H!"$=$NCf$G8F$V(B `TeX-style-list' $B$NCf$G(B
- ;; `TeX-update-style' $B$,8F$P$l$F$7$^$$!"(Blocal variable
$BEy$N=`Hw$,(B
- ;; $B@0$C$F$J$$CJ3,$G(B style hook
$B$,<B9T$5$l$FITE,$J7k2L$K$J$k$3$H$,(B
- ;; $B$"$k!#$^$?!"(B`TeX-update-style' $B$O8e$+$i(B `find-file-hook'
$BCf$G$b(B
- ;; $B$&0lEY8F$P$l$k$N$G!"(B`TeX-parse-self' $B$,(B t $B$@$H(B parse
$B=hM}$bL5BL(B
- ;; $B$K(B 2 $B2s9T$o$l$F$7$^$&!#(B
+ ;; `TeX-match-style' ã使ãã®ã¯ `TeX-update-style' ã®å¾ã«é
ãããã
+ ;; ãã®æ®µéã§ä½¿ãã¨ããã®ä¸ã§å¼ã¶ `TeX-style-list' ã®ä¸ã§
+ ;; `TeX-update-style' ãå¼ã°ãã¦ãã¾ããlocal variable
çã®æºåã
+ ;; æ´ã£ã¦ãªã段é㧠style hook
ãå®è¡ããã¦ä¸é©ãªçµæã«ãªããã¨ã
+ ;; ãããã¾ãã`TeX-update-style' ã¯å¾ãã `find-file-hook'
ä¸ã§ã
+ ;; ãä¸åº¦å¼ã°ããã®ã§ã`TeX-parse-self' ã t ã 㨠parse
å¦çãç¡é§
+ ;; ã« 2 åè¡ããã¦ãã¾ãã
(add-hook 'TeX-update-style-hook
#'japanese-LaTeX-guess-engine nil t)
(setq LaTeX-default-style japanese-LaTeX-default-style)
(when (and (fboundp 'font-latex-add-keywords)
(eq TeX-install-font-lock 'font-latex-setup))
- ;; jLaTeX $B$K$O$J$$%3%^%s%I$@$,!"$=$l$O$b$&5$$K$7$J$/$F$$$$$@$m$&!#(B
+ ;; jLaTeX ã«ã¯ãªãã³ãã³ãã
ããããã¯ããæ°ã«ããªãã¦ããã ããã
(font-latex-add-keywords '(("textgt" "{") ("mathgt" "{"))
'bold-command)
(font-latex-add-keywords '("gtfamily")
@@ -540,361 +540,361 @@ overwrite the value already set locally."
(if japanese-TeX-error-messages
(setq TeX-error-description-list
'(("\\(?:Package Preview Error\\|Preview\\):.*" .
-
"`preview'$B$X(B`auctex'$B%*%W%7%g%s$rD>@\M?$($k$N$OHr$1$F$/$@$5$$!%(B
-$B%W%l%S%e!<$N<B9T;~0J30$G$3$N%(%i!<$,=P$?>l9g!$M>$j$K$3$_$$$C$?$3$H$r(B
-$B$7$9$.$+!$$G$J$1$l$P(BAUCTeX$B$,$R$I$$<:GT$r$7$F$$$^$9!%(B")
+
"`preview'ã¸`auctex'ãªãã·ã§ã³ãç´æ¥ä¸ããã®ã¯é¿ãã¦ãã
ããï¼
+ãã¬ãã¥ã¼ã®å®è¡æ以å¤ã§ãã®ã¨ã©ã¼ãåºãå
´åï¼ä½ãã«ãã¿ãã£ããã¨ã
+ããããï¼ã§ãªããã°AUCTeXãã²ã©ã失æããã¦ãã¾ãï¼")
("Bad \\\\line or \\\\vector argument.*" .
-
"$B@~$N79$-$r;XDj$9$k!$(B\\line$B$^$?$O(B\\vector$B$N:G=i$N0z?t$,IT@5$G$9!%(B")
+
"ç·ã®å¾ããæå®ããï¼\\lineã¾ãã¯\\vectorã®æåã®å¼æ°ãä¸æ£ã§ãï¼")
("Bad math environment delimiter.*" .
-
"$B?t<0%b!<%ICf$G?t<0%b!<%I3+;O%3%^%s%I(B\\[$B$^$?$O(B\\($B!$$^$?$O!$?t<0%b!<%I30$G(B
-$B?t<0%b!<%I=*N;%3%^%s%I(B\\]$B$^$?$O(B\\)$B$r(BTeX$B$,8+$D$1$^$7$?!%$3$NLdBj$O!$?t<0%b!<(B
-$B%I$N%G%j%_%?$,%^%C%A$7$F$$$J$+$C$?$j!$3g8L$N%P%i%s%9$,$H$l$F$$$J$+$C$?$j$9(B
-$B$k$?$a$K@8$8$^$9!%(B")
+
"æ°å¼ã¢ã¼ãä¸ã§æ°å¼ã¢ã¼ãéå§ã³ãã³ã\\[ã¾ãã¯\\(ï¼ã¾ãã¯ï¼æ°å¼ã¢ã¼ãå¤ã§
+æ°å¼ã¢ã¼ãçµäºã³ãã³ã\\]ã¾ãã¯\\)ãTeXãè¦ã¤ãã¾ããï¼ãã®åé¡ã¯ï¼æ°å¼ã¢ã¼
+ãã®ããªãã¿ãããããã¦ããªãã£ããï¼æ¬å¼§ã®ãã©ã³ã¹ãã¨ãã¦ããªãã£ããã
+ãããã«çãã¾ãï¼")
("Bad use of \\\\\\\\.*" .
-
"\\\\$B%3%^%s%I$,%Q%i%0%i%UCf$K$"$j$^$7$?!%$3$N;H$$$+$?$OL50UL#$G$9!%(B
-$B$3$N%(%i!<%a%C%;!<%8$O(B\\\\$B$,(Bcentering$B4D6-$d(Bflushing$B4D6-$G;H$o$l$?(B
-$B;~!$$"$k$$$O(Bcentering/flushing$B@k8@$,M-8z$J$H$3$m$G;H$o$l$?;~$K@8$8$^$9!%(B")
+
"\\\\ã³ãã³ãããã©ã°ã©ãä¸ã«ããã¾ããï¼ãã®ä½¿ãããã¯ç¡æå³ã§ãï¼
+ãã®ã¨ã©ã¼ã¡ãã»ã¼ã¸ã¯\\\\ãcenteringç°å¢ãflushingç°å¢ã§ä½¿ããã
+æï¼ãããã¯centering/flushing宣è¨ãæå¹ãªã¨ããã§ä½¿ãããæã«çãã¾ãï¼")
("\\\\begin{[^ ]*} ended by \\\\end{[^ ]*}." .
-
"$BBP1~$9$k(B\\begin$BL?Na$N$J$$(B\\end$BL?Na$r(BLaTeX$B$,8+$D$1$^$7$?!%(B\\end$BL?Na$N4D(B
-$B6-L>$r4V0c$($?$+!$M>J,$J(B\\begin$BL?Na$,$"$k$+!$(B\\end$BL?Na$r$o$9$l$?$+$N$$$:(B
-$B$l$+$G$7$g$&!%(B")
+
"対å¿ãã\\beginå½ä»¤ã®ãªã\\endå½ä»¤ãLaTeXãè¦ã¤ãã¾ããï¼\\endå½ä»¤ã®ç°
+å¢åãééãããï¼ä½åãª\\beginå½ä»¤ããããï¼\\endå½ä»¤ããããããã®ãã
+ããã§ãããï¼")
("Can be used only in preamble." .
-
"$B%W%j%"%s%V%k$G$7$+;H$($J$$(B\\documentclass$B!&(B\\nofiles$B!&(B\\includeonly
-\\makeindex$B!&(B\\makeglossary$B$N$&$A$N$$$:$l$+$,(B\\begin{document}$B$h$j$b(B
-$B8e$G;H$o$l$F$$$k$N$r(BLaTeX$B$,8!=P$7$^$7$?!%$3$N%(%i!<$O(B\\begin{document}
-$B$,M>J,$K$"$C$?;~$K$b@8$8$^$9!%(B")
+
"ããªã¢ã³ãã«ã§ãã使ããªã\\documentclassã»\\nofilesã»\\includeonly
+\\makeindexã»\\makeglossaryã®ãã¡ã®ããããã\\begin{document}ããã
+å¾ã§ä½¿ããã¦ããã®ãLaTeXãæ¤åºãã¾ããï¼ãã®ã¨ã©ã¼ã¯\\begin{document}
+ãä½åã«ãã£ãæã«ãçãã¾ãï¼")
("Command name [^ ]* already used.*" .
-
"$B$9$G$KDj5A$5$l$F$$$kL?NaL>$^$?$O4D6-L>$KBP$7$F(B\\newcommand$B!&(B
-\\newenvironment$B!&(B\\newlength$B!&(B\\newsavebox$B!&(B\\newtheorem$B$N$&$A$N$$$:(B
-$B$l$+$r<B9T$7$h$&$H$7$F$$$^$9(B($B$"$k4D6-$rDj5A$9$k$HF1$8L>A0$NL?Na$,<+F0(B
-$BE*$KDj5A$5$l$k$N$G!$4{$KB8:_$9$k4D6-$HF1L>$NL?Na$ODj5A$G$-$^$;$s(B)$B!%?7(B
-$B$7$$L>A0$r9M$($k$+!$(B\\newcommand$B$+(B\\newenvironment$B$N>l9g$J$iBP1~$9$k(B
-\\renew...$BL?Na$r;H$o$J$1$l$P$J$j$^$;$s!%(B")
+
"ãã§ã«å®ç¾©ããã¦ããå½ä»¤åã¾ãã¯ç°å¢åã«å¯¾ãã¦\\newcommandã»
+\\newenvironmentã»\\newlengthã»\\newsaveboxã»\\newtheoremã®ãã¡ã®ãã
+ãããå®è¡ãããã¨ãã¦ãã¾ã(ããç°å¢ãå®ç¾©ããã¨åãååã®å½ä»¤ãèªå
+çã«å®ç¾©ãããã®ã§ï¼æ¢ã«åå¨ããç°å¢ã¨ååã®å½ä»¤ã¯å®ç¾©ã§ãã¾ãã)ï¼æ°
+ããååãèãããï¼\\newcommandã\\newenvironmentã®å
´åãªã対å¿ãã
+\\renew...å½ä»¤ã使ããªããã°ãªãã¾ããï¼")
("Counter too large." .
- "1.
$BJ8;z$G=g=xIU$1$5$l$?$b$N!$$?$V$sHV9fIU$1$5$l$?%j%9%H4D6-$N%i%Y%k$,!$(B
-26$B$h$j$bBg$-$$HV9f$r<u$1<h$j$^$7$?!%Hs>o$KD9$$%j%9%H$r;H$C$F$$$k$+!$(B
-$B%+%&%s%?$r:F@_Dj$7$F$7$^$C$?$+$N$$$:$l$+$G$7$g$&!%(B
+ "1. æåã§é
åºä»ãããããã®ï¼ãã¶ãçªå·ä»ãããããªã¹ãç°å¢ã®ã©ãã«ãï¼
+26ããã大ããçªå·ãåãåãã¾ããï¼é常ã«é·ããªã¹ãã使ã£ã¦ãããï¼
+ã«ã¦ã³ã¿ãåè¨å®ãã¦ãã¾ã£ããã®ããããã§ãããï¼
-2. $B5SCm$,J8;z$^$?$O5SCm5-9f$G=g=x$E$1$5$l$F$$$^$9$,!$J8;z$^$?$O5-9f$r(B
-$B;H$$@Z$C$F$7$^$$$^$7$?!%$*$=$i$/(B\\thanks$BL?Na$N;H$$$9$.$G$9!%(B")
+2. è注ãæåã¾ãã¯è注è¨å·ã§é
åºã¥ãããã¦ãã¾ããï¼æåã¾ãã¯è¨å·ã
+使ãåã£ã¦ãã¾ãã¾ããï¼ãããã\\thankså½ä»¤ã®ä½¿ãããã§ãï¼")
("Environment [^ ]* undefined." .
-
"$BDj5A$5$l$F$$$J$$4D6-$KBP$9$k(B\\begin$BL?Na$r(BLaTeX$B$,8+$D$1$^$7$?!%$*$=$i$/(B
-$B4D6-L>$r4V0c$($?$N$G$7$g$&!%(B")
+
"å®ç¾©ããã¦ããªãç°å¢ã«å¯¾ãã\\beginå½ä»¤ãLaTeXãè¦ã¤ãã¾ããï¼ãããã
+ç°å¢åãééããã®ã§ãããï¼")
("Float(s) lost." .
-
"parbox$B$N$J$+$K(Bfigure$B4D6-!&(Btable$B4D6-$^$?$O(B\\marginpar$BL?Na$,$"$j$^$7$?(B
-\($B$J$*!$(Bparbox$B$O(Bminipage$B4D6-$+(B\\parbox$BL?Na$K$h$C$F:n$i$l$k$+!$5SCm$d?^(B
-$B$J$I$KBP$7$F(BLaTeX$B$,@8@.$9$k$b$N$G$9(B\)$B!%$3$l$O=PNO;~$N%(%i!<$J$N$G!$860x(B
-$B$H$J$C$F$$$k4D6-$"$k$$$OL?Na$O!$(BLaTeX$B$,LdBj$rH/8+$7$?>l=j$h$j$b$@$$$V(B
-$B$sA0$K$"$k2DG=@-$,$"$j$^$9!%=PNO$5$l$F$$$J$$?^!&I=!&K5Cm$J$I$,$$$/$D$+(B
-$B$"$k$+$b$7$l$^$;$s$,!$$=$l$i$,860x$G$"$k$H$O8B$j$^$;$s!%(B")
+
"parboxã®ãªãã«figureç°å¢ã»tableç°å¢ã¾ãã¯\\marginparå½ä»¤ãããã¾ãã
+\(ãªãï¼parboxã¯minipageç°å¢ã\\parboxå½ä»¤ã«ãã£ã¦ä½ããããï¼è注ãå³
+ãªã©ã«å¯¾ãã¦LaTeXãçæãããã®ã§ã\)ï¼ããã¯åºåæã®ã¨ã©ã¼ãªã®ã§ï¼åå
+ã¨ãªã£ã¦ããç°å¢ãããã¯å½ä»¤ã¯ï¼LaTeXãåé¡ãçºè¦ããå
´æãããã ãã¶
+ãåã«ããå¯è½æ§ãããã¾ãï¼åºåããã¦ããªãå³ã»è¡¨ã»å注ãªã©ãããã¤ã
+ããããããã¾ãããï¼ããããåå
ã§ããã¨ã¯éãã¾ããï¼")
("Illegal character in array arg." .
-
"array$B4D6-$^$?$O(Btabular$B4D6-$N0z?t!$$^$?$O(B\\multicolumn$BL?Na$NBh(B2$B0z?t(B
-$B$NCf$KIT@5$JJ8;z$,$"$j$^$7$?!%(B")
+
"arrayç°å¢ã¾ãã¯tabularç°å¢ã®å¼æ°ï¼ã¾ãã¯\\multicolumnå½ä»¤ã®ç¬¬2å¼æ°
+ã®ä¸ã«ä¸æ£ãªæåãããã¾ããï¼")
("Missing \\\\begin{document}." .
-
"\\begin{document}$BL?Na$h$jA0$K(BLaTeX$B$,=PNO$r9T$J$C$F$7$^$$$^$7$?!%(B
-\\begin{document}$BL?Na$rK:$l$?$+!$%W%j%"%s%V%k$K2?$+4V0c$$$,$"$k$N$G$7$g$&!%(B
-$BBG$A4V0c$$$K$h$kJ8;z$d!$@k8@$N8m$j$K$h$k2DG=@-$b$"$j$^$9!%Nc$($P!$0z?t$r(B
-$B0O$`3g8L$rH4$+$7$?$H$+!$L?NaL>$N(B\\$B$rK:$l$?>l9g$J$I$G$9!%(B")
+
"\\begin{document}å½ä»¤ããåã«LaTeXãåºåãè¡ãªã£ã¦ãã¾ãã¾ããï¼
+\\begin{document}å½ä»¤ãå¿ãããï¼ããªã¢ã³ãã«ã«ä½ãééããããã®ã§ãããï¼
+æã¡ééãã«ããæåãï¼å®£è¨ã®èª¤ãã«ããå¯è½æ§ãããã¾ãï¼ä¾ãã°ï¼å¼æ°ã
+å²ãæ¬å¼§ãæãããã¨ãï¼å½ä»¤åã®\\ãå¿ããå
´åãªã©ã§ãï¼")
("Missing p-arg in array arg.*" .
-
"array$B4D6-!&(Btabular$B4D6-$N0z?t!$$"$k$$$O(B\\multicolumn$BL?Na$NBh(B2$B0z?t$NCf$K!$(B
-$B3g8L$K0O$^$l$?I=8=$N$D$$$F$$$J$$(Bp$B$,$"$j$^$7$?!%(B")
+
"arrayç°å¢ã»tabularç°å¢ã®å¼æ°ï¼ãããã¯\\multicolumnå½ä»¤ã®ç¬¬2å¼æ°ã®ä¸ã«ï¼
+æ¬å¼§ã«å²ã¾ãã表ç¾ã®ã¤ãã¦ããªãpãããã¾ããï¼")
("Missing @-exp in array arg." .
-
"array$B4D6-!&(Btabular$B4D6-$N0z?t!$$"$k$$$O(B\\multicolumn$BL?Na$NBh(B2$B0z?t$NCf$K!$(B
-@$BI=8=$N$D$$$F$$$J$$(B@$B$,$"$j$^$7$?!%(B")
+
"arrayç°å¢ã»tabularç°å¢ã®å¼æ°ï¼ãããã¯\\multicolumnå½ä»¤ã®ç¬¬2å¼æ°ã®ä¸ã«ï¼
+@表ç¾ã®ã¤ãã¦ããªã@ãããã¾ããï¼")
("No such counter." .
-
"\\setcounter$BL?Na$^$?$O(B\\addtocounter$BL?Na$G!$B8:_$7$J$$%+%&%s%?$,;XDj$5$l(B
-$B$^$7$?!%$*$=$i$/$?$@$N%?%$%W%_%9$G$7$g$&!%$?$@$7!$%(%i!<$,(Baux$B%U%!%$%k$NCf(B
-$B$G@8$8$?>l9g$O!$(B\\newcounter$BL?Na$r%W%j%"%s%V%k$N30$G;H$C$?$N$@$H;W$o$l$^$9!%(B")
+
"\\setcounterå½ä»¤ã¾ãã¯\\addtocounterå½ä»¤ã§ï¼åå¨ããªãã«ã¦ã³ã¿ãæå®ãã
+ã¾ããï¼ãããããã ã®ã¿ã¤ããã¹ã§ãããï¼ãã
ãï¼ã¨ã©ã¼ãauxãã¡ã¤ã«ã®ä¸
+ã§çããå
´åã¯ï¼\\newcounterå½ä»¤ãããªã¢ã³ãã«ã®å¤ã§ä½¿ã£ãã®ã
ã¨æããã¾ãï¼")
("Not in outer par mode." .
-
"figure$B4D6-!&(Btable$B4D6-$"$k$$$O(B\\marginpar$BL?Na$,?t<0%b!<%I$^$?$O(Bparbox$B$NCf(B
-$B$G;H$o$l$^$7$?!%(B")
+
"figureç°å¢ã»tableç°å¢ãããã¯\\marginparå½ä»¤ãæ°å¼ã¢ã¼ãã¾ãã¯parboxã®ä¸
+ã§ä½¿ããã¾ããï¼")
("\\\\pushtabs and \\\\poptabs don't match." .
-
"\\pushtabs$B$HBP1~$7$J$$(B\\poptabs$B$,$_$D$+$C$?$+!$$^$?$O!$BP1~$9$k(B\\poptabs
-$B$r$b$?$J$$(B\\pushtabs$B$,$"$k$N$K(B\\end{tabbing}$B$,8=$l$F$7$^$$$^$7$?!%(B")
+
"\\pushtabsã¨å¯¾å¿ããªã\\poptabsãã¿ã¤ãã£ããï¼ã¾ãã¯ï¼å¯¾å¿ãã\\poptabs
+ããããªã\\pushtabsãããã®ã«\\end{tabbing}ãç¾ãã¦ãã¾ãã¾ããï¼")
("Something's wrong--perhaps a missing \\\\item." .
-
"$B%j%9%H4D6-$NCf$K(B\\item$BL?Na$,$J$$$N$,:G$b$"$j$=$&$J%1!<%9$G$9!%(B
-thebibliography$B4D6-$G0z?t$rK:$l$?>l9g$K$b@8$8$^$9!%(B")
+
"ãªã¹ãç°å¢ã®ä¸ã«\\itemå½ä»¤ããªãã®ãæããããããªã±ã¼ã¹ã§ãï¼
+thebibliographyç°å¢ã§å¼æ°ãå¿ããå ´åã«ãçãã¾ãï¼")
("Tab overflow." .
-
"\\=$B$,!$(BLaTeX$B$G5v$5$l$k%?%V%9%H%C%W$N:GBg?t$rD6$($F$$$^$9!%(B")
+ "\\=ãï¼LaTeXã§è¨±ãããã¿ãã¹ãããã®æ大æ°ãè¶
ãã¦ãã¾ãï¼")
("There's no line here to end." .
-
"\\newline$BL?Na$^$?$O(B\\\\$BL?Na$,%Q%i%0%i%U4V$K$"$j$^$9!%$3$N;H$$$+$?$O(B
-$BL50UL#$G$9!%$b$76u9T$r$"$1$?$$$N$G$7$?$i!$(B\\vspace$B$r;H$C$F$/$@$5$$!%(B")
+
"\\newlineå½ä»¤ã¾ãã¯\\\\å½ä»¤ããã©ã°ã©ãéã«ããã¾ãï¼ãã®ä½¿ãããã¯
+ç¡æå³ã§ãï¼ãã空è¡ãããããã®ã§ãããï¼\\vspaceã使ã£ã¦ãã
ããï¼")
("This may be a LaTeX bug." .
-
"$B$^$C$?$/$o$1$,$o$+$i$J$/$J$C$F$7$^$$$^$7$?!%$?$V$s$3$l0JA0$K8!=P$5$l$?(B
-$B%(%i!<$N$;$$$@$H;W$o$l$^$9!%$7$+$7!$(BLaTeX$B<+BN$N%P%0$G$"$k2DG=@-$b$"$j$^$9!%(B
-$B$b$7$3$N%(%i!<$,F~NO%U%!%$%k$KBP$9$k:G=i$N%(%i!<$G$"$j!$2?$b4V0c$$$,8+$D(B
-$B$+$i$J$$>l9g$O!$$=$N%U%!%$%k$rJ]B8$7$F!$%m!<%+%k%,%$%I$K=q$+$l$F$$$k@UG$(B
-$B<T$KO"Mm$7$F$/$@$5$$!%(B")
+
"ã¾ã£ãããããããããªããªã£ã¦ãã¾ãã¾ããï¼ãã¶ããã以åã«æ¤åºããã
+ã¨ã©ã¼ã®ããã
ã¨æããã¾ãï¼ãããï¼LaTeXèªä½ã®ãã°ã§ããå¯è½æ§ãããã¾ãï¼
+ãããã®ã¨ã©ã¼ãå
¥åãã¡ã¤ã«ã«å¯¾ããæåã®ã¨ã©ã¼ã§ããï¼ä½ãééããè¦ã¤
+ãããªãå
´åã¯ï¼ãã®ãã¡ã¤ã«ãä¿åãã¦ï¼ãã¼ã«ã«ã¬ã¤ãã«æ¸ããã¦ãã責任
+è
ã«é£çµ¡ãã¦ãã ããï¼")
("Too deeply nested." .
-
"$B%j%9%H4D6-$NF~$l;R$,?<$9$.$^$9!%2?CJ3,$NF~$l;R$,5v$5$l$k$+$O;H$C$F$$$k(B
-$B%3%s%T%e!<%?$K0MB8$7$^$9$,!$>/$J$/$H$b(B4$BCJ3,$^$G$O5v$5$l$F$$$^$9(B($BIaDL$O(B
-$B$=$l$G==J,$G$7$g$&(B)$B!%(B")
+ "ãªã¹ãç°å¢ã®å
¥ãåãæ·±ããã¾ãï¼ä½æ®µéã®å
¥ãåã許ããããã¯ä½¿ã£ã¦ãã
+ã³ã³ãã¥ã¼ã¿ã«ä¾åãã¾ããï¼å°ãªãã¨ã4段éã¾ã§ã¯è¨±ããã¦ãã¾ã(æ®éã¯
+ããã§ååã§ããã)ï¼")
("Too many unprocessed floats." .
-
"$B$3$N%(%i!<$O(B1$B%Z!<%8Cf$N(B\\marginpar$BL?Na$,B?$9$.$k$?$a$K@8$8$k>l9g$b$"(B
-$B$j$^$9$,!$$b$C$H$"$j$=$&$J$N$O!$8B3&$rD6$($F?^$dI=$rJ]B8$7$h$&$H$7$?>l(B
-$B9g$G$9!%D9$$J8=q$rAHHG$7$F$$$/$H$-!$(BLaTeX$B$O?^$dI=$r8D!9$KJ]B8$7!$%Z!<(B
-$B%8$NJ,3d$r9T$J$&;~$K$=$l$i$rA^F~$7$^$9!%$3$N%(%i!<$O!$%Z!<%8$X$NJ,3d$,(B
-$B9T$J$o$l$kA0$K!$$"$^$j$K$bB?$/$N(Bfigure$B4D6-$d(Btable$B4D6-$,8+$D$+$C$?>l9g(B
-$B$K@8$8$^$9!%$3$NLdBj$O4D6-$N$&$A$N$$$/$D$+$rJ8=q$N=*$o$j$NJ}$K0\F0$9$l(B
-$B$P2r7h$G$-$^$9!%$^$?!$$3$N%(%i!<$O(B``logjam''$B$K$h$C$F@8$8$k$3$H$b$"$j$^(B
-$B$9!%(B``logjam''$B$H$O!$(BLaTeX$B$,=P8==g=xDL$j$K$7$+?^I=$r=PNO$G$-$J$$$;$$$G!$(B
-$B?^I=$N=PNO$,(B1$B%v=j$G$b$D$^$k$H$=$N8e$m$N?^I=$,8.JB$_$9$Y$F$D$C$+$($F$7$^(B
-$B$&$3$H$r$$$$$^$9!%$3$N%8%c%`$N860x$O!$Bg$-$9$.$F(B1$B%Z!<%8$J$$$7$O%*%W%7%g(B
-$B%s0z?t$G;XDj$5$l$?0LCV$K<}$^$i$J$$$h$&$J?^$dI=$G$"$k2DG=@-$,$"$j$^$9!%$3(B
-$B$l$O!$0z?t$K(Bp$B%*%W%7%g%s$,;XDj$5$l$F$$$J$$$H5/$-$d$9$/$J$j$^$9!%(B")
+
"ãã®ã¨ã©ã¼ã¯1ãã¼ã¸ä¸ã®\\marginparå½ä»¤ãå¤ãããããã«çããå
´åãã
+ãã¾ããï¼ãã£ã¨ãããããªã®ã¯ï¼éçãè¶
ãã¦å³ã表ãä¿åãããã¨ããå ´
+åã§ãï¼é·ãææ¸ãçµçãã¦ããã¨ãï¼LaTeXã¯å³ã表ãåã
ã«ä¿åãï¼ãã¼
+ã¸ã®åå²ãè¡ãªãæã«ããããæ¿å
¥ãã¾ãï¼ãã®ã¨ã©ã¼ã¯ï¼ãã¼ã¸ã¸ã®åå²ã
+è¡ãªãããåã«ï¼ãã¾ãã«ãå¤ãã®figureç°å¢ãtableç°å¢ãè¦ã¤ãã£ãå
´å
+ã«çãã¾ãï¼ãã®åé¡ã¯ç°å¢ã®ãã¡ã®ããã¤ããææ¸ã®çµããã®æ¹ã«ç§»åãã
+ã°è§£æ±ºã§ãã¾ãï¼ã¾ãï¼ãã®ã¨ã©ã¼ã¯``logjam''ã«ãã£ã¦çãããã¨ãããã¾
+ãï¼``logjam''ã¨ã¯ï¼LaTeXãåºç¾é
åºéãã«ããå³è¡¨ãåºåã§ããªãããã§ï¼
+å³è¡¨ã®åºåã1ã¶æã§ãã¤ã¾ãã¨ãã®å¾ãã®å³è¡¨ãè»ä¸¦ã¿ãã¹ã¦ã¤ã£ããã¦ãã¾
+ããã¨ãããã¾ãï¼ãã®ã¸ã£ã ã®åå
ã¯ï¼å¤§ãããã¦1ãã¼ã¸ãªããã¯ãªãã·ã§
+ã³å¼æ°ã§æå®ãããä½ç½®ã«åã¾ããªããããªå³ã表ã§ããå¯è½æ§ãããã¾ãï¼ã
+ãã¯ï¼å¼æ°ã«pãªãã·ã§ã³ãæå®ããã¦ããªãã¨èµ·ãããããªãã¾ãï¼")
("Undefined tab position." .
-
"\\>$B!&(B\\+$B!&(B\\-$B$^$?$O(B\\<$BL?Na$G!$B8:_$7$J$$%?%V0LCV!$$9$J$o$A(B\\=$BL?Na$GDj(B
-$B5A$5$l$F$$$J$$%?%V0LCV$r;XDj$7$h$&$H$7$F$$$^$9!%(B")
+
"\\>ã»\\+ã»\\-ã¾ãã¯\\<å½ä»¤ã§ï¼åå¨ããªãã¿ãä½ç½®ï¼ããªãã¡\\=å½ä»¤ã§å®
+義ããã¦ããªãã¿ãä½ç½®ãæå®ãããã¨ãã¦ãã¾ãï¼")
("\\\\< in mid line." .
-
"\\<$BL?Na$,(Btabbing$B4D6-$N9T$NESCf$K8=$l$^$7$?!%$3$NL?Na$O9T$N@hF,$K$J$1$l$P(B
-$B$J$j$^$;$s!%(B")
+
"\\<å½ä»¤ãtabbingç°å¢ã®è¡ã®éä¸ã«ç¾ãã¾ããï¼ãã®å½ä»¤ã¯è¡ã®å
é ã«ãªããã°
+ãªãã¾ããï¼")
("Double subscript." .
-
"$B?t<0Cf$N(B1$B$D$NNs$K(B2$B$D$N2<IU$-J8;z$,$D$$$F$$$^$9!%Nc$($P(Bx_{2}_{3}$B$N$h$&$K!%(B
-$B$3$N$h$&$JI=8=$OL50UL#$G$9!%(B")
+
"æ°å¼ä¸ã®1ã¤ã®åã«2ã¤ã®ä¸ä»ãæåãã¤ãã¦ãã¾ãï¼ä¾ãã°x_{2}_{3}ã®ããã«ï¼
+ãã®ãããªè¡¨ç¾ã¯ç¡æå³ã§ãï¼")
("Double superscript." .
-
"$B?t<0Cf$N(B1$B$D$NNs$K(B2$B$D$N>eIU$-J8;z$,$D$$$F$$$^$9!%Nc$($P(Bx^{2}^{3}$B$N$h$&$K!%(B
-$B$3$N$h$&$JI=8=$OL50UL#$G$9!%(B")
+
"æ°å¼ä¸ã®1ã¤ã®åã«2ã¤ã®ä¸ä»ãæåãã¤ãã¦ãã¾ãï¼ä¾ãã°x^{2}^{3}ã®ããã«ï¼
+ãã®ãããªè¡¨ç¾ã¯ç¡æå³ã§ãï¼")
("Extra alignment tab has been changed to \\\\cr." .
-
"array$B4D6-$^$?$O(Btabular$B4D6-$N(B1$BNsCf$K$"$k9`L\$,B?$9$.$^$9!%8@$$49$($k$H!$(B
-$BNs$N=*$o$j$^$G$K$"$k(B&$B$N?t$,B?$9$.$^$9!%$*$=$i$/A0$NNs$N:G8e$K(B\\\\$B$r$D$1(B
-$B$k$N$rK:$l$?$N$G$7$g$&!%(B")
+ "arrayç°å¢ã¾ãã¯tabularç°å¢ã®1åä¸ã«ããé
ç®ãå¤ããã¾ãï¼è¨ãæããã¨ï¼
+åã®çµããã¾ã§ã«ãã&ã®æ°ãå¤ããã¾ãï¼ããããåã®åã®æå¾ã«\\\\ãã¤ã
+ãã®ãå¿ããã®ã§ãããï¼")
("Extra \\}, or forgotten \\$." .
-
"$B3g8L$^$?$O?t<0%b!<%I$N%G%j%_%?$,@5$7$/BP1~$7$F$$$^$;$s!%$*$=$i$/(B{$B!&(B\\[$B!&(B
-\\($B$"$k$$$O(B$$B$N$&$A$N$$$:$l$+$r=q$-K:$l$?$N$G$7$g$&!%(B")
+
"æ¬å¼§ã¾ãã¯æ°å¼ã¢ã¼ãã®ããªãã¿ãæ£ãã対å¿ãã¦ãã¾ããï¼ãããã{ã»\\[ã»
+\\(ãããã¯$ã®ãã¡ã®ãããããæ¸ãå¿ããã®ã§ãããï¼")
("Font [^ ]* not loaded: Not enough room left." .
-
"$B$3$NJ8=q$O8B3&$h$j$bB?$/$N%U%)%s%H$r;H$C$F$$$^$9!%$b$7J8=q$NItJ,$4$H$K(B
-$BJL!9$N%U%)%s%H$,;H$o$l$F$$$k$N$J$i!$J,3d$7$F=hM}$9$l$PLdBj$O2r7h$5$l$^$9!%(B")
+
"ãã®ææ¸ã¯éçãããå¤ãã®ãã©ã³ãã使ã£ã¦ãã¾ãï¼ããææ¸ã®é¨åãã¨ã«
+å¥ã
ã®ãã©ã³ãã使ããã¦ããã®ãªãï¼åå²ãã¦å¦çããã°åé¡ã¯è§£æ±ºããã¾ãï¼")
("I can't find file `.*'." .
-
"$BI,MW$J%U%!%$%k$,8+$D$+$j$^$;$s$G$7$?!%$b$78+$D$+$i$J$$%U%!%$%k$N3HD%;R(B
-$B$,(Btex$B$N>l9g!$$"$J$?$,;XDj$7$?%U%!%$%k!$$9$J$o$A%a%$%s%U%!%$%k$^$?$O(B
-\\input$BL?Na!&(B\\include$BL?Na$GA^F~$5$l$k%U%!%$%k$,8+$D$+$i$J$$$N$G$9!%(B
-$B3HD%;R$,(Bsty$B$G$"$l$P!$B8:_$7$J$$J8=q%9%?%$%k$^$?$O%9%?%$%k%*%W%7%g%s$r(B
-$B;XDj$7$h$&$H$7$F$$$^$9!%(B")
+ "å¿
è¦ãªãã¡ã¤ã«ãè¦ã¤ããã¾ããã§ããï¼ããè¦ã¤ãããªããã¡ã¤ã«ã®æ¡å¼µå
+ãtexã®å
´åï¼ããªããæå®ãããã¡ã¤ã«ï¼ããªãã¡ã¡ã¤ã³ãã¡ã¤ã«ã¾ãã¯
+\\inputå½ä»¤ã»\\includeå½ä»¤ã§æ¿å
¥ããããã¡ã¤ã«ãè¦ã¤ãããªãã®ã§ãï¼
+æ¡å¼µåãstyã§ããã°ï¼åå¨ããªãææ¸ã¹ã¿ã¤ã«ã¾ãã¯ã¹ã¿ã¤ã«ãªãã·ã§ã³ã
+æå®ãããã¨ãã¦ãã¾ãï¼")
("Illegal parameter number in definition of .*" .
-
"$B$3$l$O$*$=$i$/!$(B\\newcommand$B!&(B\\renewcommand$B!&(B\\newenvironment$B$^$?$O(B
-\\renewenvironment$BL?Na$N$J$+$G(B#$B$,@5$7$/;H$o$l$J$+$C$?$?$a$K@8$8$?%(%i!<(B
-$B$G$9!%(B\\#$BL?Na$H$7$F;H$o$l$k>l9g$r=|$1$P!$(B#$B$H$$$&J8;z$O!$Nc$($P(B2$BHVL\$N(B
-$B0z?t$r;XDj$9$k(B#2$B$N$h$&$K!$0z?t%Q%i%a!<%?$H$7$F$7$+;H$($^$;$s!%$^$?!$(B
-$B$3$N%(%i!<$O!$>e$K$"$2$?(B4$B$D$N%3%^%s%I$,$*8_$$$KF~$l;R$K$J$C$F$$$k>l9g(B
-$B$d!$(B\\newenvironment$BL?Na!&(B\\renewenvironment$BL?Na$G(B#2$B$N$h$&$J%Q%i%a!<%?(B
-$B$,:G8e$N0z?t$NCf$G;H$o$l$F$$$k>l9g$K$b@8$8$^$9!%(B")
+
"ããã¯ããããï¼\\newcommandã»\\renewcommandã»\\newenvironmentã¾ãã¯
+\\renewenvironmentå½ä»¤ã®ãªãã§#ãæ£ãã使ãããªãã£ãããã«çããã¨ã©ã¼
+ã§ãï¼\\#å½ä»¤ã¨ãã¦ä½¿ãããå
´åãé¤ãã°ï¼#ã¨ããæåã¯ï¼ä¾ãã°2çªç®ã®
+å¼æ°ãæå®ãã#2ã®ããã«ï¼å¼æ°ãã©ã¡ã¼ã¿ã¨ãã¦ãã使ãã¾ããï¼ã¾ãï¼
+ãã®ã¨ã©ã¼ã¯ï¼ä¸ã«ããã4ã¤ã®ã³ãã³ãããäºãã«å
¥ãåã«ãªã£ã¦ããå ´å
+ãï¼\\newenvironmentå½ä»¤ã»\\renewenvironmentå½ä»¤ã§#2ã®ãããªãã©ã¡ã¼ã¿
+ãæå¾ã®å¼æ°ã®ä¸ã§ä½¿ããã¦ããå ´åã«ãçãã¾ãï¼")
("Illegal unit of measure ([^ ]* inserted)." .
- "$B$b$7(B
+ "ãã
! Missing number, treated as zero.
-$B$H$$$&%(%i!<$,5/$-$?D>8e$G$"$l$P!$$3$N%(%i!<$N860x$b$=$l$HF1$8$G$9!%(B
-$B$=$&$G$J$$>l9g$O!$(BLaTeX$B$,0z?t$H$7$F(Blength$B$r4|BT$7$F$$$k$N$K(Bnumber$B$,(B
-$B8=$l$?$3$H$r0UL#$7$F$$$^$9!%$3$N%(%i!<$N:G$b$"$j$,$A$J860x$OD9$5(B0$B$r(B
-$BI=$o$9(B0in$B$N$h$&$JI=8=$NBe$o$j$K(B0$B$H$+$$$F$7$^$&$3$H$K$"$j$^$9!%$?$@$7!$(B
-$BL?Na$N0z?t$r=q$-K:$l$?>l9g$K$b$3$N%(%i!<$,@8$8$k$3$H$,$"$j$^$9!%(B")
+ã¨ããã¨ã©ã¼ãèµ·ããç´å¾ã§ããã°ï¼ãã®ã¨ã©ã¼ã®åå
ãããã¨åãã§ãï¼
+ããã§ãªãå ´åã¯ï¼LaTeXãå¼æ°ã¨ãã¦lengthãæå¾
ãã¦ããã®ã«numberã
+ç¾ãããã¨ãæå³ãã¦ãã¾ãï¼ãã®ã¨ã©ã¼ã®æããããã¡ãªåå
ã¯é·ã0ã
+表ãã0inã®ãããªè¡¨ç¾ã®ä»£ããã«0ã¨ããã¦ãã¾ããã¨ã«ããã¾ãï¼ãã
ãï¼
+å½ä»¤ã®å¼æ°ãæ¸ãå¿ããå
´åã«ããã®ã¨ã©ã¼ãçãããã¨ãããã¾ãï¼")
("Misplaced alignment tab character \\&." .
-
"array$B$^$?$O(Btabular$B4D6-$G$N9`L\6h@Z$j$K$N$_;H$o$l$k$Y$-J8;z(B&$B$,IaDL$NJ8(B
-$B$NCf$K$"$j$^$7$?!%$?$V$s(B\\&$B$HF~NO$7$?$+$C$?$N$G$7$g$&!%(B")
+ "arrayã¾ãã¯tabularç°å¢ã§ã®é
ç®åºåãã«ã®ã¿ä½¿ãããã¹ãæå&ãæ®éã®æ
+ã®ä¸ã«ããã¾ããï¼ãã¶ã\\&ã¨å
¥åãããã£ãã®ã§ãããï¼")
("Missing control sequence inserted." .
-
"$B$3$N%(%i!<$O!$$*$=$i$/L?NaL>$G$J$$$b$N$r(B\\newcommand$B!&(B\\renewcommand$B!&(B
-\\newlength$B$^$?$O(B\\newsavebox$B$NBh(B1$B0z?t$H$7$F;H$C$?$?$a$K@8$8$?$N$G$7$g$&!%(B")
+
"ãã®ã¨ã©ã¼ã¯ï¼ããããå½ä»¤åã§ãªããã®ã\\newcommandã»\\renewcommandã»
+\\newlengthã¾ãã¯\\newsaveboxã®ç¬¬1å¼æ°ã¨ãã¦ä½¿ã£ãããã«çããã®ã§ãããï¼")
("Missing number, treated as zero." .
-
"$B$3$N%(%i!<$O$?$$$F$$!$0z?t$H$7$F(Bnumber$B$^$?$O(Blength$B$rI,MW$H$7$F$$$kL?Na$K(B
-$BBP$7$F0z?t$,M?$($i$l$J$+$C$?$?$a$K@8$8$^$9!%0z?t$r=q$-K:$l$?$N$+!$%F%-%9%H(B
-$B$NCf$NBg3g8L(B([])$B$,%*%W%7%g%s0z?t$N;XDj$H4V0c$($i$l$F$7$^$C$?$+$N$I$A$i$+$G(B
-$B$7$g$&!%$^$?!$?t$r@8@.$9$k(B\\value$B$N$h$&$JL?Na$d(Blength$BL?Na$NA0$K(B\\protect$B$r(B
-$BCV$$$?>l9g$K$b$3$N%(%i!<$O@8$8$^$9!%(B")
+
"ãã®ã¨ã©ã¼ã¯ããã¦ãï¼å¼æ°ã¨ãã¦numberã¾ãã¯lengthãå¿
è¦ã¨ãã¦ããå½ä»¤ã«
+対ãã¦å¼æ°ãä¸ããããªãã£ãããã«çãã¾ãï¼å¼æ°ãæ¸ãå¿ããã®ãï¼ããã¹ã
+ã®ä¸ã®å¤§æ¬å¼§([])ããªãã·ã§ã³å¼æ°ã®æå®ã¨ééãããã¦ãã¾ã£ããã®ã©ã¡ããã§
+ãããï¼ã¾ãï¼æ°ãçæãã\\valueã®ãããªå½ä»¤ãlengthå½ä»¤ã®åã«\\protectã
+ç½®ããå ´åã«ããã®ã¨ã©ã¼ã¯çãã¾ãï¼")
("Missing [{}] inserted." .
-
"TeX$B$O4{$K$o$1$,$o$+$i$J$/$J$C$F$$$^$9!%%(%i!<%a%C%;!<%8$K$h$C$F<($5$l$F(B
-$B$$$k>l=j$O$?$V$sF~NO$K4V0c$$$,$"$C$?$H$3$m$h$j$b8e$m$K$J$C$F$7$^$C$F$$$k(B
-$B$G$7$g$&!%(B")
+
"TeXã¯æ¢ã«ãããããããªããªã£ã¦ãã¾ãï¼ã¨ã©ã¼ã¡ãã»ã¼ã¸ã«ãã£ã¦ç¤ºããã¦
+ããå ´æã¯ãã¶ãå
¥åã«ééãããã£ãã¨ãããããå¾ãã«ãªã£ã¦ãã¾ã£ã¦ãã
+ã§ãããï¼")
("Missing \\$ inserted." .
-
"$B$*$=$i$/!$?t<0%b!<%ICf$G$7$+;H$($J$$L?Na$r(BTeX$B$,?t<0%b!<%I30$G8!=P$7$?(B
-$B$N$@$H;W$o$l$^$9!%FC$K5-=R$5$l$F$$$J$$8B$j!$(BLaTeX
Book(Lamport$BCx(B,$BLu=q(B
-$B$O%"%9%-!<=PHG(B)$B$N(B3.3$B@a$K$"$kE:;z!&J,?t!&?t3X5-9f$J$I$N%3%^%s%I$O$9$Y$F(B
-$B?t<0%b!<%I$G$7$+;H$($J$$$N$@$H$$$&$3$H$KCm0U$7$F$/$@$5$$!%$?$H$(L?Na$,(B
-$B?t<04D6-$NCf$K$"$C$?$H$7$F$b!$(Bbox$B$r@8@.$9$kL?Na$N0z?t$r=hM}$7$O$8$a$?(B
-$B;~E@$G$O!$(BTeX$B$O$^$@?t<0%b!<%I$KF~$C$F$$$J$$$N$G$9!%$^$?!$$3$N%(%i!<$O!$(B
-$B?t<0%b!<%ICf$G(BTeX$B$,6u9T$r8!=P$7$?>l9g$K$b@8$8$^$9!%(B")
+
"ããããï¼æ°å¼ã¢ã¼ãä¸ã§ãã使ããªãå½ä»¤ãTeXãæ°å¼ã¢ã¼ãå¤ã§æ¤åºãã
+ã®ã ã¨æããã¾ãï¼ç¹ã«è¨è¿°ããã¦ããªãéãï¼LaTeX
Book(Lamportè,訳æ¸
+ã¯ã¢ã¹ãã¼åºç)ã®3.3ç¯ã«ããæ·»åã»åæ°ã»æ°å¦è¨å·ãªã©ã®ã³ãã³ãã¯ãã¹ã¦
+æ°å¼ã¢ã¼ãã§ãã使ããªãã®ã ã¨ãããã¨ã«æ³¨æãã¦ãã
ããï¼ãã¨ãå½ä»¤ã
+æ°å¼ç°å¢ã®ä¸ã«ãã£ãã¨ãã¦ãï¼boxãçæããå½ä»¤ã®å¼æ°ãå¦çãã¯ããã
+æç¹ã§ã¯ï¼TeXã¯ã¾ã æ°å¼ã¢ã¼ãã«å
¥ã£ã¦ããªãã®ã§ãï¼ã¾ãï¼ãã®ã¨ã©ã¼ã¯ï¼
+æ°å¼ã¢ã¼ãä¸ã§TeXã空è¡ãæ¤åºããå ´åã«ãçãã¾ãï¼")
("Not a letter." .
-
"\\hyphenation$BL?Na$N0z?t$NCf$K$J$K$+@5$7$/$J$$$b$N$,$"$j$^$9!%(B")
+
"\\hyphenationå½ä»¤ã®å¼æ°ã®ä¸ã«ãªã«ãæ£ãããªããã®ãããã¾ãï¼")
("Paragraph ended before [^ ]* was complete." .
-
"$BL?Na$N0z?t$NCf$KIT@5$J6u9T$,F~$C$F$7$^$C$F$$$^$9!%$*$=$i$/0z?t$N=*$o$j(B
-$B$KJD$83g8L$r$D$1$k$N$rK:$l$?$N$G$7$g$&!%(B")
+ "å½ä»¤ã®å¼æ°ã®ä¸ã«ä¸æ£ãªç©ºè¡ãå
¥ã£ã¦ãã¾ã£ã¦ãã¾ãï¼ããããå¼æ°ã®çµãã
+ã«éãæ¬å¼§ãã¤ããã®ãå¿ããã®ã§ãããï¼")
("\\\\[^ ]*font [^ ]* is undefined .*" .
-
"$B$3$N%(%i!<$O$"$^$j0lHLE*$G$J$$%U%)%s%H$,?t<0%b!<%I$G;H$o$l$?;~$K@8$8(B
-$B$^$9!%Nc$($P!$5SCm$NCf$N?t<0$G(B\\sc$BL?Na$,;H$o$l$k$H!$(Bfootnotesize$B$N(B
-small
caps$B%U%)%s%H$,8F$S$@$5$l$k$3$H$K$J$j$^$9!%$3$NLdBj$O(B\\load$BL?Na$r(B
-$B;H$($P2r7h$G$-$^$9!%(B")
+
"ãã®ã¨ã©ã¼ã¯ãã¾ãä¸è¬çã§ãªããã©ã³ããæ°å¼ã¢ã¼ãã§ä½¿ãããæã«çã
+ã¾ãï¼ä¾ãã°ï¼è注ã®ä¸ã®æ°å¼ã§\\scå½ä»¤ã使ãããã¨ï¼footnotesizeã®
+small capsãã©ã³ããå¼ã³ã
ããããã¨ã«ãªãã¾ãï¼ãã®åé¡ã¯\\loadå½ä»¤ã
+使ãã°è§£æ±ºã§ãã¾ãï¼")
("Font .* not found." .
-
"$BL$CN$N(Bfamily/series/shape/size$B$NAH$_9g$o$;$N%U%)%s%H$,;XDj$5$l$^$7$?!%(B
-$B$3$N%(%i!<$,5/$-$k%1!<%9$O(B2$B$D9M$($i$l$^$9!%(B
- 1) \\size$B%^%/%m$G;H$($J$$%5%$%:$rA*Br$7$h$&$H$7$?!%(B
- 2) $B$=$&$G$J$1$l$P!$4IM}<T$N$H$3$m$K9T$C$F!$%U%)%s%HA*Br%F!<%V%k$,(B
- $BIe$C$F$$$k$HJ86g$r$D$1$F$d$j$^$7$g$&(B!")
+
"æªç¥ã®family/series/shape/sizeã®çµã¿åããã®ãã©ã³ããæå®ããã¾ããï¼
+ãã®ã¨ã©ã¼ãèµ·ããã±ã¼ã¹ã¯2ã¤èãããã¾ãï¼
+ 1) \\sizeãã¯ãã§ä½¿ããªããµã¤ãºãé¸æãããã¨ããï¼
+ 2) ããã§ãªããã°ï¼ç®¡çè
ã®ã¨ããã«è¡ã£ã¦ï¼ãã©ã³ãé¸æãã¼ãã«ã
+ è
ã£ã¦ããã¨æå¥ãã¤ãã¦ããã¾ããã!")
("TeX capacity exceeded, sorry .*" .
-
"TeX$B$,%a%b%j$r;H$$$-$C$F$7$^$$!$<B9T$rCfCG$7$^$7$?!%$7$+$7!$92$F$J$$$G(B
-$B$/$@$5$$!%$3$N%(%i!<$,@8$8$?860x$O!$$?$V$s!$(BTeX$B$K$"$J$?$NJ8=q$r=hM}$G(B
-$B$-$k$@$1$NG=NO$,$J$$$+$i$G$O$"$j$^$;$s!%(BTeX$B$K%a%b%j$r;H$$$-$i$;$?860x(B
-$B$O!$$*$=$i$/F~NO$7$?%U%!%$%k$NA0$NJ}$G@8$8$?%(%i!<$G$9!%$"$J$?$,K\Ev$K(B
-TeX$B$NMFNL$rD6$($?$3$H$r$7$h$&$H$7$?$N$+$I$&$+!$$=$7$F$=$N>l9g$I$&$9$l(B
-$B$P$$$$$N$+$rH=CG$9$kJ}K!$r0J2<$K@bL@$7$^$9!%$b$7LdBj$,F~NO%U%!%$%kCf$N(B
-$B%(%i!<$K$"$k>l9g$O!$8D!9$N%(%i!<$r2r7h$7$F$$$/J}K!$r$H$k$N$,$h$$$G$7$g(B
-$B$&!%(BLaTeX$B$,C;$$%U%!%$%k$G%a%b%j$r;H$$$-$k$3$H$O$a$C$?$K$"$j$^$;$s$+$i!$(B
-$B%(%i!<$N5/$-$?0LCV$h$jA0$K=hM}$7$?%Z!<%8$,?t%Z!<%8$7$+$J$1$l$P!$$^$:4V(B
-$B0c$$$J$/F~NO%U%!%$%k$KLdBj$,$"$k$O$:$G$9!%(B
-
-$B%(%i!<%a%C%;!<%8$N:G8e$K!$(BTeX$B$,;H$$$-$C$F$7$^$C$?%a%b%j$N<oN`$,<($5$l(B
-$B$F$$$^$9!%$=$l$i$N$&$A0lHLE*$J$b$N$K$D$$$F!$9M$($i$l$k860x$r0J2<$K5s$2(B
-$B$^$9!%(B
+
"TeXãã¡ã¢ãªã使ããã£ã¦ãã¾ãï¼å®è¡ãä¸æãã¾ããï¼ãããï¼æ
ã¦ãªãã§
+ãã ããï¼ãã®ã¨ã©ã¼ãçããåå
ã¯ï¼ãã¶ãï¼TeXã«ããªãã®ææ¸ãå¦çã§
+ããã
ãã®è½åããªãããã§ã¯ããã¾ããï¼TeXã«ã¡ã¢ãªã使ãããããåå
+ã¯ï¼ããããå
¥åãããã¡ã¤ã«ã®åã®æ¹ã§çããã¨ã©ã¼ã§ãï¼ããªããæ¬å½ã«
+TeXã®å®¹éãè¶
ãããã¨ããããã¨ããã®ãã©ããï¼ããã¦ãã®å
´åã©ããã
+ã°ããã®ããå¤æããæ¹æ³ã以ä¸ã«èª¬æãã¾ãï¼ããåé¡ãå
¥åãã¡ã¤ã«ä¸ã®
+ã¨ã©ã¼ã«ããå ´åã¯ï¼åã
ã®ã¨ã©ã¼ã解決ãã¦ããæ¹æ³ãã¨ãã®ãããã§ãã
+ãï¼LaTeXãçããã¡ã¤ã«ã§ã¡ã¢ãªã使ããããã¨ã¯ãã£ãã«ããã¾ããããï¼
+ã¨ã©ã¼ã®èµ·ããä½ç½®ããåã«å¦çãããã¼ã¸ãæ°ãã¼ã¸ãããªããã°ï¼ã¾ãé
+éããªãå
¥åãã¡ã¤ã«ã«åé¡ãããã¯ãã§ãï¼
+
+ã¨ã©ã¼ã¡ãã»ã¼ã¸ã®æå¾ã«ï¼TeXã使ããã£ã¦ãã¾ã£ãã¡ã¢ãªã®ç¨®é¡ã示ãã
+ã¦ãã¾ãï¼ãããã®ãã¡ä¸è¬çãªãã®ã«ã¤ãã¦ï¼èããããåå
ã以ä¸ã«æã
+ã¾ãï¼
buffer size
===========
-$B>O@a!&(B\\caption$B!&(B\\addcontentsline$B$"$k$$$O(B\\addtocontents$BL?Na$N0z?t$H(B
-$B$7$FM?$($?%F%-%9%H$,D9$9$.$k>l9g$K@8$8$k$3$H$,$"$j$^$9!%$3$N%(%i!<$O(B
-$B$?$$$F$$(B\\end{document}$B$r=hM}$7$F$$$k;~$K@8$8$^$9$,!$(B\\tableofcontents$B!&(B
-\\listoffigures$B$"$k$$$O(B\\listoftables$BL?Na$r<B9T$7$F$$$k>l9g$K$b5/$-$k(B
-$B$3$H$,$"$j$^$9!%$3$NLdBj$r2r7h$9$k$K$O!$$b$C$HC;$$%F%-%9%H$r%*%W%7%g%s(B
-$B0z?t$H$7$FM?$($F$/$@$5$$!%L\<!$d?^I=0lMw$r:n@.$7$F$b!$8+=P$7$,D9$9$.$k(B
-$B$HFI$_$K$/$/$J$k$O$:$G$9!%(B
+ç«
ç¯ã»\\captionã»\\addcontentslineãããã¯\\addtocontentså½ä»¤ã®å¼æ°ã¨
+ãã¦ä¸ããããã¹ããé·ãããå
´åã«çãããã¨ãããã¾ãï¼ãã®ã¨ã©ã¼ã¯
+ããã¦ã\\end{document}ãå¦çãã¦ããæã«çãã¾ããï¼\\tableofcontentsã»
+\\listoffiguresãããã¯\\listoftableså½ä»¤ãå®è¡ãã¦ããå
´åã«ãèµ·ãã
+ãã¨ãããã¾ãï¼ãã®åé¡ã解決ããã«ã¯ï¼ãã£ã¨çãããã¹ãããªãã·ã§ã³
+å¼æ°ã¨ãã¦ä¸ãã¦ãã
ããï¼ç®æ¬¡ãå³è¡¨ä¸è¦§ãä½æãã¦ãï¼è¦åºããé·ããã
+ã¨èªã¿ã«ãããªãã¯ãã§ãï¼
exception dictionary
====================
-TeX$B$,;}$C$F$$$kNN0h0J>e$K%O%$%U%M!<%7%g%s>pJs$rM?$($h$&$H$7$F$$$^$9!%(B
-$B$"$^$j;H$o$J$$C18l$N(B\\hyphenation$BL?Na$r<h$j=|$$$F!$Be$o$j$K(B\\-$BL?Na$r;H$C(B
-$B$F$/$@$5$$!%(B
+TeXãæã£ã¦ããé å以ä¸ã«ãã¤ããã¼ã·ã§ã³æ
å
±ãä¸ãããã¨ãã¦ãã¾ãï¼
+ãã¾ã使ããªãåèªã®\\hyphenationå½ä»¤ãåãé¤ãã¦ï¼ä»£ããã«\\-å½ä»¤ã使ã£
+ã¦ãã ããï¼
hash size
=========
-$BL?NaL>$NDj5A$^$?$OAj8_;2>H%i%Y%k$NDj5A$,B?$9$.$^$9!%(B
+å½ä»¤åã®å®ç¾©ã¾ãã¯ç¸äºåç
§ã©ãã«ã®å®ç¾©ãå¤ããã¾ãï¼
input stack size
================
-$B$3$N%(%i!<$O$*$=$i$/L?NaDj5ACf$N8m$j$K$h$k$b$N$G$9!%Nc$($P!$<!$NL?Na$O(B
-$B:F5"E*Dj5A$H$J$C$F$*$j!$<+J,<+?H$r;H$C$F(B\\gnu$B$rDj5A$7$F$$$^$9!%(B
+ãã®ã¨ã©ã¼ã¯ããããå½ä»¤å®ç¾©ä¸ã®èª¤ãã«ãããã®ã§ãï¼ä¾ãã°ï¼æ¬¡ã®å½ä»¤ã¯
+å帰çå®ç¾©ã¨ãªã£ã¦ããï¼èªåèªèº«ã使ã£ã¦\\gnuãå®ç¾©ãã¦ãã¾ãï¼
- \\newcommand{\\gnu}{a \\gnu} % $B$3$l$O$@$a(B
+ \\newcommand{\\gnu}{a \\gnu} % ããã¯ã ã
-$B$3$N(B\\gnu$BL?Na$r8+$D$1$k$H(BTeX$B$O(B\\gnu$B$,2?$r$&$_$@$9$N$+$r7hDj$7$h$&$H$7(B
-$B$F$=$NKvHx$r$$$D$^$G$bDI$$$D$E$1!$$d$,$F(B``input
stack''$B$r;H$$$-$C$F$7(B
-$B$^$$$^$9!%(B
+ãã®\\gnuå½ä»¤ãè¦ã¤ããã¨TeXã¯\\gnuãä½ããã¿ã
ãã®ãã決å®ãããã¨ã
+ã¦ãã®æ«å°¾ããã¤ã¾ã§ã追ãã¤ã¥ãï¼ããã¦``input
stack''ã使ããã£ã¦ã
+ã¾ãã¾ãï¼
main memory size
================
-$B$3$l$O!$(BTeX$B$,C;$$%U%!%$%k$r=hM}$7$F$$$k;~$K;H$$$-$k2DG=@-$N$"$k%a%b%j(B
-$B$N$R$H$D$G$9!%(Bmain
memory$B$r;H$$$-$k$N$O<!$N(B3$B$D$N>l9g$N$$$:$l$+$G$9!%(B
-\(1\)$BHs>o$KD9$/J#;($JL?Na$r?tB?$/Dj5A$7$?!%(B(2)index$B$^$?$O(Bglossary$B$r:n$C(B
-$B$F$$$k$H$-!$(B1$B%Z!<%8Cf$K$"$^$j$K$bB?$/$N(B\\index$B$^$?$O(B\\glossary$BL?Na$,$"(B
-$B$k!%(B(3)$B@8@.$N$?$a$N>pJs$r(BTeX$B$,J];}$7$-$l$J$$$h$&$J!$$"$^$j$K$bJ#;($J%Z!<(B
-$B%8$r@8@.$7$h$&$H$7$?!%:G=i$N(B2$B$D$NLdBj$N2r7hJ}K!$OL@$i$+$G$9!%L?NaDj5A(B
-$B$N?t$"$k$$$O(B\\index$B!&(B\\glossary$BL?Na$N?t$r8:$i$9$3$H$G$9!%(B3$BHVL\$NLdBj$O(B
-$B$A$g$C$HLq2p$G$9!%$3$l$O!$Bg$-$J(Btabbing$B!&(Btabular$B!&(Barray$B!&(Bpicture$B4D6-$N(B
-$B$;$$$G@8$8$k$3$H$,$"$j$^$9!%=PNO0LCV$,7hDj$5$l$k$N$rBT$C$F$$$k?^$dI=$G(B
-TeX$B$N%a%b%j$,$$$C$Q$$$K$J$C$F$$$k$N$+$b$7$l$^$;$s!%K\Ev$K(BTeX$B$NMFNL$rD6(B
-$B$($F$7$^$C$?$N$+$I$&$+D4$Y$k$?$a$K$O!$%(%i!<$N5/$3$C$?>l=j$ND>A0$K(B
-\\clearpage$BL?Na$rF~$l$F$b$&0lEY%3%s%Q%$%k$r<B9T$7$F$_$F$/$@$5$$!%$b$7(B
-$B$=$l$G$b%a%b%j$,B-$j$J$/$J$k$h$&$J$i!$$J$s$i$+$N<jCJ$r9V$8$kI,MW$,$"$j(B
-$B$^$9!%(BTeX$B$,%Z!<%8$r@ZCG$9$k$+$I$&$+7hDj$9$k$?$a$K$OCJMnA4BN$r=hM}$7$J(B
-$B$1$l$P$J$i$J$$$H$$$&$3$H$r;W$$$@$7$F$/$@$5$$!%CJMn$NESCf$K(B\\newpage$BL?(B
-$BNa$rF~$l$l$P!$CJMn$N;D$j$r=hM}$9$kA0$K:#$N%Z!<%8$r(BTeX$B$K=PNO$5$;$k$3$H(B
-$B$GM>M5$,$G$-$k$+$b$7$l$^$;$s(B(\\pagebreak$BL?Na$G$O$@$a$G$9(B)$B!%$b$7?^$dI=(B
-$B$,N/$^$C$F$$$k$3$H$,LdBj$J$N$J$i$P!$?^I=$r$b$C$H8e$m$NJ}$K0\F0$9$k$H$+!$(B
-$B$"$k$$$O$b$C$HA0$N;~E@$G=PNO$5$l$k$h$&$K$9$l$P2sHr$G$-$^$9!%$b$7$^$@J8(B
-$B=q$r:n@.$7$F$$$kESCf$J$i!$$H$j$"$($:(B\\clearpage$BL?Na$rF~$l$F$*$$$F!$:G(B
-$B=*HG$r:n$k;~$^$G$3$NLdBj$OC*>e$2$7$F$*$-$^$7$g$&!%F~NO%U%!%$%k$,JQ$o$k(B
-$B$HLdBj$,2r>C$5$l$k>l9g$b$"$k$N$G$9!%(B
+ããã¯ï¼TeXãçããã¡ã¤ã«ãå¦çãã¦ããæã«ä½¿ãããå¯è½æ§ã®ããã¡ã¢ãª
+ã®ã²ã¨ã¤ã§ãï¼main memoryã使ãããã®ã¯æ¬¡ã®3ã¤ã®å
´åã®ããããã§ãï¼
+\(1\)é常ã«é·ãè¤éãªå½ä»¤ãæ°å¤ãå®ç¾©ããï¼(2)indexã¾ãã¯glossaryãä½ã£
+ã¦ããã¨ãï¼1ãã¼ã¸ä¸ã«ãã¾ãã«ãå¤ãã®\\indexã¾ãã¯\\glossaryå½ä»¤ãã
+ãï¼(3)çæã®ããã®æ
å
±ãTeXãä¿æããããªããããªï¼ãã¾ãã«ãè¤éãªãã¼
+ã¸ãçæãããã¨ããï¼æåã®2ã¤ã®åé¡ã®è§£æ±ºæ¹æ³ã¯æããã§ãï¼å½ä»¤å®ç¾©
+ã®æ°ãããã¯\\indexã»\\glossaryå½ä»¤ã®æ°ãæ¸ãããã¨ã§ãï¼3çªç®ã®åé¡ã¯
+ã¡ãã£ã¨åä»ã§ãï¼ããã¯ï¼å¤§ããªtabbingã»tabularã»arrayã»pictureç°å¢ã®
+ããã§çãããã¨ãããã¾ãï¼åºåä½ç½®ã決å®ãããã®ãå¾
ã£ã¦ããå³ã表ã§
+TeXã®ã¡ã¢ãªããã£ã±ãã«ãªã£ã¦ããã®ããããã¾ããï¼æ¬å½ã«TeXã®å®¹éãè¶
+ãã¦ãã¾ã£ãã®ãã©ãã調ã¹ãããã«ã¯ï¼ã¨ã©ã¼ã®èµ·ãã£ãå
´æã®ç´åã«
+\\clearpageå½ä»¤ãå
¥ãã¦ããä¸åº¦ã³ã³ãã¤ã«ãå®è¡ãã¦ã¿ã¦ãã ããï¼ãã
+ããã§ãã¡ã¢ãªã足ããªããªããããªãï¼ãªãããã®æ段ãè¬ããå¿
è¦ããã
+ã¾ãï¼TeXããã¼ã¸ãåæãããã©ãã決å®ããããã«ã¯æ®µè½å
¨ä½ãå¦çããª
+ããã°ãªããªãã¨ãããã¨ãæãã ãã¦ãã
ããï¼æ®µè½ã®éä¸ã«\\newpageå½
+令ãå
¥ããã°ï¼æ®µè½ã®æ®ããå¦çããåã«ä»ã®ãã¼ã¸ãTeXã«åºåããããã¨
+ã§ä½è£ãã§ããããããã¾ãã(\\pagebreakå½ä»¤ã§ã¯ã
ãã§ã)ï¼ããå³ã表
+ãæºã¾ã£ã¦ãããã¨ãåé¡ãªã®ãªãã°ï¼å³è¡¨ããã£ã¨å¾ãã®æ¹ã«ç§»åããã¨ãï¼
+ãããã¯ãã£ã¨åã®æç¹ã§åºåãããããã«ããã°åé¿ã§ãã¾ãï¼ããã¾ã
æ
+æ¸ãä½æãã¦ããéä¸ãªãï¼ã¨ãããã\\clearpageå½ä»¤ãå
¥ãã¦ããã¦ï¼æ
+çµçãä½ãæã¾ã§ãã®åé¡ã¯æ£ä¸ããã¦ããã¾ãããï¼å
¥åãã¡ã¤ã«ãå¤ãã
+ã¨åé¡ã解æ¶ãããå ´åãããã®ã§ãï¼
pool size
=========
-$BAj8_;2>H$N(B\\label$B$,B?$9$.$k$+!$L?Na$NDj5A$,B?$9$.$k$+$N$I$A$i$+$G$9!%(B
-$B@53N$K$$$($P!$Dj5A$7$?%i%Y%kL>$*$h$SL?NaL>$K;H$C$?J8;z?t$,B?$9$.$k$H$$(B
-$B$&$3$H$G$9!%$G$9$+$i!$$b$C$HC;$$L>A0$r;H$($P$3$NLdBj$O2r7h$7$^$9!%$?$@(B
-$B$7!$$3$N%(%i!<$O!$(B\\setcounter$B$J$I$N%+%&%s%?L?Na$d(B\\newenvironment$B!&(B
-\\newtheorem$BL?Na$N0z?t$N=*$o$j$r<($91&3g8L$rK:$l$?>l9g$K$b@8$8$^$9!%(B
+ç¸äºåç
§ã®\\labelãå¤ããããï¼å½ä»¤ã®å®ç¾©ãå¤ããããã®ã©ã¡ããã§ãï¼
+æ£ç¢ºã«ããã°ï¼å®ç¾©ããã©ãã«åããã³å½ä»¤åã«ä½¿ã£ãæåæ°ãå¤ãããã¨ã
+ããã¨ã§ãï¼ã§ãããï¼ãã£ã¨çãååã使ãã°ãã®åé¡ã¯è§£æ±ºãã¾ãï¼ãã
+ãï¼ãã®ã¨ã©ã¼ã¯ï¼\\setcounterãªã©ã®ã«ã¦ã³ã¿å½ä»¤ã\\newenvironmentã»
+\\newtheoremå½ä»¤ã®å¼æ°ã®çµããã示ãå³æ¬å¼§ãå¿ããå
´åã«ãçãã¾ãï¼
save size
=========
-$B$3$N%(%i!<$O!$@k8@$NM-8zHO0O$dL?Na!&4D6-$,$"$^$j$K$b?<$/F~$l;R$K$J$C$F(B
-$B$$$k>l9g$K@8$8$^$9!%$?$H$($P!$(B\\multiput$BL?Na$N0z?t$K(Bpicture$B4D6-$,$"$j!$(B
-$B$=$N$J$+$K(B\\footnotesize$B@k8@$,$"$j!$$=$N@k8@$NM-8zHO0O$K(B\\multiput$BL?Na(B
-$B$,$"$C$F!$$=$N0z?t$K(B... $B$H$$$&$h$&$J>l9g$G$9!%(B")
+ãã®ã¨ã©ã¼ã¯ï¼å®£è¨ã®æå¹ç¯å²ãå½ä»¤ã»ç°å¢ããã¾ãã«ãæ·±ãå
¥ãåã«ãªã£ã¦
+ããå
´åã«çãã¾ãï¼ãã¨ãã°ï¼\\multiputå½ä»¤ã®å¼æ°ã«pictureç°å¢ãããï¼
+ãã®ãªãã«\\footnotesize宣è¨ãããï¼ãã®å®£è¨ã®æå¹ç¯å²ã«\\multiputå½ä»¤
+ããã£ã¦ï¼ãã®å¼æ°ã«... ã¨ãããããªå ´åã§ãï¼")
("Text line contains an invalid character." .
-
"$BF~NOCf$KIT@5$JJ8;z$,4^$^$l$F$$$^$9!%%U%!%$%k:n@.$N8m$j$K$h$C$F%F%-%9%H(B
-$B%(%G%#%?$,$3$NJ8;z$rA^F~$7$F$7$^$C$?$N$G$7$g$&!%<B:]$K2?$,5/$-$?$N$+$O(B
-$B%(%G%#%?$K$h$j$^$9!%F~NO%U%!%$%k$rD4$Y$F$_$F!$;XE&$5$l$?J8;z$,8+$D$+$i(B
-$B$J$$>l9g$K$O%m!<%+%k%,%$%I$r8+$F$/$@$5$$!%(B")
+ "å
¥åä¸ã«ä¸æ£ãªæåãå«ã¾ãã¦ãã¾ãï¼ãã¡ã¤ã«ä½æã®èª¤ãã«ãã£ã¦ããã¹ã
+ã¨ãã£ã¿ããã®æåãæ¿å
¥ãã¦ãã¾ã£ãã®ã§ãããï¼å®éã«ä½ãèµ·ããã®ãã¯
+ã¨ãã£ã¿ã«ããã¾ãï¼å
¥åãã¡ã¤ã«ã調ã¹ã¦ã¿ã¦ï¼ææãããæåãè¦ã¤ãã
+ãªãå ´åã«ã¯ãã¼ã«ã«ã¬ã¤ããè¦ã¦ãã ããï¼")
("Undefined control sequence." .
-
"TeX$B$,L$Dj5A$NL?NaL>$rH/8+$7$^$7$?!%$*$=$i$/F~NO$N8m$j$G$7$g$&!%$b$7$3(B
-$B$N%(%i!<$,(BLaTeX$BL?Na$N=hM}Cf$K@8$8$?>l9g$O!$$=$NL?Na$O4V0c$C$?0LCV$KCV$+(B
-$B$l$F$$$^$9!%Nc$($P!$%j%9%H4D6-$NCf$G$J$$$N$K(B\\item$BL?Na$,;H$o$l$?>l9g$J$I(B
-$B$G$9!%$^$?!$(B\\documentclass$BL?Na$,$J$$>l9g$K$b$3$N%(%i!<$,@8$8$^$9!%(B")
+ "TeXãæªå®ç¾©ã®å½ä»¤åãçºè¦ãã¾ããï¼ããããå
¥åã®èª¤ãã§ãããï¼ããã
+ã®ã¨ã©ã¼ãLaTeXå½ä»¤ã®å¦çä¸ã«çããå
´åã¯ï¼ãã®å½ä»¤ã¯ééã£ãä½ç½®ã«ç½®ã
+ãã¦ãã¾ãï¼ä¾ãã°ï¼ãªã¹ãç°å¢ã®ä¸ã§ãªãã®ã«\\itemå½ä»¤ã使ãããå
´åãªã©
+ã§ãï¼ã¾ãï¼\\documentclasså½ä»¤ããªãå
´åã«ããã®ã¨ã©ã¼ãçãã¾ãï¼")
("Use of [^ ]* doesn't match its definition." .
-
"$B$*$=$i$/IA2h$N$?$a$NL?Na$@$H;W$o$l$^$9$,!$0z?t$N;H$$$+$?$,4V0c$C$F$$(B
-$B$^$9!%4V0c$C$F$$$k$N$,(B\\@array$BL?Na$N>l9g$O!$(Barray$B4D6-$+(Btabular$B4D6-$G$N(B
-@$BI=8=$N0z?t$K$J$K$+8m$j$,$"$k$N$G$7$g$&!%(Bfragile$B$JL?Na$,(B\\protect$B$5$l$F(B
-$B$$$J$$$N$+$b$7$l$^$;$s!%(B")
+ "ããããæç»ã®ããã®å½ä»¤ã
ã¨æããã¾ããï¼å¼æ°ã®ä½¿ããããééã£ã¦ã
+ã¾ãï¼ééã£ã¦ããã®ã\\@arrayå½ä»¤ã®å
´åã¯ï¼arrayç°å¢ãtabularç°å¢ã§ã®
+@表ç¾ã®å¼æ°ã«ãªã«ã誤ããããã®ã§ãããï¼fragileãªå½ä»¤ã\\protectããã¦
+ããªãã®ããããã¾ããï¼")
("You can't use `macro parameter character \\#' in [^ ]* mode." .
-
"$BFC<lJ8;z(B#$B$,IaDL$N%F%-%9%H$NCf$K8=$l$^$7$?!%$*$=$i$/(B\\#$B$H=q$-$?$+$C$?(B
-$B$N$G$7$g$&!%(B")
+
"ç¹æ®æå#ãæ®éã®ããã¹ãã®ä¸ã«ç¾ãã¾ããï¼ãããã\\#ã¨æ¸ãããã£ã
+ã®ã§ãããï¼")
("Overfull \\\\hbox .*" .
-
"$B9TJ,3d$N$?$a$NE,@Z$J>l=j$,8+$D$+$i$J$+$C$?$N$G!$(B1$B9T$K<}$^$k$Y$-J,NL0J>e(B
-$B$N=PNO$,9T$J$o$l$F$7$^$$$^$7$?!%(B")
+ "è¡åå²ã®ããã®é©åãªå
´æãè¦ã¤ãããªãã£ãã®ã§ï¼1è¡ã«åã¾ãã¹ãåé以ä¸
+ã®åºåãè¡ãªããã¦ãã¾ãã¾ããï¼")
("Overfull \\\\vbox .*" .
-
"$B%Z!<%8J,3d$N$?$a$NE,@Z$J>l=j$,8+$D$+$i$J$+$C$?$N$G!$(B1$B%Z!<%8$K<}$^$k$Y$-(B
-$BJ,NL0J>e$N=PNO$,9T$J$o$l$F$7$^$$$^$7$?!%(B")
+ "ãã¼ã¸åå²ã®ããã®é©åãªå
´æãè¦ã¤ãããªãã£ãã®ã§ï¼1ãã¼ã¸ã«åã¾ãã¹ã
+åé以ä¸ã®åºåãè¡ãªããã¦ãã¾ãã¾ããï¼")
("Underfull \\\\hbox .*" .
-
"$BM>J,$J?bD>%9%Z!<%9$,$J$$$+$I$&$+=PNO$r3N$+$a$F$/$@$5$$!%$b$7$"$l$P!$$=(B
-$B$l$O(B\\\\$BL?Na$^$?$O(B\\newline$BL?Na$K4X78$9$kLdBj$N$?$a$K@8$8$?$b$N$G$9!%Nc(B
-$B$($P(B2$B$D$N(B\\\\$BL?Na$,B3$$$F$$$k>l9g$J$I$G$9!%$3$N7Y9p$O(Bsloppypar$B4D6-$d(B
-\\sloppy$B@k8@$N;HMQ!$$"$k$$$O(B\\linebreak$BL?Na$NA^F~$J$I$K$h$k>l9g$b$"$j$^$9!%(B")
+
"ä½åãªåç´ã¹ãã¼ã¹ããªããã©ããåºåã確ããã¦ãã
ããï¼ããããã°ï¼ã
+ãã¯\\\\å½ä»¤ã¾ãã¯\\newlineå½ä»¤ã«é¢ä¿ããåé¡ã®ããã«çãããã®ã§ãï¼ä¾
+ãã°2ã¤ã®\\\\å½ä»¤ãç¶ãã¦ããå
´åãªã©ã§ãï¼ãã®è¦åã¯sloppyparç°å¢ã
+\\sloppy宣è¨ã®ä½¿ç¨ï¼ãããã¯\\linebreakå½ä»¤ã®æ¿å
¥ãªã©ã«ããå ´åãããã¾ãï¼")
("Underfull \\\\vbox .*" .
-
"$B%Z!<%8$rJ,3d$9$k$?$a$NE,@Z$J>l=j$,8+$D$1$i$l$:!$==J,$J%F%-%9%H$N$J$$(B
-$B%Z!<%8$,$G$-$F$7$^$$$^$7$?!%(B")
+ "ãã¼ã¸ãåå²ããããã®é©åãªå
´æãè¦ã¤ããããï¼ååãªããã¹ãã®ãªã
+ãã¼ã¸ãã§ãã¦ãã¾ãã¾ããï¼")
;; New list items should be placed here
;;
@@ -902,12 +902,8 @@ save size
;;
;; the err-regexp item should match anything
- (".*" .
"$B$4$a$s$J$5$$!%3:Ev$9$k%X%k%W%a%C%;!<%8$,$"$j$^$;$s!%(B"))))
+ (".*" .
"ããããªããï¼è©²å½ãããã«ãã¡ãã»ã¼ã¸ãããã¾ããï¼"))))
(provide 'tex-jp)
-;; Local Variables:
-;; coding: iso-2022-jp
-;; End:
-
;;; tex-jp.el ends here
commit 6ca79102471a715cab87765658f42b5a720bea4a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 22:53:55 2021 -0400
Prefer lexical closures over hand-built lambda forms
now that we have lexical-binding, we can use closures, which have the
advantage over `(lambda ...) of allowing the byte-compiler to compile
the code, and also makes it possible to Edebug it.
* preview.el (preview-gs-close, preview-gs-flag-error)
(preview-scale-from-face, preview-gs-flag-error)
(preview-scale-from-face, preview-disabled-string)
(preview-buffer-restore, preview-place-preview)
(preview-reinstate-preview, preview-cache-preamble)
(preview-generate-preview, preview-report-bug):
* toolbar-x.el (toolbarx-emacs-mount-popup-menu):
* tex.el (TeX-mode-specific-command-menu): Replace `(lambda...) with
closures.
diff --git a/preview.el.in b/preview.el.in
index 9d2bc42..c6bc8b7 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -1030,13 +1030,11 @@ The usual PROCESS and COMMAND arguments for
(file-error nil)))
(preview-gs-restart))
(setq TeX-sentinel-function
- `(lambda (process command)
- (,(if preview-parsed-pdfoutput
- #'preview-pdf2dsc-sentinel
- #'preview-gs-dvips-sentinel)
- process
- command
- t))))
+ (let ((fun (if preview-parsed-pdfoutput
+ #'preview-pdf2dsc-sentinel
+ #'preview-gs-dvips-sentinel)))
+ (lambda (process command)
+ (funcall fun process command t)))))
(TeX-synchronous-sentinel "Preview-DviPS" (cdr preview-gs-file)
process))
;; pathological case: no previews although we sure thought so.
@@ -1320,9 +1318,8 @@ Try \\[ps-run-start] \\[ps-run-buffer] and \
(file-relative-name
(car (nth 1 filenames)))))
(ps-open
- `(lambda() (interactive "@")
- (preview-mouse-open-error
- ,(concat
+ (let ((str
+ (concat
(mapconcat #'shell-quote-argument
(append (list
preview-gs-command
@@ -1332,7 +1329,8 @@ Try \\[ps-run-start] \\[ps-run-buffer] and \
"\nGS>"
preview-gs-init-string
(aref (overlay-get ov 'queued) 1)
- err))))
+ err)))
+ (lambda () (interactive "@") (preview-mouse-open-error str))))
(str
(preview-make-clickable
nil
@@ -1340,20 +1338,20 @@ Try \\[ps-run-start] \\[ps-run-buffer] and \
"%s views error message
%s more options"
ps-open
- `(lambda() (interactive)
- (popup-menu
- '("PostScript error"
- ["View error" ,ps-open]
- ["View source"
- (lambda () (interactive "@")
- ,(if preview-ps-file
- `(preview-mouse-open-eps
- ,(if (consp (car file))
- (nth 1 (car file))
- (car file))
- ,(nth 0 (aref preview-gs-dsc
- (aref (overlay-get ov 'queued) 2))))
- `(preview-mouse-open-eps ,file)))]))))))
+ (let ((args
+ (if preview-ps-file
+ (list
+ (if (consp (car file)) (nth 1 (car file)) (car file))
+ (nth 0 (aref preview-gs-dsc
+ (aref (overlay-get ov 'queued) 2))))
+ (list file))))
+ (lambda () (interactive)
+ (popup-menu
+ `("PostScript error"
+ ["View error" ,ps-open]
+ ["View source" ,(lambda () (interactive "@")
+ (apply #'preview-mouse-open-eps
+ args))])))))))
(overlay-put ov 'strings (cons str str))
(preview-toggle ov)))
@@ -1535,10 +1533,10 @@ had let your document be parsed by AucTeX."
This calculates the scale of EPS images from a document assumed
to have a default font size given by function `preview-document-pt'
so that they match the reference face in height."
- `(lambda nil
- (/ ,(/ (preview-inherited-face-attribute 'preview-reference-face :height
- 'default) 10.0)
- (preview-document-pt))))
+ (let ((d (/ (preview-inherited-face-attribute 'preview-reference-face :height
+ 'default)
+ 10.0)))
+ (lambda () (/ d (preview-document-pt)))))
(defvar preview-min-spec)
@@ -2183,7 +2181,7 @@ active (`transient-mark-mode'), it is run through
`preview-region'."
"\
%s regenerates preview
%s more options"
- `(lambda() (interactive) (preview-regenerate ,ov)))
+ (lambda () (interactive) (preview-regenerate ov)))
;; icon on separate line only for stuff starting on its own line
(with-current-buffer (overlay-buffer ov)
(save-excursion
@@ -2374,10 +2372,12 @@ Remove them if they have expired."
This delay is so that minor modes changing buffer positions
\(like `x-symbol-mode' does) will not wreak havoc.
BUFFER-MISC is the appropriate data to be used."
- (add-hook 'desktop-delay-hook `(lambda ()
- (with-current-buffer ,(current-buffer)
- (preview-buffer-restore-internal
- ',buffer-misc)))))
+ (add-hook 'desktop-delay-hook
+ (let ((buf (current-buffer)))
+ (lambda ()
+ (with-current-buffer buf
+ (preview-buffer-restore-internal
+ buffer-misc))))))
(defun desktop-buffer-preview (file-name _buffer-name misc)
"Hook function for restoring persistent previews into a buffer."
@@ -2578,10 +2578,10 @@ to the close hook."
(overlay-put ov 'preview-map
(preview-make-clickable
nil nil nil
- `(lambda(event) (interactive "e")
- (preview-toggle ,ov 'toggle event))
- `(lambda(event) (interactive "e")
- (preview-context-menu ,ov event))))
+ (lambda (event) (interactive "e")
+ (preview-toggle ov 'toggle event))
+ (lambda (event) (interactive "e")
+ (preview-context-menu ov event))))
(overlay-put ov 'timestamp tempdir)
(when (cdr counters)
(overlay-put ov 'preview-counters counters)
@@ -2662,10 +2662,10 @@ if any."
(overlay-put ov 'preview-map
(preview-make-clickable
nil nil nil
- `(lambda(event) (interactive "e")
- (preview-toggle ,ov 'toggle event))
- `(lambda(event) (interactive "e")
- (preview-context-menu ,ov event))))
+ (lambda (event) (interactive "e")
+ (preview-toggle ov 'toggle event))
+ (lambda (event) (interactive "e")
+ (preview-context-menu ov event))))
(when counters
(overlay-put
ov 'preview-counters
@@ -3987,19 +3987,19 @@ If FORMAT-CONS is non-nil, a previous format may get
reused."
(prog1 (preview-generate-preview master command)
(add-hook 'kill-emacs-hook #'preview-cleanout-tempfiles t)
(setq TeX-sentinel-function
- `(lambda (process string)
- (condition-case err
- (progn
- (if (and (eq (process-status process) 'exit)
- (zerop (process-exit-status process)))
- (preview-watch-preamble
- ',master-file
- ',command
- ',format-cons)
- (preview-format-kill ',format-cons))
- (delete-file ',dump-file))
- (error (preview-log-error err "Dumping" process)))
- (preview-reraise-error process)))))))
+ (lambda (process _status)
+ (condition-case err
+ (progn
+ (if (and (eq (process-status process) 'exit)
+ (zerop (process-exit-status process)))
+ (preview-watch-preamble
+ master-file
+ command
+ format-cons)
+ (preview-format-kill format-cons))
+ (delete-file ',dump-file))
+ (error (preview-log-error err "Dumping" process)))
+ (preview-reraise-error process)))))))
(defun preview-cache-preamble-off (&optional old-format)
"Clear the pregenerated format file.
@@ -4134,16 +4134,18 @@ It returns the started process."
(let* (TeX-current-process-region-p)
(setq process (preview-cache-preamble dumped-cons))
(if process
+ ;; FIXME: Use `add-function'.
(setq TeX-sentinel-function
- `(lambda (process string)
- (funcall ,TeX-sentinel-function process string)
- (TeX-inline-preview-internal
- ,command ,file
- ',pr-file ,commandbuff
- ',dumped-cons
- ',master
- ',geometry
- (buffer-string)))))))
+ (let ((prev-fun TeX-sentinel-function))
+ (lambda (process string)
+ (funcall prev-fun process string)
+ (TeX-inline-preview-internal
+ command file
+ pr-file commandbuff
+ dumped-cons
+ master
+ geometry
+ (buffer-string))))))))
(or process
(TeX-inline-preview-internal command file
pr-file commandbuff
@@ -4262,7 +4264,8 @@ If not a regular release, the date of the last change.")
preview-undump-replacements
preview-auto-cache-preamble
preview-TeX-style-dir)
- `(lambda () (preview-dump-state ,(current-buffer)))
+ (let ((buf (current-buffer)))
+ (lambda () (preview-dump-state buf)))
(lambda ()
(insert (format "\nOutput from running `%s -h':\n"
preview-gs-command))
diff --git a/tex.el b/tex.el
index 214fa41..39cca4d 100644
--- a/tex.el
+++ b/tex.el
@@ -5013,8 +5013,8 @@ Brace insertion is only done if point is in a math
construct and
(defun TeX-mode-specific-command-menu (mode)
"Return a Command menu specific to the major MODE."
(list TeX-command-menu-name
- :filter `(lambda (&rest ignored)
- (TeX-mode-specific-command-menu-entries ',mode))
+ :filter (lambda (&rest _ignored)
+ (TeX-mode-specific-command-menu-entries mode))
"Bug."))
(defun TeX-mode-specific-command-menu-entries (mode)
diff --git a/toolbar-x.el b/toolbar-x.el
index 4e87d41..a1e15a3 100644
--- a/toolbar-x.el
+++ b/toolbar-x.el
@@ -299,18 +299,18 @@ inside Emacs. See documentation of that function for
more."
(setq used-symbols (cons key used-symbols)))
(define-key-after keymap (vector key)
`(menu-item ,i
- ,(append
- `(lambda nil (interactive)
- ,(if (eq real-type 'radio)
- `(setq ,var ,count)
- `(if (memq ,count ,var)
- (setq ,var (delete ,count ,var))
- (setq ,var (sort (cons ,count ,var) #'<))))
- (toolbarx-refresh))
- (when (eq real-save 'always)
- `((customize-save-variable
- (quote ,var) ,var)))
- `(,var))
+ ,(let ((count count))
+ (lambda () (interactive)
+ (set var
+ (if (eq real-type 'radio)
+ count
+ (if (memq count (symbol-value var))
+ (delete count (symbol-value var))
+ (sort (cons count (symbol-value var)) #'<))))
+ (toolbarx-refresh)
+ (when (eq real-save 'always)
+ (customize-save-variable var (symbol-value var)))
+ (symbol-value var)))
:button ,(if (eq real-type 'radio)
`(:radio eq ,var ,count)
`(:toggle memq ,count ,var))))
@@ -329,7 +329,7 @@ inside Emacs. See documentation of that function for more."
(lambda nil (interactive)
(customize-save-variable (quote ,var) ,var)))))
;; returns a `lambda'-expression
- `(lambda nil (interactive) (popup-menu (quote ,keymap)))))
+ (lambda () (interactive) (popup-menu keymap))))
(defun toolbarx-mount-popup-menu (strings var type &optional title save)
"Return a command that show a popup menu.
commit 2852adff623c3ad60f72c2288c8b86036b436b9b
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 22:36:40 2021 -0400
Activate lexical-binding everywhere
Also, add an underscore at the beginning of unused arguments to
silence warnings.
* bib-cite.el (bib-highlight-mouse): Remove unused vars `extent`
and `local-extent-list`.
* latex.el (LaTeX-label): Remove unused var `label`.
(LaTeX-math-mode-map): Move before first use.
* preview.el.in (preview-start-dvipng, preview-start-dvips):
Remove unused var `file`.
* tex-fold.el (TeX-fold-macro-nth-arg): Remove unused var `close-string`.
(TeX-fold-hide-item): Remove unused var `face`.
* tex-font.el (tex-font-lock-keywords-2): Remove unused var `type`.
* tex-info.el (Texinfo-mark-section): Rework to avoid relying on
dynamic scoping to access local vars.
* toolbar-x.el (toolbarx-test-toolbar-type): Remove unused vars
`all-but-def-opts` and `all-opts`; remove always-t var `good-jobs`.
diff --git a/auctex.el.in b/auctex.el.in
index b38b133..377c733 100644
--- a/auctex.el.in
+++ b/auctex.el.in
@@ -1,4 +1,4 @@
-;;; auctex.el --- Integrated environment for *TeX*
+;;; auctex.el --- Integrated environment for *TeX* -*- lexical-binding: t; -*-
;; Copyright (C) 2014-2020 Free Software Foundation, Inc.
diff --git a/bib-cite.el b/bib-cite.el
index 3ae2c79..b21bdcb 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -1,4 +1,4 @@
-;;; bib-cite.el --- test
+;;; bib-cite.el --- test -*- lexical-binding: t; -*-
;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX file.
;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2021 Free Software
Foundation, Inc.
@@ -1220,7 +1220,7 @@ See variables bib-etags-command and bib-etags-filename"
;; *all of code was here*
;; )
(save-excursion
- (let ((s)(e)(extent)(local-extent-list bib-ext-list)
+ (let ((s)(e);; (extent) (local-extent-list bib-ext-list)
(inhibit-read-only t)
(modified (buffer-modified-p))) ;put-text-property changing this?
;; * peta Wed Nov 8 16:27:29 1995 -- better remove the mouse face
diff --git a/context.el b/context.el
index e3a32aa..435bd18 100644
--- a/context.el
+++ b/context.el
@@ -1646,7 +1646,7 @@ Use `ConTeXt-Mark-version' to choose the command."
;; In any other case fall back on Mark II.
(t
(concat
- (let ((engine (eval (nth 4 (TeX-engine-in-engine-alist TeX-engine)))))
+ (let ((engine (eval (nth 4 (TeX-engine-in-engine-alist TeX-engine)) t)))
(when engine
(format "--engine=%s " engine)))
(unless (eq ConTeXt-current-interface "en")
diff --git a/font-latex.el b/font-latex.el
index 554c2d8..cf72831 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -227,7 +227,8 @@ Emacs."
Probably you don't want to customize this face directly. Better
change the base face `font-latex-sectioning-5-face' or customize the
variable `font-latex-fontify-sectioning'." ',num)
- :group 'font-latex-highlighting-faces)))))
+ :group 'font-latex-highlighting-faces)
+ t))))
(font-latex-make-sectioning-faces font-latex-sectioning-max)
@@ -474,7 +475,7 @@ You have to restart Emacs for a change of this variable to
take effect."
;; Name of the face
(symbol-name
(let ((face (nth 2 spec)))
- (if (symbolp face) face (eval face))))
+ (if (symbolp face) face (eval face t))))
"'.\n"
;; List of keywords
(with-temp-buffer
@@ -1352,7 +1353,7 @@ Take care when the actually fonfified region was extended
beyond END."
;; Copy and adaption of `tex-font-lock-unfontify-region' from
;; tex-mode.el in GNU Emacs on 2004-08-04.
;; (XEmacs passes a third argument to the function.)
-(defun font-latex-unfontify-region (beg end &rest ignored)
+(defun font-latex-unfontify-region (beg end &rest _ignored)
"Unfontify region from BEG to END."
(font-lock-default-unfontify-region beg end)
(remove-list-of-text-properties beg end '(script-level invisible))
diff --git a/latex.el b/latex.el
index 9e22628..6b46848 100644
--- a/latex.el
+++ b/latex.el
@@ -1129,7 +1129,7 @@ returned, nil if it is empty."
"")
(t
nil)))
- label)
+ ) ;; label
(when (symbolp TeX-read-label-prefix)
(setq TeX-read-label-prefix (symbol-value TeX-read-label-prefix)))
(when TeX-read-label-prefix
@@ -2007,13 +2007,13 @@ It will setup BibTeX to store keys in an auto file."
If EXPR evaluate to true, parse THEN as an argument list, else
parse ELSE as an argument list. The compatibility argument
OPTIONAL is ignored."
- (TeX-parse-arguments (if (eval expr) then else)))
+ (TeX-parse-arguments (if (eval expr t) then else)))
(defun TeX-arg-eval (optional &rest args)
"Evaluate ARGS and insert value in buffer.
If OPTIONAL is non-nil, insert the resulting value as an optional
argument, otherwise as a mandatory one."
- (TeX-argument-insert (eval args) optional))
+ (TeX-argument-insert (eval args t) optional))
(defvar TeX-read-label-prefix nil
"Initial input for the label in `TeX-read-label.'")
@@ -3058,7 +3058,7 @@ for the key. Use PROMPT as the prompt string."
(multi-prompt-key-value
(TeX-argument-prompt optional prompt "Options (k=v)")
(if (symbolp key-val-alist)
- (eval key-val-alist)
+ (eval key-val-alist t)
key-val-alist)))
(defun TeX-arg-key-val (optional key-val-alist &optional prompt)
@@ -4787,6 +4787,8 @@ of verbatim constructs are not considered."
;;; Math Minor Mode
+(defvar LaTeX-math-mode-map)
+
(defgroup LaTeX-math nil
"Mathematics in AUCTeX."
:group 'LaTeX-macro)
@@ -5467,7 +5469,6 @@ See also `LaTeX-math-menu'."
(integer :tag "Number")))))
(defvar LaTeX-math-mode-menu)
-(defvar LaTeX-math-mode-map)
(define-minor-mode LaTeX-math-mode
"A minor mode with easy access to TeX math macros.
@@ -5728,7 +5729,7 @@ the last entry in the menu."
(if (= rest outer) (setq inner (1+ inner)))))
result))))
-(defun LaTeX-section-menu-filter (ignored)
+(defun LaTeX-section-menu-filter (_ignored)
"Filter function for the section submenu in the mode menu.
The argument IGNORED is not used in any way."
(TeX-update-style)
@@ -5787,11 +5788,13 @@ corresponds to the variables
`LaTeX-environment-menu-name' and
["Complete Macro" TeX-complete-symbol
:help "Complete the current macro or environment name"]
,(list LaTeX-environment-menu-name
- :filter (lambda (ignored) (LaTeX-environment-menu-filter
- LaTeX-environment-menu-name)))
+ :filter (lambda (_ignored)
+ (LaTeX-environment-menu-filter
+ LaTeX-environment-menu-name)))
,(list LaTeX-environment-modify-menu-name
- :filter (lambda (ignored) (LaTeX-environment-menu-filter
- LaTeX-environment-modify-menu-name)))
+ :filter (lambda (_ignored)
+ (LaTeX-environment-menu-filter
+ LaTeX-environment-modify-menu-name)))
["Close Environment" LaTeX-close-environment
:help "Insert the \\end part of the current environment"]
["Item" LaTeX-insert-item
diff --git a/lpath.el b/lpath.el
index 5613683..f43a984 100644
--- a/lpath.el
+++ b/lpath.el
@@ -1,6 +1,6 @@
-;;; This file is only used for installing AUCTeX.
+;;; This file is only used for installing AUCTeX. -*- lexical-binding: t; -*-
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
;;; It is not a part of AUCTeX itself.
diff --git a/multi-prompt.el b/multi-prompt.el
index 884eddc..5ca3422 100644
--- a/multi-prompt.el
+++ b/multi-prompt.el
@@ -1,4 +1,4 @@
-;;; multi-prompt.el --- Completing read of multiple strings
+;;; multi-prompt.el --- Completing read of multiple strings -*-
lexical-binding: t; -*-
;; Copyright (C) 1996-2021 Free Software Foundation, Inc.
@@ -174,7 +174,7 @@ This is achieved by eval'ing all variables in the value
parts of
the alist elements."
(mapcar (lambda (x)
(if (and (cadr x) (symbolp (cadr x)) (not (functionp (cadr x))))
- (cons (car x) (list (eval (cadr x))))
+ (cons (car x) (list (eval (cadr x) t)))
x))
table))
diff --git a/preview.el.in b/preview.el.in
index 2789a0e..9d2bc42 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -1,7 +1,6 @@
-;;; preview.el --- embed preview LaTeX images in source buffer
+;;; preview.el --- embed preview LaTeX images in source buffer -*-
lexical-binding: t; -*-
-;; Copyright (C) 2001-2006, 2010-2015,
-;; 2017-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
;; Author: David Kastrup
;; Keywords: tex, wp, convenience
@@ -1737,7 +1736,7 @@ Consults `preview-transparent-color'."
file type ascent border))
(put 'preview-filter-specs :type
- (lambda (keyword value &rest args)
+ (lambda (_keyword value &rest args)
(if (image-type-available-p value)
`(image :type ,value
,@(preview-filter-specs-1 args))
@@ -1818,7 +1817,7 @@ to require redumping of a format."
:type 'string)
(defun preview-preamble-changed-function
- (ov after-change beg end &optional length)
+ (ov _after-change _beg _end &optional _length)
"Hook function for change hooks on preamble.
See info node `(elisp) Overlay Properties' for
definition of OV, AFTER-CHANGE, BEG, END and LENGTH."
@@ -1903,7 +1902,7 @@ Disable it if that is the case. Ignores text properties."
(setq preview-change-list nil))
(defun preview-handle-insert-in-front
- (ov after-change beg end &optional length)
+ (ov after-change _beg end &optional _length)
"Hook function for `insert-in-front-hooks' property.
See info node `(elisp) Overlay Properties' for
definition of OV, AFTER-CHANGE, BEG, END and LENGTH."
@@ -1914,7 +1913,7 @@ definition of OV, AFTER-CHANGE, BEG, END and LENGTH."
(preview-register-change ov)))
(defun preview-handle-insert-behind
- (ov after-change beg end &optional length)
+ (ov after-change beg _end &optional _length)
"Hook function for `insert-behind-hooks' property.
This is needed in case `insert-before-markers' is used at the
end of the overlay. See info node `(elisp) Overlay Properties'
@@ -1926,7 +1925,7 @@ for definition of OV, AFTER-CHANGE, BEG, END and LENGTH."
(preview-register-change ov)))
(defun preview-handle-modification
- (ov after-change beg end &optional length)
+ (ov after-change _beg _end &optional _length)
"Hook function for `modification-hooks' property.
See info node `(elisp) Overlay Properties' for
definition of OV, AFTER-CHANGE, BEG, END and LENGTH."
@@ -2208,7 +2207,7 @@ active (`transient-mark-mode'), it is run through
`preview-region'."
(file-error nil))
(overlay-put ovr 'filenames nil)))
-(defun preview-delete (ovr &rest ignored)
+(defun preview-delete (ovr &rest _ignored)
"Delete preview overlay OVR, taking any associated file along.
IGNORED arguments are ignored, making this function usable as
a hook in some cases"
@@ -2305,7 +2304,7 @@ kept."
(setq ctr (delete elt ctr)))))
(apply #'concat ctr))
-(defun desktop-buffer-preview-misc-data (&rest ignored)
+(defun desktop-buffer-preview-misc-data (&rest _ignored)
"Hook function that extracts previews for persistent sessions."
(unless (buffer-modified-p)
(setq preview-last-counter nil)
@@ -3698,7 +3697,7 @@ The fourth value is the transparent border thickness."
(defun preview-start-dvipng ()
"Start a DviPNG process.."
- (let* ((file preview-gs-file)
+ (let* (;; (file preview-gs-file)
tempdir
(res (/ (* (car preview-resolution)
(preview-hook-enquiry preview-scale))
@@ -3739,7 +3738,7 @@ The fourth value is the transparent border thickness."
(defun preview-start-dvips (&optional fast)
"Start a DviPS process.
If FAST is set, do a fast conversion."
- (let* ((file preview-gs-file)
+ (let* (;; (file preview-gs-file)
tempdir
(command (with-current-buffer TeX-command-buffer
(prog1
@@ -4088,7 +4087,7 @@ environments is selected."
(interactive "p")
(save-excursion
(let (currenv)
- (dotimes (i (1- count))
+ (dotimes (_ (1- count))
(setq currenv (LaTeX-current-environment))
(if (string= currenv "document")
(error "No enclosing outer environment found"))
@@ -4152,7 +4151,7 @@ It returns the started process."
geometry))))
(defun TeX-inline-preview-internal (command file pr-file
- commandbuff dumped-cons master
+ commandbuff dumped-cons _master
geometry
&optional str)
"Internal stuff for previewing.
diff --git a/tests/context/context-test.el b/tests/context/context-test.el
index 1fcc999..4eeab4b 100644
--- a/tests/context/context-test.el
+++ b/tests/context/context-test.el
@@ -1,6 +1,6 @@
-;;; context-test.el --- tests for ConTeXt mode
+;;; context-test.el --- tests for ConTeXt mode -*- lexical-binding: t; -*-
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/japanese/error-parsing.el b/tests/japanese/error-parsing.el
index da6a413..36f3ca5 100644
--- a/tests/japanese/error-parsing.el
+++ b/tests/japanese/error-parsing.el
@@ -1,6 +1,6 @@
-;;; error-parsing.el --- tests for error parsing
+;;; error-parsing.el --- tests for error parsing -*- lexical-binding: t; -*-
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/japanese/parse-timing.el b/tests/japanese/parse-timing.el
index a05b06f..15051bc 100644
--- a/tests/japanese/parse-timing.el
+++ b/tests/japanese/parse-timing.el
@@ -1,6 +1,6 @@
-;;; parse-timing.el --- tests for parse timing
+;;; parse-timing.el --- tests for parse timing -*- lexical-binding: t; -*-
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/japanese/preview-latex.el b/tests/japanese/preview-latex.el
index ec54f11..0d03982 100644
--- a/tests/japanese/preview-latex.el
+++ b/tests/japanese/preview-latex.el
@@ -1,6 +1,6 @@
-;;; preview-latex.el --- tests for preview-latex compatibility
+;;; preview-latex.el --- tests for preview-latex compatibility -*-
lexical-binding: t; -*-
-;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/latex/font-latex-test.el b/tests/latex/font-latex-test.el
index 82579a3..7484d03 100644
--- a/tests/latex/font-latex-test.el
+++ b/tests/latex/font-latex-test.el
@@ -1,6 +1,6 @@
-;;; font-latex-test.el --- tests for font-latex
+;;; font-latex-test.el --- tests for font-latex -*- lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/latex/latex-test.el b/tests/latex/latex-test.el
index 4600ad6..6f70d95 100644
--- a/tests/latex/latex-test.el
+++ b/tests/latex/latex-test.el
@@ -1,6 +1,6 @@
-;;; latex-test.el --- tests for LaTeX mode
+;;; latex-test.el --- tests for LaTeX mode -*- lexical-binding: t; -*-
-;; Copyright (C) 2014--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/latex/preview-latex-test.el
b/tests/latex/preview-latex-test.el
index a8375cb..8c7d831 100644
--- a/tests/latex/preview-latex-test.el
+++ b/tests/latex/preview-latex-test.el
@@ -1,6 +1,6 @@
-;;; preview-latex.el --- tests for preview-latex compatibility
+;;; preview-latex.el --- tests for preview-latex compatibility -*-
lexical-binding: t; -*-
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/latex/texmathp-test.el b/tests/latex/texmathp-test.el
index eeda1c9..3fb6f54 100644
--- a/tests/latex/texmathp-test.el
+++ b/tests/latex/texmathp-test.el
@@ -1,6 +1,6 @@
-;;; texmathp-test.el --- tests for texmathp
+;;; texmathp-test.el --- tests for texmathp -*- lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/tex/command-expansion.el b/tests/tex/command-expansion.el
index cc5d9d8..5407867 100644
--- a/tests/tex/command-expansion.el
+++ b/tests/tex/command-expansion.el
@@ -1,6 +1,6 @@
-;;; command-expansion.el --- tests for TeX command expansion
+;;; command-expansion.el --- tests for TeX command expansion -*-
lexical-binding: t; -*-
-;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/tex/error-parsing.el b/tests/tex/error-parsing.el
index ca82132..6cde540 100644
--- a/tests/tex/error-parsing.el
+++ b/tests/tex/error-parsing.el
@@ -1,6 +1,6 @@
-;;; error-parsing.el --- tests for error parsing
+;;; error-parsing.el --- tests for error parsing -*- lexical-binding: t; -*-
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/tex/navigation.el b/tests/tex/navigation.el
index d429be6..4debb44 100644
--- a/tests/tex/navigation.el
+++ b/tests/tex/navigation.el
@@ -1,6 +1,6 @@
-;;; navigation.el --- tests for navigation function in TeX buffer
+;;; navigation.el --- tests for navigation function in TeX buffer -*-
lexical-binding: t; -*-
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tests/tex/path-expansion.el b/tests/tex/path-expansion.el
index c30e64d..2246e92 100644
--- a/tests/tex/path-expansion.el
+++ b/tests/tex/path-expansion.el
@@ -1,6 +1,6 @@
-;;; path-expansion.el --- tests for path expansion
+;;; path-expansion.el --- tests for path expansion -*- lexical-binding: t; -*-
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
;; This file is part of AUCTeX.
diff --git a/tex-bar.el b/tex-bar.el
index 72fe1dc..abec658 100644
--- a/tex-bar.el
+++ b/tex-bar.el
@@ -189,7 +189,7 @@ format of the argument MEANING-ALIST in the mentioned
function."
(labels))
(dolist (m-alist TeX-bar-TeX-all-button-alists)
(setq labels nil)
- (dolist (as (eval m-alist))
+ (dolist (as (eval m-alist t))
(setq labels (cons (car as) labels)))
(setq assqs-button-alists (cons (cons m-alist (nreverse labels))
assqs-button-alists)))
@@ -219,7 +219,7 @@ format of the argument MEANING-ALIST in the mentioned
function."
(let ((append-list))
(dolist (elt TeX-bar-TeX-all-button-alists)
(setq append-list (append append-list
- (eval elt))))
+ (eval elt t))))
append-list)))
(defcustom TeX-bar-LaTeX-buttons
@@ -334,7 +334,7 @@ format of the argument MEANING-ALIST in the mentioned
function."
(labels))
(dolist (m-alist TeX-bar-LaTeX-all-button-alists)
(setq labels nil)
- (dolist (as (eval m-alist))
+ (dolist (as (eval m-alist t))
(setq labels (cons (car as) labels)))
(setq assqs-button-alists (cons (cons m-alist (nreverse labels))
assqs-button-alists)))
@@ -368,7 +368,7 @@ format of the argument MEANING-ALIST in the mentioned
function."
(let ((append-list))
(dolist (elt TeX-bar-LaTeX-all-button-alists)
(setq append-list (append append-list
- (eval elt))))
+ (eval elt t))))
append-list)))
;;; Experimental Symbol Toolbar
diff --git a/tex-buf.el b/tex-buf.el
index ddb71b6..601d5a0 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -178,14 +178,14 @@ pinned region will get unpinned and vice versa."
(let* ((begin (or TeX-command-region-begin (region-beginning)))
(end (or TeX-command-region-end (region-end)))
(TeX-region-extra
- ;; Write out counter information to region.
- (concat (and (fboundp 'preview--counter-information)
- (preview--counter-information begin))
- TeX-region-extra)))
+ ;; Write out counter information to region.
+ (concat (and (fboundp 'preview--counter-information)
+ (preview--counter-information begin))
+ TeX-region-extra)))
(TeX-region-create (TeX-region-file TeX-default-extension)
(buffer-substring-no-properties begin end)
(file-name-nondirectory (buffer-file-name))
- (TeX-current-offset begin))))
+ (TeX-current-offset TeX--begin))))
(defun TeX-command-region (&optional override-confirm)
"Run TeX on the current region.
@@ -1384,7 +1384,7 @@ Error parsing on \\[next-error] should work with a bit of
luck."
"Execute Lisp function or function call given as the string COMMAND.
Parameters NAME and FILE are ignored."
(let ((fun (car (read-from-string command))))
- (if (functionp fun) (funcall fun) (eval fun))))
+ (if (functionp fun) (funcall fun) (eval fun t))))
(defun TeX-run-discard-or-function (name command file)
"Start COMMAND as process or execute it as a Lisp function.
diff --git a/tex-fold.el b/tex-fold.el
index d448890..2cf320e 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -1,4 +1,4 @@
-;;; tex-fold.el --- Fold TeX macros.
+;;; tex-fold.el --- Fold TeX macros. -*- lexical-binding: t; -*-
;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
@@ -588,7 +588,7 @@ backward compatibility and always nil."
(open-char (if delims (car delims) ?{))
(open-string (char-to-string open-char))
(close-char (if delims (cdr delims) ?}))
- (close-string (char-to-string close-char))
+ ;; (close-string (char-to-string close-char))
content-start content-end)
(goto-char macro-start)
(if (condition-case nil
@@ -794,7 +794,8 @@ That means, put respective properties onto overlay OV."
(t (or (TeX-fold-macro-nth-arg spec ov-start ov-end)
"[Error: No content found]"))))
(display-string (if (listp computed) (car computed) computed))
- (face (when (listp computed) (cadr computed))))
+ ;; (face (when (listp computed) (cadr computed)))
+ )
;; Do nothing if the overlay is empty.
(when (and ov-start ov-end)
;; Cater for zero-length display strings.
diff --git a/tex-font.el b/tex-font.el
index 9fa53b3..5f483d8 100644
--- a/tex-font.el
+++ b/tex-font.el
@@ -1,4 +1,4 @@
-;;; tex-font.el --- Font-Lock support stolen from Emacs 21.
+;;; tex-font.el --- Font-Lock support stolen from Emacs 21. -*-
lexical-binding: t; -*-
;;
;; Copyright (C) 1985-2021 Free Software Foundation, Inc.
@@ -91,7 +91,7 @@
"boldsymbol" "pmb")
t))
(italic (regexp-opt '("textit" "textsl" "emph") t))
- (type (regexp-opt '("texttt" "textmd" "textrm" "textsf") t))
+ ;; (type (regexp-opt '("texttt" "textmd" "textrm" "textsf")
t))
;;
;; Names of commands whose arg should be fontified as a
citation.
(citations (regexp-opt
diff --git a/tex-info.el b/tex-info.el
index e50fccc..185f755 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -1,4 +1,4 @@
-;;; tex-info.el --- Support for editing Texinfo source.
+;;; tex-info.el --- Support for editing Texinfo source. -*- lexical-binding:
t; -*-
;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
@@ -171,7 +171,7 @@ environments."
;; Only change point and mark after beginning and end were found.
;; Point should not end up in the middle of nowhere if the search fails.
(save-excursion
- (dotimes (c count)
+ (dotimes (_ count)
(Texinfo-find-env-end))
(setq end (line-beginning-position 2))
(goto-char cur)
@@ -247,20 +247,22 @@ the section."
(point))))))); (if ...)
(when (and beg end)
;; now take also enclosing node of beg and end
- (dolist
- (boundary '(beg end))
- (when (symbol-value (intern (concat "is-" (symbol-name boundary)
- "-section")))
- (save-excursion
- (goto-char (symbol-value boundary))
- (while
- (and
- (null (bobp))
- (progn
- (beginning-of-line 0)
- (looking-at "^\\s-*\\($\\|@\\(c\\|comment\\)\\_>\\)"))))
- (when (looking-at "^\\s-*@node\\_>")
- (set boundary (point))))))
+ (let ((before-@node
+ (lambda (pos)
+ (save-excursion
+ (goto-char pos)
+ (while (and
+ (null (bobp))
+ (progn
+ (beginning-of-line 0)
+ (looking-at
+ "^\\s-*\\($\\|@\\(c\\|comment\\)\\_>\\)"))))
+ (when (looking-at "^\\s-*@node\\_>")
+ (point))))))
+ (when is-beg-section
+ (setq beg (or (funcall before-@node beg) beg)))
+ (when is-end-section
+ (setq end (or (funcall before-@node end) end))))
(push-mark end)
(goto-char beg)
@@ -391,7 +393,7 @@ for @node."
(progn (skip-chars-forward "^,") (forward-char 2))
(throw 'break nil)))))))
-(defun Texinfo-arg-nodename (optional &optional prompt definition)
+(defun Texinfo-arg-nodename (optional &optional prompt _definition)
"Prompt for a node name completing with known node names.
OPTIONAL is ignored.
Use PROMPT as the prompt string.
@@ -403,13 +405,13 @@ each invocation."
(Texinfo-make-node-list))))
(insert "{" (Texinfo-nodename-escape node-name) "}" )))
-(defun Texinfo-arg-lrc (optional &rest args)
+(defun Texinfo-arg-lrc (_optional &rest _args)
(let ((l (read-from-minibuffer "Enter left part: "))
(c (read-from-minibuffer "Enter center part: "))
(r (read-from-minibuffer "Enter right part: ")))
(insert " " l " @| " c " @| " r)))
-(defun Texinfo-arg-next-line (optional &rest args)
+(defun Texinfo-arg-next-line (_optional &rest _args)
"Go to the beginning of next line if we are at the end of line. Otherwise
insert an end-of-line."
(if (eolp) (forward-line) (insert "\n")))
diff --git a/tex-mik.el b/tex-mik.el
index fdf72a1..1f27d3a 100644
--- a/tex-mik.el
+++ b/tex-mik.el
@@ -1,6 +1,6 @@
-;;; tex-mik.el --- MiKTeX support for AUCTeX.
+;;; tex-mik.el --- MiKTeX support for AUCTeX. -*- lexical-binding: t; -*-
-;; Copyright (C) 1999, 2000, 2001, 2004, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2021 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: auctex-devel@gnu.org
diff --git a/tex-site.el.in b/tex-site.el.in
index c4b5d0d..847bedd 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -1,4 +1,4 @@
-;;; tex-site.el - Site specific variables. Don't edit.
+;;; tex-site.el - Site specific variables. Don't edit. -*- lexical-binding:
t; -*-
;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;;
diff --git a/tex-style.el b/tex-style.el
index 13811e4..d1b513b 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -1,4 +1,4 @@
-;;; tex-style.el --- Customizable variables for AUCTeX style files
+;;; tex-style.el --- Customizable variables for AUCTeX style files -*-
lexical-binding: t; -*-
;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
diff --git a/tex-wizard.el b/tex-wizard.el
index 5299d32..1597e27 100644
--- a/tex-wizard.el
+++ b/tex-wizard.el
@@ -1,4 +1,4 @@
-;;; tex-wizard.el --- Check the TeX configuration
+;;; tex-wizard.el --- Check the TeX configuration -*- lexical-binding: t; -*-
;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
diff --git a/tex.el b/tex.el
index b6d1530..214fa41 100644
--- a/tex.el
+++ b/tex.el
@@ -1472,7 +1472,7 @@ predicates are true, nil otherwise."
(result t)
elt)
(while (and (setq elt (pop pred-symbols)) result)
- (unless (eval (cadr (assq elt pred-defs)))
+ (unless (eval (cadr (assq elt pred-defs)) t)
(setq result nil)))
result))
@@ -1803,7 +1803,7 @@ raise the Emacs frame like so:
:type 'function
:group 'TeX-view)
-(defun TeX-source-correlate-sync-source (file linecol &rest ignored)
+(defun TeX-source-correlate-sync-source (file linecol &rest _ignored)
"Show TeX FILE with point at LINECOL.
This function is called when emacs receives a SyncSource signal
emitted from the Evince document viewer. IGNORED absorbs an
@@ -3213,7 +3213,7 @@ Or alternatively:
(close (if (and (nth 3 entry)
(listp (nth 3 entry))
(symbolp (car (nth 3 entry))))
- (eval (nth 3 entry))
+ (eval (nth 3 entry) t)
(nth 3 entry)))
(begin (match-beginning sub))
(end (match-end sub))
@@ -3614,7 +3614,7 @@ Unless optional argument COMPLETE is non-nil, ``: '' will
be appended."
(defun TeX-arg-maybe (symbol list form)
"Evaluates FORM, if SYMBOL is an element of LIST."
(when (memq symbol list)
- (eval form)))
+ (eval form t)))
(defun TeX-arg-free (optional &rest args)
"Parse its arguments but use no braces when they are inserted."
@@ -4652,7 +4652,7 @@ If optional argument STRIP is non-nil, remove file
extension."
(rawdirs (nth 2 spec))
(exts (nth 3 spec))
expdirs dirs local-files)
- (setq exts (if (symbolp exts) (eval exts) exts))
+ (setq exts (if (symbolp exts) (eval exts t) exts))
(or (TeX-search-files-kpathsea kpse-var exts scope nodir strip)
(progn
(unless (eq scope 'global)
diff --git a/toolbar-x.el b/toolbar-x.el
index e17ee02..4e87d41 100644
--- a/toolbar-x.el
+++ b/toolbar-x.el
@@ -1,4 +1,4 @@
-;;; toolbar-x.el --- fancy toolbar handling in Emacs
+;;; toolbar-x.el --- fancy toolbar handling in Emacs -*- lexical-binding: t;
-*-
;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
@@ -457,10 +457,11 @@ VAL (see documentation of function
`toolbarx-process-symbol')."
(let ((toolbarx-test-toolbar-type-simple
(lambda (obj)
(let* ((val (toolbarx-option-value obj))
- (all-but-def-opts '(top bottom left right))
- (all-opts '(default top bottom left right))
- (good-obj t))
- (cons good-obj val)))))
+ ;; (all-but-def-opts '(top bottom left right))
+ ;; (all-opts '(default top bottom left right))
+ ;; (good-obj t)
+ )
+ (cons t val)))))
(toolbarx-eval-function-or-symbol obj toolbarx-test-toolbar-type-simple)))
(defun toolbarx-test-dropdown-type (obj)
@@ -623,7 +624,7 @@ value, and after that a list in the same format as
SWITCHES."
((eq (car group) :eval-group)
(let ((current-switches switches))
(dolist (elt (cdr group) current-switches)
- (let ((eval-elt (eval elt)))
+ (let ((eval-elt (eval elt t)))
(setq current-switches
(toolbarx-process-group (if (listp eval-elt)
eval-elt
@@ -1071,7 +1072,7 @@ function `toolbar-install-toolbar'."
filtered-props-temp))))))))
(insert (or (not (memq :insert filtered-props))
;; (memq :insert filtered-props)
- (eval (nth 1 (memq :insert filtered-props))))))
+ (eval (nth 1 (memq :insert filtered-props)) t))))
(when insert
(cond
(t
@@ -1151,7 +1152,7 @@ recursively as SWITCHES. USED-KEYS is a list which `car'
is
been used as keys in the keymap `tool-bar-map'."
(dolist (button switches)
(if (eq (car button) :insert)
- (when (eval (cadr button))
+ (when (eval (cadr button) t)
(toolbarx-emacs-refresh-process-button-or-insert-list (cddr button)
used-keys
keymap))
commit d7bdc79cafa1bca2a0da5caa9aa7911393175366
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue Mar 23 11:28:12 2021 -0400
Expose the body of advice to the compiler
While at it, use `advice-add` when available.
We can drop `defadvice` completely when we bump the required version
to Emacs-24.4, or if/when we add `nadvice` as a required package.
* context.el (ConTeXt--invalidate-menu): New function.
(ConTeXt-add-environments): Advise with it.
* latex.el (LaTeX-add-bibliographies): Advise with `TeX-run-style-hooks`.
(LaTeX--invalidate-menus): New function.
(LaTeX-add-environments): Advise with it.
* preview.el.in (preview--open-for-replace): New function.
(replace-highlight): Advise with it.
* tex.el (tex--call-minor-mode): New function.
(hack-one-local-variable): Advise with it.
diff --git a/context.el b/context.el
index 4def467..e3a32aa 100644
--- a/context.el
+++ b/context.el
@@ -636,8 +636,12 @@ inserted after the sectioning command."
(TeX-auto-add-type "environment" "ConTeXt")
-(defadvice ConTeXt-add-environments (after ConTeXt-invalidate-menu (&rest
environments) activate)
- "Add ENVIRONMENTS to the list of known environments."
+(if (fboundp 'advice-add) ;Emacsâ¥24.4 (or ELPA package nadvice)
+ (advice-add 'ConTeXt-add-environments :after #'ConTeXt--invalidate-menu)
+ (defadvice ConTeXt-add-environments (after ConTeXt-invalidate-menu (&rest
environments) activate)
+ (ConTeXt--invalidate-menu)))
+(defun ConTeXt--invalidate-menu (&rest _)
+ "Mark the menu as being in need of a refresh."
(setq ConTeXt-menu-changed t))
;; (defvar ConTeXt-environment-list ()
diff --git a/latex.el b/latex.el
index 3265615..9e22628 100644
--- a/latex.el
+++ b/latex.el
@@ -1967,9 +1967,11 @@ The value is actually the tail of the list of options
given to PACKAGE."
(add-hook 'TeX-auto-cleanup-hook #'LaTeX-auto-cleanup)
-(defadvice LaTeX-add-bibliographies (after run-bib-style-hooks (&rest
bibliographies) activate)
- "Add BIBLIOGRAPHIES to the list of known bibliographies and style files."
- (apply #'TeX-run-style-hooks bibliographies))
+(if (fboundp 'advice-add) ;Emacsâ¥24.4 (or ELPA package nadvice)
+ (advice-add 'LaTeX-add-bibliographies :after #'TeX-run-style-hooks)
+ (defadvice LaTeX-add-bibliographies (after run-bib-style-hooks (&rest
bibliographies) activate)
+ "Add BIBLIOGRAPHIES to the list of known bibliographies and style files."
+ (apply #'TeX-run-style-hooks bibliographies)))
;;; Biber support
@@ -5761,10 +5763,12 @@ corresponds to the variables
`LaTeX-environment-menu-name' and
(mapcar #'LaTeX-environment-modify-menu-entry
(LaTeX-environment-list))))))))
-(defadvice LaTeX-add-environments (after LaTeX-invalidate-environment-menu
(&rest environments) activate)
- "Add ENVIRONMENTS to the list of known environments.
-Additionally invalidate the environment submenus to let them be
-regenerated by the respective menu filter."
+(if (fboundp 'advice-add) ;Emacsâ¥24.4 (or ELPA package nadvice)
+ (advice-add 'LaTeX-add-environments :after #'LaTeX--invalidate-menus)
+ (defadvice LaTeX-add-environments (after LaTeX-invalidate-environment-menu
(&rest environments) activate)
+ (LaTeX--invalidate-menus)))
+(defun LaTeX--invalidate-menus (&rest _)
+ "Mark the environment menus as being in need of a refresh."
(setq LaTeX-environment-menu nil)
(setq LaTeX-environment-modify-menu nil))
diff --git a/preview.el.in b/preview.el.in
index a15629b..2789a0e 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -2060,10 +2060,14 @@ overlays not in the active window."
(preview-toggle ovr)
(push ovr preview-temporary-opened))))
-(defadvice replace-highlight (before preview)
+(if (fboundp 'advice-add) ;Emacsâ¥24.4 (or ELPA package nadvice)
+ (advice-add 'replace-highlight :before #'preview--open-for-replace)
+ (defadvice replace-highlight (before preview)
+ (preview--open-for-replace (ad-get-arg 0) (ad-get-arg 1))))
+
+(defun preview--open-for-replace (beg end &rest _)
"Make `query-replace' open preview text about to be replaced."
- (preview-open-overlays
- (overlays-in (ad-get-arg 0) (ad-get-arg 1))))
+ (preview-open-overlays (overlays-in beg end)))
(defcustom preview-query-replace-reveal t
"Make `query-replace' autoreveal previews."
diff --git a/tex.el b/tex.el
index a295a21..b6d1530 100644
--- a/tex.el
+++ b/tex.el
@@ -752,17 +752,19 @@ emacs 24.1 and is then later run by emacs 24.5."
(add-to-list 'Info-file-list-for-emacs
(cons elt "AUCTeX"))))
-(defadvice hack-one-local-variable (after TeX-hack-one-local-variable-after
+(if (fboundp 'advice-add) ;Emacsâ¥24.4 (or ELPA package nadvice)
+ (advice-add 'hack-one-local-variable :after #'tex--call-minor-mode)
+ (defadvice hack-one-local-variable (after TeX-hack-one-local-variable-after
activate)
+ (tex--call-minor-mode (ad-get-arg 0) (ad-get-arg 1))))
+(defun tex--call-minor-mode (var val &rest _)
"Call minor mode function if minor mode variable is found."
- (let ((var (ad-get-arg 0))
- (val (ad-get-arg 1)))
;; Instead of checking for each mode explicitely `minor-mode-list'
;; could be used. But this may make the byte compiler pop up.
(when (memq var '(TeX-PDF-mode
TeX-source-correlate-mode TeX-interactive-mode
TeX-fold-mode LaTeX-math-mode))
- (if (symbol-value val) (funcall var 1) (funcall var 0)))))
+ (funcall var (if (symbol-value val) 1 0))))
(defvar TeX-overlay-priority-step 16
"Numerical difference of priorities between nested overlays.
commit 00ef5975113bbb31a2dd9837d276260cbd5878bd
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 22:20:25 2021 -0400
Miscellaneous minor changes
Move to the next line arguments that are easy to misread.
Fix some commenting style to obey `outline-minor-mode`.
* auctex.el.in: Don't require `cl-lib` since it's bundled with Emacs-24.3.
* README: Prefer HTTPS over HTTP/FTP for gnu.org sites.
* bib-cite.el (bib-find-next): Simplify.
* latex.el: Use a non-nil default value for `LaTeX-label-function`
so RefTeX can override it with `add-function`.
(LaTeX-label--default): New function, extracted from `LaTeX-label`.
(LaTeX-label): Use it.
(LaTeX-label-function): Use it as default value.
* toolbar-x.el (toolbarx-emacs-mount-popup-menu): Make the control&data
flow a bit simpler.
(toolbarx-test-image-type, toolbarx-process-dropdown-group):
Use `car-safe` and strength-reduce `eval` to `symbol-value`.
* style/dinbrief.el: Remove redundant comment.
* style/kpfonts.el (<toplevel>): Simplify.
* style/latexinfo.el (LaTeXinfo-mode-map): Move initialization into
the declaration.
* style/url.el (TeX-arg-urlstyle):
* style/prosper.el (LaTeX-prosper-slide-style-prompt):
Completion tables can be lists of strings.
* style/tikz.el (TeX-TikZ-single-macro-arg): Strength-reduce `eval` to
`apply`.
More misc changes
diff --git a/auctex.el.in b/auctex.el.in
index 03a8049..b38b133 100644
--- a/auctex.el.in
+++ b/auctex.el.in
@@ -5,7 +5,7 @@
;; URL: https://www.gnu.org/software/auctex/
;; Maintainer: auctex-devel@gnu.org
;; Notifications-To: auctex-diffs@gnu.org
-;; Package-Requires: ((emacs "24.3") (cl-lib "1.0"))
+;; Package-Requires: ((emacs "24.3"))
;; Keywords: TeX LaTeX Texinfo ConTeXt docTeX preview-latex
;; This file is part of AUCTeX.
diff --git a/bib-cite.el b/bib-cite.el
index d8d5606..3ae2c79 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -737,7 +737,7 @@ A opening curly bracket is appended to the regexp.")
"Toggle bib-cite mode.
When bib-cite mode is enabled, citations, labels and refs are highlighted
when the mouse is over them. Clicking on these highlights with [mouse-2]
-runs bib-find, and [mouse-3] runs bib-display."
+runs `bib-find', and [mouse-3] runs `bib-display'."
(interactive "P")
(set (make-local-variable 'bib-cite-minor-mode)
(if arg
@@ -956,9 +956,7 @@ find the next occurrence of a regexp."
(if (bib-master-file) ;Multi-file document
;; FIXME: `find-tag' is replaced by `xref-find-definitions' in
;; Emacs 25.1. AUCTeX should track this change, sometime ...
- (if prev-p
- (find-tag t '- t)
- (find-tag t t t))
+ (find-tag t (if prev-p '- t) t)
(if bib-cite-search-ring
;;FIXME: Should first make sure I move off initial \ref{}.
(let ((regexp (concat bib-ref-regexpc bib-cite-search-ring "}")))
@@ -1284,7 +1282,8 @@ Use mouse button 3 to display the %s."))
(let* ((string (extent-string object))
(type (cond ((string-match "^\\\\[A-Za-z]*cite[A-Za-z]*" string)
"citation")
((string-match
- (concat "^" bib-ref-regexp) string) "\\label{}")
+ (concat "^" bib-ref-regexp) string)
+ "\\label{}")
((string-match "^\\\\label" string) "\\ref{}")
(t "this (unknown) reference"))))
(format format type type))))
diff --git a/latex.el b/latex.el
index f73c857..3265615 100644
--- a/latex.el
+++ b/latex.el
@@ -986,10 +986,10 @@ optional argument is omitted.)"
"Adding labels for LaTeX commands in AUCTeX."
:group 'LaTeX)
-(defcustom LaTeX-label-function nil
+(defcustom LaTeX-label-function #'LaTeX-label--default
"A function inserting a label at point or returning a label string.
-Sole mandatory argument of the function is the environment. The
-function has to return the label inserted, or nil if no label was
+Called with two argument NAME and NO-INSERT where NAME is the environment.
+The function has to return the label inserted, or nil if no label was
inserted. If the optional argument NO-INSERT is non-nil, then
the function has to return the label as string without any
insertion or nil if no label was read in."
@@ -1133,21 +1133,23 @@ returned, nil if it is empty."
(when (symbolp TeX-read-label-prefix)
(setq TeX-read-label-prefix (symbol-value TeX-read-label-prefix)))
(when TeX-read-label-prefix
- (if (and (fboundp LaTeX-label-function))
- (funcall LaTeX-label-function name no-insert)
- ;; Use completing-read as we do with `C-c C-m \label RET'
- (setq label (TeX-read-label t "What label" t))
- ;; No label or empty string entered?
- (if (or (string= TeX-read-label-prefix label)
- (string= "" label))
- (setq label nil)
- ;; We have a label; when NO-INSERT is nil, insert
- ;; \label{label} in the buffer, add new label to list of
- ;; known labels and return it
- (unless no-insert
- (insert TeX-esc "label" TeX-grop label TeX-grcl))
- (LaTeX-add-labels label)
- label)))))
+ (funcall (or LaTeX-label-function #'LaTeX-label--default)
+ name no-insert))))
+
+(defun LaTeX-label--default (_name no-insert)
+ ;; Use completing-read as we do with `C-c C-m \label RET'
+ (let ((label (TeX-read-label t "What label" t)))
+ ;; No label or empty string entered?
+ (if (or (string= TeX-read-label-prefix label)
+ (string= "" label))
+ (setq label nil)
+ ;; We have a label; when NO-INSERT is nil, insert
+ ;; \label{label} in the buffer, add new label to list of
+ ;; known labels and return it
+ (unless no-insert
+ (insert TeX-esc "label" TeX-grop label TeX-grcl))
+ (LaTeX-add-labels label)
+ label)))
(defcustom LaTeX-short-caption-prompt-length 40
"The length that the caption of a figure should be before
@@ -4554,9 +4556,7 @@ value of NO-SUBSECTIONS."
(re-search-backward (concat "\\(" (LaTeX-outline-regexp)
"\\|\\`\\)")))
(outline-mark-subtree)
- (when (and (boundp 'transient-mark-mode)
- transient-mark-mode
- (boundp 'mark-active)
+ (when (and transient-mark-mode
(not mark-active))
(setq mark-active t)
(run-hooks 'activate-mark-hook)))
@@ -6056,6 +6056,7 @@ This happens when \\left is inserted."
;;;###autoload
(defun TeX-latex-mode ()
+ ;; FIXME: Use `define-derived-mode'.
"Major mode in AUCTeX for editing LaTeX files.
See info under AUCTeX for full documentation.
@@ -6081,7 +6082,8 @@ of `LaTeX-mode-hook'."
(add-hook 'TeX-update-style-hook
(lambda ()
(if (local-variable-p 'LaTeX-biblatex-use-Biber (current-buffer))
- (setq LaTeX-using-Biber LaTeX-biblatex-use-Biber))) nil t)
+ (setq LaTeX-using-Biber LaTeX-biblatex-use-Biber)))
+ nil t)
;; Run style hooks associated with class options.
(add-hook 'TeX-update-style-hook
@@ -6791,7 +6793,8 @@ function would return non-nil and `(match-string 1)'
would return
;; get DVI output. Ugh.
(TeX-add-style-hook "ifpdf" (lambda ()
(TeX-PDF-mode-on)
- (TeX-PDF-mode-off)) :classopt)
+ (TeX-PDF-mode-off))
+ :classopt)
;; ifpdf indicates that we cater for either. So calling both
;; functions will make sure that the default will get used unless the
;; user overrode it.
diff --git a/preview.el.in b/preview.el.in
index b80977d..a15629b 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -1690,10 +1690,10 @@ to the default background in most other cases."
(const :tag "Foreground" :value :foreground))))
:group 'preview-appearance)
-;;; Note that the following default introduces a border only when
-;;; Emacs blinks politely when point is on an image (the tested
-;;; unrelated function was introduced at about the time image blinking
-;;; became tolerable).
+;; Note that the following default introduces a border only when
+;; Emacs blinks politely when point is on an image (the tested
+;; unrelated function was introduced at about the time image blinking
+;; became tolerable).
(defcustom preview-transparent-border (unless (fboundp 'posn-object-x-y) 1.5)
"Width of transparent border for previews in pt.
Setting this to a numeric value will add a border of
@@ -4180,7 +4180,8 @@ internal parameters, STR may be a log to insert into the
current log."
(preview-do-replacements
command
preview-undump-replacements)
- command) file))))
+ command)
+ file))))
(condition-case err
(progn
(when str
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 035d4ec..e676ca4 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -23,8 +23,6 @@
;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
;; 02110-1301, USA.
-;;; dinbrief.el - Special code for LaTeX class dinbrief.
-
;;; Commentary:
;; LaTeX Class: dinbrief.cls
diff --git a/style/fontenc.el b/style/fontenc.el
index 0fe194b..ba430db 100644
--- a/style/fontenc.el
+++ b/style/fontenc.el
@@ -49,6 +49,7 @@
(mapconcat #'identity
(TeX-completing-read-multiple
"Encoding(s): "
- LaTeX-fontenc-package-options-list) ","))
+ LaTeX-fontenc-package-options-list)
+ ","))
;;; fontenc.el ends here
diff --git a/style/kpfonts.el b/style/kpfonts.el
index a3672ea..09ba8a2 100644
--- a/style/kpfonts.el
+++ b/style/kpfonts.el
@@ -451,10 +451,10 @@ the sequence by initializing this variable.")
(nth 3 entry)))
value menu name)
(setq math (cdr math))
- (if (and prefix
- (setq prefix (decode-char 'ucs (nth 3 entry))))
- (setq prefix (concat (string prefix) " \\"))
- (setq prefix "\\"))
+ (setq prefix (if (and prefix
+ (setq prefix (decode-char 'ucs (nth 3 entry))))
+ (concat (string prefix) " \\")
+ "\\"))
(if (listp (cdr entry))
(setq value (nth 1 entry)
menu (nth 2 entry))
diff --git a/style/latexinfo.el b/style/latexinfo.el
index 3796967..9eb68ad 100644
--- a/style/latexinfo.el
+++ b/style/latexinfo.el
@@ -35,19 +35,17 @@ We ignore next, previous and up fields.")
"Non-nil means LaTeXinfo minor mode is active.")
(make-variable-buffer-local 'LaTeXinfo-mode)
-(defvar LaTeXinfo-mode-map nil
+(defvar LaTeXinfo-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "\C-c\C-u\C-b" #'latexinfo-format-buffer)
+ (define-key map "\C-c\C-u\C-r" #'latexinfo-format-region)
+ (define-key map "\C-c\C-u\C-s" #'latexinfo-show-structure)
+ (define-key map "\C-c\C-ud" #'makke:latexinfo-delete-structure)
+ (define-key map "\C-c\C-ug" #'latexinfo-goto-node)
+ (define-key map "\C-c\C-ui" #'makke:latexinfo-structure)
+ map)
"Keymap containing LaTeXinfo commands.")
-(if LaTeXinfo-mode-map
- ()
- (setq LaTeXinfo-mode-map (make-sparse-keymap))
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-b" #'latexinfo-format-buffer)
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-r" #'latexinfo-format-region)
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-s" #'latexinfo-show-structure)
- (define-key LaTeXinfo-mode-map "\C-c\C-ud"
#'makke:latexinfo-delete-structure)
- (define-key LaTeXinfo-mode-map "\C-c\C-ug" #'latexinfo-goto-node)
- (define-key LaTeXinfo-mode-map "\C-c\C-ui" #'makke:latexinfo-structure))
-
(or (assq 'LaTeXinfo-mode minor-mode-map-alist)
(setq minor-mode-map-alist
(cons (cons 'LaTeXinfo-mode LaTeXinfo-mode-map)
diff --git a/style/prosper.el b/style/prosper.el
index 98c1298..f1b7adc 100644
--- a/style/prosper.el
+++ b/style/prosper.el
@@ -114,7 +114,7 @@
(defun LaTeX-prosper-slide-style-prompt()
(completing-read
"Slide Style?"
- (mapcar 'list LaTeX-prosper-slide-styles)
+ LaTeX-prosper-slide-styles
nil nil nil nil "default" ))
diff --git a/style/tikz.el b/style/tikz.el
index a9c7314..f3a50bc 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -1,6 +1,6 @@
;;; tikz.el --- AUCTeX style for `tikz.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Matthew Leach <matthew@mattleach.net>
;; Maintainer: auctex-devel@gnu.org
@@ -161,14 +161,14 @@ optional input."
(selected-mapping (assoc selected-argument-type
fn-alist-with-optional-elm)))
- (eval
- ;; Build the form we wish to evaluate. This will be the function
- ;; to be called (the second element in the assoc element),
- ;; followed by the type name (the first element), followed by any
- ;; other elements in the list as extra arguments.
- `(,(cadr selected-mapping)
- ,(car selected-mapping)
- ,@(cddr selected-mapping)))))
+ ;; Build the funcall we wish to evaluate. This will be the function
+ ;; to be called (the second element in the assoc element),
+ ;; followed by the type name (the first element), followed by any
+ ;; other elements in the list as extra arguments.
+ (apply
+ (cadr selected-mapping)
+ (car selected-mapping)
+ (cddr selected-mapping))))
(defun TeX-TikZ-macro-arg (function-alist)
diff --git a/style/ulem.el b/style/ulem.el
index 7db5716..70ea7a8 100644
--- a/style/ulem.el
+++ b/style/ulem.el
@@ -105,7 +105,8 @@
(mapcar (lambda (str) (concat "\\" str))
'("uline" "uuline"
"uwave" "sout" "xout")))
- nil t) optional))
+ nil t)
+ optional))
(defvar LaTeX-ulem-package-options
'("UWforbf" "ULforem" "normalbf" "normalem")
diff --git a/style/url.el b/style/url.el
index 98f691b..eafbd90 100644
--- a/style/url.el
+++ b/style/url.el
@@ -1,6 +1,6 @@
;;; url.el --- AUCTeX style for `url.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2004-2005, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: auctex-devel@gnu.org
@@ -101,7 +101,7 @@
"Prompt for style used in \\urlstyle with completion."
(TeX-argument-insert
(completing-read (TeX-argument-prompt optional prompt "Style")
- (mapcar 'list '("rm" "same" "sf" "tt"))
+ '("rm" "same" "sf" "tt")
nil t)
optional))
diff --git a/tex-fold.el b/tex-fold.el
index 9fa310d..d448890 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -855,7 +855,6 @@ Remove the respective properties from the overlay OV."
'mouse-set-point)))
;; Open new overlays.
(dolist (ol (nconc (when (and TeX-fold-unfold-around-mark
- (boundp 'mark-active)
mark-active)
(overlays-at (mark)))
(overlays-at (point))))
diff --git a/tex-font.el b/tex-font.el
index 99077d5..9fa53b3 100644
--- a/tex-font.el
+++ b/tex-font.el
@@ -1,7 +1,6 @@
;;; tex-font.el --- Font-Lock support stolen from Emacs 21.
;;
-;; Copyright (C) 1985, 86, 89, 92, 94, 95, 96, 97, 98, 1999
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Keywords: tex, faces
@@ -89,7 +88,8 @@
(let* (;;
;; Names of commands whose arg should be fontified with
fonts.
(bold (regexp-opt '("textbf" "textsc" "textup"
- "boldsymbol" "pmb") t))
+ "boldsymbol" "pmb")
+ t))
(italic (regexp-opt '("textit" "textsl" "emph") t))
(type (regexp-opt '("texttt" "textmd" "textrm" "textsf") t))
;;
diff --git a/tex-info.el b/tex-info.el
index 2055760..e50fccc 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -216,7 +216,8 @@ the section."
(beginning-of-line)
(when
(re-search-forward (concat section-re
- "\\|^\\s-*@bye\\_>" ) nil t)
+ "\\|^\\s-*@bye\\_>" )
+ nil t)
(save-match-data
(beginning-of-line)
(point))))
diff --git a/tex.el b/tex.el
index 2ed3d91..a295a21 100644
--- a/tex.el
+++ b/tex.el
@@ -6445,6 +6445,7 @@ NAME may be a package, a command, or a document."
(throw 'found t)))))
;; Setup completion list in a format suitable for `completing-read'.
(dolist (elt docs)
+ ;; FIXME: Probably not needed!
(setq completions (nconc (mapcar #'list (car elt)) completions)))
;; Query user.
(setq name (completing-read
@@ -6500,7 +6501,8 @@ NAME may be a package, a command, or a document."
"\\).*\\("
(mapconcat #'regexp-quote
(cons (file-name-nondirectory name)
- (TeX-style-list)) "\\|")
+ (TeX-style-list))
+ "\\|")
"\\)\\.\\("
(mapconcat #'identity TeX-file-extensions "\\|")
"\\)\\'"))
diff --git a/toolbar-x.el b/toolbar-x.el
index 8b7af51..e17ee02 100644
--- a/toolbar-x.el
+++ b/toolbar-x.el
@@ -270,22 +270,24 @@ inside Emacs. See documentation of that function for
more."
(count 1)
(used-symbols '(nil))
(key)
- (real-type (if (eq type 'toggle) 'toggle 'radio))
- (real-save (when save (if (eq save 'offer) 'offer 'always))))
- ;; warn if type is not `radio' ot `toggle'; use `radio' if incorrect.
- (unless (eq type real-type)
- (display-warning 'toolbarx
- (format (concat "TYPE should be symbols `radio' or "
- "`toggle', but %s found; using `radio'")
- type)))
- ;; warn if save is not `nil', `offer' or `always'; use nil when incorrect
- (unless (eq save real-save)
- (setq real-save nil)
- (display-warning 'toolbarx
- (format (concat "SAVE should be symbols `nil', "
- "`offer' or `always', but %s found; "
- "using `nil'")
- save)))
+ (real-type
+ (pcase type
+ ((or `toggle `radio) type)
+ ;; Warn if type is not `radio' or `toggle'.
+ (_ (display-warning 'toolbarx
+ (format "TYPE should be symbols `radio' or
`toggle', but %s found; using `radio'"
+ type))
+ ;; Use `radio' if incorrect.
+ 'radio)))
+ (real-save
+ (pcase save
+ ((or `nil `offer `always) save)
+ ;; Warn if save is not `nil', `offer' or ;; `always'.
+ (_ (display-warning 'toolbarx
+ (format "SAVE should be symbols `nil', `offer'
or `always', but %s found; using `nil'"
+ save))
+ ;; Use nil when incorrect.
+ nil))))
(dolist (i strings)
;; finding a new symbol
(let* ((aux-count 0)
@@ -400,13 +402,12 @@ documentation of function `toolbarx-process-symbol')."
(all-obj-ok t)
(good-obj
(or (stringp val) ; string
- (and (consp val) ; or image descriptor
- (eq (car val) 'image))
+ (eq (car-safe val) 'image) ; or image descriptor
(and (symbolp val) ; or a symbol bound to a
(boundp val) ; image descriptor
; (defined with `defimage')
- (consp (eval val))
- (eq (car (eval val)) 'image))
+ (consp (symbol-value val))
+ (eq (car (symbol-value val)) 'image))
(and (listp val) ; or list with 4 strings or
; image descriptors
(= (length val) 4)
@@ -414,9 +415,7 @@ documentation of function `toolbarx-process-symbol')."
(setq all-obj-ok
(and all-obj-ok
(or (stringp i)
- (and (consp i)
- (eq (car i)
- 'image))))))))))
+ (eq (car-safe i) 'image)))))))))
(cons good-obj val)))))
(toolbarx-eval-function-or-symbol obj toolbarx-test-image-type-simple)))
@@ -888,7 +887,7 @@ in the end of SWITCHES, which is returned."
(set variable default)))
;; now check `variable' content
(set variable
- (let ((val (eval variable)))
+ (let ((val (symbol-value variable)))
(if (eq type 'toggle)
(if (listp val)
val
@@ -1089,9 +1088,9 @@ function `toolbar-install-toolbar'."
((and (symbolp image) ; or a symbol bound to a
(boundp image) ; image descriptor (defined
; with `defimage')g
- (consp (eval image))
- (eq (car (eval image)) 'image))
- (eval image))
+ (consp (symbol-value image))
+ (eq (car (symbol-value image)) 'image))
+ (symbol-value image))
(t ; otherwise, must be a list
; with 4 strings or image
; descriptors
commit 7a684085261992852b3b03c30e12d42e43154df5
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 21:58:01 2021 -0400
Remove some XEmacs and old-Emacs code
Remove uses of `easy-menu-add` and `easy-menu-remove` which have
always been no-op in Emacs and are declared obsolete in Emacs-28.
* bib-cite.el (bib-cite-setup-highlight-mouse-keymap): Remove Emacs-19 code.
* tex-buf.el (TeX-region-create): Remove use of variable
`font-lock-maximum-size` declared obsolete in Emacs-24.
* toolbar-x.el: Remove left over code from XEmacs compatibility.
Remove XEmacs-only `:toolbar` and `:dropdown-toolbar` as well
`:insert` which was only used to select Emacs-only or XEmacs-only entries.
(toolbarx-default-toolbar-meaning-alist): Replace all uses of
`[Emacs-only XEmacs-only]` vectors with the `Emacs-only` form.
diff --git a/bib-cite.el b/bib-cite.el
index 693677f..d8d5606 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -773,30 +773,16 @@ runs bib-find, and [mouse-3] runs bib-display."
(defun bib-cite-setup-highlight-mouse-keymap ()
"Set up the bib-cite text in the current buffer to be clickable."
(set (make-local-variable 'bib-highlight-mouse-keymap)
- ;;; First, copy the local keymap so we don't have `disappearing' menus
- ;;; when the mouse is moved over a \ref, \label or \cite command.
-
- ;;; FIXME: Check out (mouse-major-mode-menu) to see how it grabs the local
- ;;; menus to display. Maybe on `highlighted' commands we could only
- ;;; display the bib-cite stuff (or a subset of it).
- (let ((m (copy-keymap (current-local-map))))
- ;; emacs 19
- (cond
- ((commandp 'action-key)
- (substitute-key-definition 'action-key 'bib-find m global-map)
- (substitute-key-definition 'assist-key 'bib-display m global-map)
- (substitute-key-definition 'action-mouse-key-emacs19
- 'bib-find-mouse m global-map)
- (substitute-key-definition 'assist-mouse-key-emacs19
- 'bib-display-mouse m global-map)
- (substitute-key-definition 'action-key-depress-emacs19
- nil m global-map)
- (substitute-key-definition 'assist-key-depress-emacs19
- nil m global-map))
- (t ; emacs 19, not hyperbole
- (define-key m [down-mouse-3] #'bib-display-mouse)
- (define-key m [mouse-2] #'bib-find-mouse)))
- m)))
+ ;; First, copy the local keymap so we don't have `disappearing' menus
+ ;; when the mouse is moved over a \ref, \label or \cite command.
+
+ ;; FIXME: Check out (mouse-major-mode-menu) to see how it grabs the
local
+ ;; menus to display. Maybe on `highlighted' commands we could
+ ;; only display the bib-cite stuff (or a subset of it).
+ (let ((m (copy-keymap (current-local-map))))
+ (define-key m [down-mouse-3] #'bib-display-mouse)
+ (define-key m [mouse-2] #'bib-find-mouse)
+ m)))
;;;###autoload
(defun turn-on-bib-cite ()
diff --git a/context.el b/context.el
index 9219a95..4def467 100644
--- a/context.el
+++ b/context.el
@@ -1764,8 +1764,6 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
;; Keybindings and menu
(use-local-map ConTeXt-mode-map)
- (easy-menu-add ConTeXt-mode-menu ConTeXt-mode-map)
- (easy-menu-add ConTeXt-mode-command-menu ConTeXt-mode-map)
(setq ConTeXt-menu-changed t)
(if (fboundp 'make-local-hook)
diff --git a/latex.el b/latex.el
index 87bd23f..f73c857 100644
--- a/latex.el
+++ b/latex.el
@@ -5475,9 +5475,6 @@ commands are defined:
\\{LaTeX-math-mode-map}"
nil nil (list (cons (LaTeX-math-abbrev-prefix) LaTeX-math-keymap))
- (if LaTeX-math-mode
- (easy-menu-add LaTeX-math-mode-menu LaTeX-math-mode-map)
- (easy-menu-remove LaTeX-math-mode-menu))
(TeX-set-mode-name))
(defalias 'latex-math-mode #'LaTeX-math-mode)
@@ -6804,13 +6801,6 @@ function would return non-nil and `(match-string 1)'
would return
(use-local-map LaTeX-mode-map)
- ;; Calling `easy-menu-add' may result in the menu filters being
- ;; executed which call `TeX-update-style'. So this is placed very
- ;; late in mode initialization to assure that all relevant variables
- ;; are properly initialized before style files try to alter them.
- (easy-menu-add LaTeX-mode-menu LaTeX-mode-map)
- (easy-menu-add LaTeX-mode-command-menu LaTeX-mode-map)
-
(define-key LaTeX-mode-map "\C-xne" #'LaTeX-narrow-to-environment)
;; AUCTeX's brace pairing feature (`LaTeX-electric-left-right-brace') doesn't
diff --git a/plain-tex.el b/plain-tex.el
index 93bc1ed..4c384f0 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -130,8 +130,6 @@ of `plain-TeX-mode-hook'."
(plain-TeX-common-initialization)
(setq major-mode 'plain-tex-mode)
(use-local-map plain-TeX-mode-map)
- (easy-menu-add plain-TeX-mode-menu plain-TeX-mode-map)
- (easy-menu-add plain-TeX-mode-command-menu plain-TeX-mode-map)
(setq TeX-base-mode-name "TeX")
(setq TeX-command-default "TeX")
(setq TeX-sentinel-default-function #'TeX-TeX-sentinel)
@@ -308,10 +306,6 @@ of `AmS-TeX-mode-hook'."
(setq major-mode 'ams-tex-mode)
(use-local-map AmSTeX-mode-map)
- ;; Menu
- (easy-menu-add AmSTeX-mode-menu AmSTeX-mode-map)
- (easy-menu-add AmSTeX-mode-command-menu AmSTeX-mode-map)
-
(setq TeX-base-mode-name "AmS-TeX")
(setq TeX-command-default "AmSTeX")
(run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'AmS-TeX-mode-hook)
diff --git a/style/kpfonts.el b/style/kpfonts.el
index 6e0b4ef..a3672ea 100644
--- a/style/kpfonts.el
+++ b/style/kpfonts.el
@@ -509,9 +509,6 @@ following commands are defined:
\\{LaTeX-kpfonts-mode-map}"
nil nil (list (cons (LaTeX-kpfonts-abbrev-prefix) LaTeX-kpfonts-keymap))
- (if LaTeX-kpfonts-mode
- (easy-menu-add LaTeX-kpfonts-mode-menu LaTeX-kpfonts-mode-map)
- (easy-menu-remove LaTeX-kpfonts-mode-menu))
(TeX-set-mode-name))
(easy-menu-define LaTeX-kpfonts-mode-menu
diff --git a/tex-buf.el b/tex-buf.el
index 74fbf2b..ddb71b6 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -2140,7 +2140,7 @@ original file."
;; Attempt to disable font lock.
(font-lock-defaults-alist nil)
(font-lock-defaults nil)
- (font-lock-maximum-size 0)
+ ;; (font-lock-maximum-size 0) ; Obsolete since Emacs 24.1
(font-lock-mode-hook nil)
(font-lock-auto-fontify nil)
(font-lock-mode-enable-list nil)
@@ -3765,8 +3765,7 @@ forward, if negative)."
tabulated-list-padding 1
tabulated-list-entries TeX-error-overview-list-entries)
(tabulated-list-init-header)
- (tabulated-list-print)
- (easy-menu-add TeX-error-overview-menu TeX-error-overview-mode-map))
+ (tabulated-list-print))
(defcustom TeX-error-overview-frame-parameters
'((name . "TeX errors")
diff --git a/tex-info.el b/tex-info.el
index a695909..2055760 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -677,8 +677,6 @@ value of `Texinfo-mode-hook'."
(set (make-local-variable 'outline-level) 'texinfo-outline-level)
;; Mostly AUCTeX stuff
- (easy-menu-add Texinfo-mode-menu Texinfo-mode-map)
- (easy-menu-add Texinfo-command-menu Texinfo-mode-map)
(set (make-local-variable 'TeX-command-current) 'TeX-command-master)
(setq TeX-default-extension "texi")
diff --git a/toolbar-x.el b/toolbar-x.el
index 5ba8b25..8b7af51 100644
--- a/toolbar-x.el
+++ b/toolbar-x.el
@@ -1,4 +1,4 @@
-;;; toolbar-x.el --- fancy toolbar handling in Emacs and XEmacs
+;;; toolbar-x.el --- fancy toolbar handling in Emacs
;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
@@ -21,7 +21,7 @@
;;; Commentary:
;; This program implements a common interface to display toolbar
-;; buttons in both Emacs and XEmacs. A toolbar should be basicly
+;; buttons. A toolbar should be basically
;; defined by a image and a command to run when the button is pressed,
;; and additional properties could be added. This is the idea of this
;; program. See the documentation of function
@@ -36,19 +36,14 @@
;; `toolbarx-install-toolbar').
;; * Supported properties:
-;; - All editors: `:insert', `:image', `:command', `:help', `:enable',
+;; - All editors: `:image', `:command', `:help', `:enable',
;; `:append-command' and `:prepend-command';
;; - Emacs only: `:visible' and `:button';
-;; - XEmacs only: `:toolbar'.
;; For the precise value-type for each property, see documentation of
;; the function `toolbarx-install-toolbar'.
;; (ps: properties that are particular to an editor are just ignored
;; the other editor flavour.)
-;; * Button properties may depend on the editor flavour, if the value
-;; is a vector; the first element will be used for Emacs and the 2nd
-;; for XEmacs. Example: `:image ["new" toolbar-file-icon]'
-
;; * Properties can have value specified by function (with no
;; argument) or variables that evaluate to an object of the correct
;; type for a particular property. The evaluation is done when the
@@ -56,18 +51,10 @@
;; (ps: this is valid only for properties that *not* have \`form\' as
;; value type.)
-;; * On `refresh time' (a call `toolbarx-refresh', necessary when the
-;; toolbar should change), the `:insert' property (if present) is
-;; evaluated to decide if button will be displayed.
-
;; Properties can be distributed to several buttons, using \`groups\'.
-;; Example: (for (bar baz :toolbar (bottom . top) :insert foo-form)
-;; means that `foo', `bar' and `baz' have `:insert foo-form' and `bar' and
-;; `baz' have the property `:toolbar (bottom . top)'. (ps: this type
-;; of value for the `:toolbar' property (XEmacs only) means that the
-;; buttons will be in the bottom toolbar unless the default toolbar is
-;; in the bottom, and in this case, this buttons go to the top
-;; toolbar).
+;; Example: (foo (bar baz :enable (mytest)) :help "please")
+;; means that `foo', `bar' and `baz' have `:help "please"' and `bar' and
+;; `baz' have the property `:enable (mytest)'.
;; * (Part of) the toolbar definition can be stored in a variable,
;; evaluated in `installation time'. See `:eval-group' on the
@@ -78,7 +65,7 @@
;; the documentation of the function `toolbarx-install-toolbar'.
;;; Rough description of the implementation
-;; There are 3 \`engines\' implemented:
+;; There are 2 \`engines\' implemented:
;; == the 1st one (parsing) parses the toolbar definition
;; independently of editor flavour and store the parsed buttons with
@@ -87,18 +74,14 @@
;; == the 2nd one (refresh for Emacs) inserts buttons in the Emacs
;; toolbar in the same order that they appear in the definitions;
-;; buttons with a `:insert' property value that evaluates to nil are
-;; ignored; if a (real) button does not have at least (valid) image
+;; if a (real) button does not have at least (valid) image
;; and command properties, they are silently ignored;
-;; == the 3rd engine (refresh for XEmacs) is similar to the 2nd, but
-;; inserts buttons in XEmacs.
-
;;; History:
;; This program was motivated by the intention of implementation of a
;; good toolbar for AUCTeX, that would work in both Emacs and XEmacs.
-;; Since toolbars are very different in behaviour and implementation
+;; Since toolbars were very different in behaviour and implementation
;; (for instance, in Emacs one can display as many toolbar buttons as
;; wanted, because it becomes mult-line, and in XEmacs, there is one
;; line, but toolbars and all sides of a frame.)
@@ -373,6 +356,10 @@ is `always', state is saved every time that a item is
clicked."
"If OPT is a vector, return first element, otherwise, return OPT.
If OPT is vector and length is smaller than the necessary, then
nil is returned."
+ ;; FIXME: This is backward compatibility for when we supported XEmacs
+ ;; and entries could take the shape [FOO BAR] where FOO was the
+ ;; value to use for Emacs and BAR the value to use for XEmacs.
+ ;; This is unused since Mar 2021.
(if (vectorp opt)
(when (> (length opt) 0)
(aref opt 0))
@@ -538,7 +525,7 @@ object VAL of a dropdown group (see documentation of
function
(:visible toolbarx-test-any-type)
(:help toolbarx-test-string-or-nil)
(:insert toolbarx-test-any-type . and)
- (:toolbar toolbarx-test-toolbar-type)
+ ;; (:toolbar toolbarx-test-toolbar-type)
(:button toolbarx-test-button-type)
(:append-command toolbarx-test-any-type . progn)
(:prepend-command toolbarx-test-any-type . progn)))
@@ -574,7 +561,7 @@ Fourth, a list of lists, each in the format (PROP ADD).")
(:dropdown-visible toolbarx-test-any-type)
(:dropdown-insert toolbarx-test-any-type . and)
(:dropdown-help toolbarx-test-string-or-nil)
- (:dropdown-toolbar toolbarx-test-toolbar-type)
+ ;; (:dropdown-toolbar toolbarx-test-toolbar-type)
(:dropdown-append-command toolbarx-test-any-type . progn)
(:dropdown-prepend-command toolbarx-test-any-type . progn)))
(possible-props (nreverse (let* ((props ()))
@@ -1044,8 +1031,8 @@ BUTTON should be a list of form (SYMBOL . PROP-LIST).
SYMBOL is
a symbol that \"names\" this button. PROP-LIST is a list in the
format (PROP VAL ... PROP VAL). The supported properties are
`:image', `:command', `:append-command', `:prepend-command',
-`:help', `:enable', `:visible', `:button', `:insert' and
-`:toolbar'. For a description of properties, see documentation of
+`:help', `:enable', `:visible', `:button', and `:insert'.
+For a description of properties, see documentation of
function `toolbar-install-toolbar'."
(let* ((symbol (nth 0 button))
(used-keys-list (when used-keys
@@ -1222,12 +1209,6 @@ where each ELEM is either
list of button properties (symbol + properties = a *button*)
or associated to a special kind of group (an *alias group*).
- - a vector, which elements are on the previous formats (but not
- another vector); this is useful to specify different
- ingredients to the toolbar depending if editor is Emacs or
- XEmacs; the first element will be used in Emacs; the second
- element is going to be used in XEmacs.
-
Meaning alist
=============
@@ -1258,21 +1239,18 @@ elements that a button should have.) The supported
properties
for buttons and their `basic types' (see note on how values of
properties are obtained!) are:
- :image -- in Emacs, either a string or image descriptor (see
+ :image -- either a string or image descriptor (see
info for a definition), or a variable bound to a image
descriptor (like those defined with `defimage') or a list of 4
- strings or image descriptors; in XEmacs, either a string or a
- glyph, or a symbol bount to a glyph, or a list of at least 1
- and at most 6 strings or glyphs or nil (not the first element
- though); defines the image file displayed by the button. If
+ strings or image descriptors;
+ defines the image file displayed by the button. If
it is a string, the image file found with that name (always
using the function `toolbarx-find-image' to make the
\`internal\' image descriptor) is used as button image. For
the other formats, the button image is handled in the same way
as it is treated by the editors; see info nodes bellow for a
- description of the capabilities of each editor
- Emacs: info file \"elisp\", node \"Tool Bar\" (see `:image'
- property);
+ description of the capabilities:
+ info file \"elisp\", node \"Tool Bar\" (see `:image' property);
PS: a *vector* of four strings is used in the Emacs
Lisp documentation as the `more ellaborated' image
property format, but here we reserve vectors to
@@ -1280,10 +1258,6 @@ properties are obtained!) are:
choice for a list instead of vector (however,
internally the list becomes a vector when displaying
the button).
- XEmacs: info file \"lispref\", node \"Toolbar Descriptor
- Format\" (see GLYPH-LIST) or the documentation of
- the variable `default-toolbar'; check the inheritage
- in case of a ommited glyph or nil instead of glyph.
:command -- a form; if the form happens to be a command, it will
be called with `call-interactively'.
@@ -1301,38 +1275,17 @@ properties are obtained!) are:
determine if a button is active (enabled) or not.
:visible -- in Emacs, a form that is evaluated constantly to
- determine if a button is visible; in XEmacs, this property is
- ignored.
+ determine if a button is visible.
:button -- in Emacs, a cons cell (TYPE . SELECTED) where the
TYPE should be `:toggle' or `:radio' and the cdr should be a
form. SELECTED is evaluated to determine when the button is
- selected. This property is ignored in XEmacs.
+ selected..
:insert -- a form that is evaluated every time that the toolbar
is refresh (a call of `toolbarx-refresh') to determine if the
button is inserted or just ignored (until next refresh).
- :toolbar -- in XEmacs, either one of the symbols `default',
- `top', `bottom', `left', `right', or a cons cell
- (POS . POS-AVOID-DEFAULT) where POS and POS-AVOID-DEFAULT
- should be one of the symbols `top', `bottom', `left', `right';
- if a symbol, the button will be inserted in one of these
- toolbars; if a cons cell, button will be inserted in toolbar
- POS unless the position of the default toolbar is POS (then,
- the default toolbar would override the position-specific
- toolbar), and in this case, button will be inserted in toolbar
- POS-AVOID-DEFAULT; in Emacs, this property is meaningless, and
- therefore ignored. Hint of use of this property: in a
- program, use or everything with `default' and the cons format
- to avoid the default toolbar, or use only the position
- specific buttons (symbols that are not `default'), because of
- the `overriding' system in XEmacs, when a position-specific
- toolbar overrides the default toolbar; for instance, if you
- put a button in the default toolbar and another in the top
- toolbar (and the default toolbar is in the top), then *only*
- the ones in the top toolbar will be visible!
-
How to specify a button
=======================
@@ -1340,7 +1293,7 @@ One can specify a button by its symbol or by a group to
specify
properties. For example,
BUTTON =
( foo
- (bar :image [\"bar-Emacs\" \"bar-XEmacs\"]
+ (bar :image \"bar\"
:command bar-function :help \"Bar help string\")
:insert foo-bar )
MEANING-ALIST = ( (foo :image \"foo\" :command foo-function) )
@@ -1348,9 +1301,7 @@ specifiy two buttons `foo' and `bar', each one with its
necessary
:image and :command properties, and both use the :insert property
specified ate the end of BUTTONS (because groups distribute
properties to all its elements). `foo' and `bar' will be
-inserted only if `foo-bar' evaluation yields non-nil. `bar' used
-a different :image property depending if editor is Emacs or
-XEmacs.
+inserted only if `foo-bar' evaluation yields non-nil.
Note on how values of properties are obtained
=============================================
@@ -1444,11 +1395,9 @@ supported properties and their basic type are:
:dropdown-help -- a string or nil; the help string of the
dropdown button.
- :dropdown-image -- in Emacs, either a string or a vector of 4
- strings; in XEmacs, either a string or a glyph or a list of at
- least 1 and at most 6 strings or glyphs; defines the image
- file displayed by the dropdown button; by default, it is the
- string \"dropdown\".
+ :dropdown-image -- either a string or a vector of 4 strings;
+ defines the image file displayed by the dropdown button;
+ by default, it is the string \"dropdown\".
:dropdown-append-command,
:dropdownprepend-command -- a form; append or prepend forms to
@@ -1461,13 +1410,7 @@ supported properties and their basic type are:
not.
:dropdown-visible -- a form; in Emacs, it is evaluated
- constantly to determine if the dropdown button is visible; in
- XEmacs, this property is ignored.
-
- :dropdown-toolbar -- in XEmacs, one of the symbols `default',
- `opposite', `top', `bottom', `left' or `right'; ignored in
- Emacs; in XEmacs, the toolbar where the dropdown button will
- appear.
+ constantly to determine if the dropdown button is visible.
Also, if the symbol `dropdown' is associted in MEANING-ALIST
with some properties, these properties override (or add) with
@@ -1479,8 +1422,7 @@ Special buttons
If the symbol of a button is `:new-line', it is inserted
a (faked) return, and the next button will be displayed a next
line of buttons. The only property supported for this button is
-`:insert'. This feature is available only in Emacs. In XEmacs,
-this button is ignored."
+`:insert'."
(let ((switches (toolbarx-process-group buttons meaning-alist nil nil)))
(if global-flag
(setq-default toolbarx-internal-button-switches
@@ -1495,34 +1437,30 @@ this button is ignored."
'((separator :image "sep" :command t :enable nil :help "")
(new-file
- :image ["new" toolbar-file-icon]
- :command [find-file toolbar-open]
- :enable [(not (window-minibuffer-p
+ :image "new"
+ :command find-file
+ :enable (not (window-minibuffer-p
(frame-selected-window menu-updating-frame)))
- t]
- :help ["Specify a new file's name, to edit the file" "Visit new file"])
-
- (open-file :image ["open" toolbar-file-icon]
- :command [menu-find-file-existing toolbar-open]
- :enable [(not (window-minibuffer-p
- (frame-selected-window menu-updating-frame)))
- t]
- :help ["Read a file into an Emacs buffer" "Open a file"])
-
- (dired :image ["diropen"
- toolbar-folder-icon]
- :command [dired toolbar-dired]
- :help ["Read a directory, operate on its files" "Edit a directory"])
-
- (save-buffer :image ["save" toolbar-disk-icon]
- :command [save-buffer toolbar-save]
- :enable [(and
+ :help "Specify a new file's name, to edit the file")
+
+ (open-file :image "open"
+ :command menu-find-file-existing
+ :enable (not (window-minibuffer-p
+ (frame-selected-window menu-updating-frame)))
+ :help "Read a file into an Emacs buffer")
+
+ (dired :image "diropen"
+ :command dired
+ :help "Read a directory, operate on its files")
+
+ (save-buffer :image "save"
+ :command save-buffer
+ :enable (and
(buffer-modified-p)
(buffer-file-name)
(not (window-minibuffer-p
(frame-selected-window menu-updating-frame))))
- t]
- :help ["Save current buffer to its file" "Save buffer"]
+ :help "Save current buffer to its file"
:visible (or buffer-file-name
(not (eq 'special
(get major-mode 'mode-class)))))
@@ -1533,130 +1471,91 @@ this button is ignored."
:enable (not
(window-minibuffer-p
(frame-selected-window menu-updating-frame)))
- :insert [t nil]
:help "Write current buffer to another file"
:visible (or buffer-file-name
(not (eq 'special (get major-mode 'mode-class)))))
- (undo :image ["undo" toolbar-undo-icon]
- :command [undo toolbar-undo]
- :enable [(and (not buffer-read-only)
+ (undo :image "undo"
+ :command undo
+ :enable (and (not buffer-read-only)
(not (eq t buffer-undo-list))
(if (eq last-command 'undo)
pending-undo-list
(consp buffer-undo-list)))
- t]
- :help ["Undo last operation" "Undo edit"]
+ :help "Undo last operation"
:visible (not (eq 'special (get major-mode 'mode-class))))
- (cut :image ["cut" toolbar-cut-icon]
- :help ["Delete text in region and copy it to the clipboard"
- "Kill region"]
- :command [clipboard-kill-region toolbar-cut]
+ (cut :image "cut"
+ :help "Delete text in region and copy it to the clipboard"
+ :command clipboard-kill-region
:visible (not (eq 'special (get major-mode 'mode-class))))
- (copy :image ["copy" toolbar-copy-icon]
- :help ["Copy text in region to the clipboard" "Copy region"]
- :command [clipboard-kill-ring-save toolbar-copy])
+ (copy :image "copy"
+ :help "Copy text in region to the clipboard"
+ :command clipboard-kill-ring-save)
- (paste :image ["paste" toolbar-paste-icon]
- :help ["Paste text from clipboard" "Paste from clipboard"]
- :command [clipboard-yank toolbar-paste]
+ (paste :image "paste"
+ :help "Paste text from clipboard"
+ :command clipboard-yank
:visible (not (eq 'special (get major-mode 'mode-class))))
;; Emacs only
(search-forward :command nonincremental-search-forward
:help "Search forward for a string"
- :image "search"
- :insert [t nil])
+ :image "search")
(search-replace
- :image ["search-replace" toolbar-replace-icon]
- :command [query-replace toolbar-replace]
- :help ["Replace string interactively, ask about each occurrence"
- "Search & Replace"])
+ :image "search-replace"
+ :command query-replace
+ :help "Replace string interactively, ask about each occurrence")
- (print-buffer :image ["print" toolbar-printer-icon]
- :command [print-buffer toolbar-print]
- :help ["Print current buffer with page headings"
- "Print buffer"])
+ (print-buffer :image "print"
+ :command print-buffer
+ :help "Print current buffer with page headings")
;; Emacs only
(customize :image "preferences"
:command customize
- :help "Edit preferences (customize)"
- :insert [t nil])
+ :help "Edit preferences (customize)")
;; Emacs only
(help :image "help"
:command (lambda () (interactive) (popup-menu menu-bar-help-menu))
- :help "Pop up the Help menu"
- :insert [t nil])
+ :help "Pop up the Help menu")
;; Emacs only
(kill-buffer :command kill-this-buffer
:enable (kill-this-buffer-enabled-p)
:help "Discard current buffer"
- :image "close"
- :insert [t nil])
+ :image "close")
;; Emacs only
(exit-emacs :image "exit"
:command save-buffers-kill-emacs
- :help "Offer to save unsaved buffers, then exit Emacs"
- :insert [t nil])
-
- (spell-buffer :image ["spell" toolbar-spell-icon]
- :command [ispell-buffer toolbar-ispell]
- :help ["Check spelling of selected buffer" "Check spelling"])
-
- (info :image ["info" toolbar-info-icon]
- :command [info toolbar-info]
- :help ["Enter Info, the documentation browser" "Info documentation"])
-
- ;; XEmacs only
- (mail :image toolbar-mail-icon
- :command toolbar-mail
- :help "Read mail"
- :insert [nil t])
-
- ;; XEmacs only
- (compile :image toolbar-compile-icon
- :command toolbar-compile
- :help "Start a compilation"
- :insert [nil t])
-
- ;; XEmacs only
- (debug :image toolbar-debug-icon
- :command toolbar-debug
- :help "Start a debugger"
- :insert [nil t])
-
- ;; XEmacs only
- (news :image toolbar-news-icon
- :command toolbar-news
- :help "Read news"
- :insert [nil t]))
+ :help "Offer to save unsaved buffers, then exit Emacs")
+
+ (spell-buffer :image "spell"
+ :command ispell-buffer
+ :help "Check spelling of selected buffer")
+
+ (info :image "info"
+ :command info
+ :help "Enter Info, the documentation browser"))
"A meaning alist with definition of the default buttons.
The following buttons are available:
-* Both Emacs and XEmacs: `open-file', `dired', `save-buffer',
+ `open-file', `dired', `save-buffer',
`undo', `cut', `copy', `paste', `search-replace', `print-buffer',
`spell-buffer', `info'.
-
-* Emacs only: `new-file' (Emacs 22+) `write-file', `search-forward',
+ `new-file' (Emacs 22+) `write-file', `search-forward',
`customize', `help', `kill-buffer', `exit-emacs'.
-* XEmacs only: `mail', `compile', `debug', `news'.
-
-To reproduce the default toolbar in both editors with use as BUTTON
+To reproduce the default toolbar with use as BUTTON
in `toolbarx-install-toolbar':
\(toolbarx-install-toolbar
- '([(open-file dired kill-buffer save-buffer write-file undo cut
- copy paste search-forward print-buffer customize help)
- (open-file dired save-buffer print-buffer cut copy paste undo
- spell-buffer search-replace mail info compile debug news)])
+ '((open-file dired kill-buffer save-buffer write-file undo cut
+ copy paste search-forward print-buffer customize help))
toolbarx-default-toolbar-meaning-alist)
Ps.: there are more buttons available than suggested in the
commit e6910bb7c5357a6fe6d3919602a46aea41f480f1
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 21:14:57 2021 -0400
Don't quote `lambda`
diff --git a/font-latex.el b/font-latex.el
index 36edba2..554c2d8 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -115,7 +115,7 @@ If nil, quoted content will not be fontified."
:type '(choice (const auto) (const french) (const german) (const nil))
:group 'font-latex)
(put 'font-latex-quotes 'safe-local-variable
- '(lambda (x) (memq x '(auto french german nil))))
+ (lambda (x) (memq x '(auto french german nil))))
(defun font-latex-add-quotes (quotes)
"Add QUOTES to `font-latex-quote-list'.
diff --git a/latex.el b/latex.el
index 6f496e3..87bd23f 100644
--- a/latex.el
+++ b/latex.el
@@ -4802,11 +4802,11 @@ Setting this variable directly does not take effect;
use \\[customize]."
:group 'LaTeX-math
:initialize #'custom-initialize-default
- :set '(lambda (symbol value)
- (define-key LaTeX-math-mode-map (LaTeX-math-abbrev-prefix) t)
- (set-default symbol value)
- (define-key LaTeX-math-mode-map
- (LaTeX-math-abbrev-prefix) LaTeX-math-keymap))
+ :set (lambda (symbol value)
+ (define-key LaTeX-math-mode-map (LaTeX-math-abbrev-prefix) t)
+ (set-default symbol value)
+ (define-key LaTeX-math-mode-map
+ (LaTeX-math-abbrev-prefix) LaTeX-math-keymap))
:type '(string :tag "Key sequence"))
(defun LaTeX-math-abbrev-prefix ()
diff --git a/preview.el.in b/preview.el.in
index 9f51fb4..b80977d 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -2390,11 +2390,14 @@ BUFFER-MISC is the appropriate data to be used."
'(if (boundp 'desktop-buffer-mode-handlers)
(add-to-list 'desktop-buffer-mode-handlers
'(latex-mode . desktop-buffer-preview))
- (add-hook 'desktop-buffer-handlers '(lambda ()
- (desktop-buffer-preview
- desktop-buffer-file-name
- desktop-buffer-name
- desktop-buffer-misc)))))
+ (defvar desktop-buffer-file-name)
+ (defvar desktop-buffer-name)
+ (defvar desktop-buffer-misc)
+ (add-hook 'desktop-buffer-handlers (lambda ()
+ (desktop-buffer-preview
+ desktop-buffer-file-name
+ desktop-buffer-name
+ desktop-buffer-misc)))))
(defcustom preview-auto-cache-preamble 'ask
"Whether to generate a preamble cache format automatically.
diff --git a/tex.el b/tex.el
index 80de134..2ed3d91 100644
--- a/tex.el
+++ b/tex.el
@@ -2289,9 +2289,9 @@ the Emacs manual) to set this variable permanently for
each file."
(string :format "%v")))
(make-variable-buffer-local 'TeX-master)
(put 'TeX-master 'safe-local-variable
- '(lambda (x)
- (or (stringp x)
- (member x (quote (t nil shared dwim))))))
+ (lambda (x)
+ (or (stringp x)
+ (member x (quote (t nil shared dwim))))))
(defcustom TeX-one-master "\\.\\(texi?\\|dtx\\)$"
"Regular expression matching ordinary TeX files.
@@ -6648,8 +6648,8 @@ error."
(unless (member elt (default-value 'desktop-locals-to-save))
(setq-default desktop-locals-to-save
(cons elt (default-value 'desktop-locals-to-save)))))
- (add-hook 'desktop-after-read-hook '(lambda ()
- (TeX-set-mode-name t)))))
+ (add-hook 'desktop-after-read-hook (lambda ()
+ (TeX-set-mode-name t)))))
;; delsel.el, `delete-selection-mode'
(put 'TeX-newline 'delete-selection t)
diff --git a/texmathp.el b/texmathp.el
index cd9336b..ac2b75c 100644
--- a/texmathp.el
+++ b/texmathp.el
@@ -212,7 +212,7 @@ The structure of each entry is (NAME TYPE)
`sw-on' Switch: turns math-mode of following text on
`sw-off' Switch: turns math-mode of following text off
`sw-toggle' Switch: toggles math mode of following text"
- :set '(lambda (symbol value) (set-default symbol value) (texmathp-compile))
+ :set (lambda (symbol value) (set-default symbol value) (texmathp-compile))
:type
'(repeat
(list :value ("" env-on)
commit 8de4670e3446976b53e95c4ca957f0cefdd99e03
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 21:12:21 2021 -0400
Remove some redundant `:group` arguments
diff --git a/bib-cite.el b/bib-cite.el
index e97c15e..693677f 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -610,32 +610,27 @@
When this variable is non-nil, both `bib-find' and `bib-display' will
call a function in RefTeX to find or display the cross reference of a
\\ref or \\cite macro at point."
- :group 'bib-cite
:type 'boolean)
(defcustom bib-novice t
"Give advice to novice users about what commands to use next."
- :group 'bib-cite
:type 'boolean)
(defcustom bib-switch-to-buffer-function 'switch-to-buffer
"Function used to select buffers if they differ from the original.
You may use `switch-to-buffer' `switch-to-buffer-other-window' or
`switch-to-buffer-other-frame'."
- :group 'bib-cite
:type '(choice (function-item switch-to-buffer)
(function-item switch-to-buffer-other-window)
(function-item switch-to-buffer-other-frame)))
(defcustom bib-highlight-mouse-t t
"Call bib-highlight-mouse from `LaTeX-mode-hook' to add green highlight."
- :group 'bib-cite
:type 'boolean)
(defcustom bib-label-help-echo-format "button2 finds %s, button3 displays %s"
"Format string for info if the mouse is over LaTeX commands.
If nil, do not display info."
- :group 'bib-cite
:type '(radio (const :tag "Don't display info" nil)
string))
@@ -646,21 +641,18 @@ Another version says it should BSTINPUTS. I don't know
anymore!
The colon character (:) is the default path separator in unix, but you may
use semi-colon (;) for DOS or OS/2 if you set bib-dos-or-os2-variable to t."
- :group 'bib-cite
:type 'string)
(defcustom bib-cite-inputs nil
"List of directories to search for .bib files.
This is in addition to those listed in the environment variable specified by
`bib-bibtex-env-variable'."
- :group 'bib-cite
:type '(repeat (file :format "%v")))
(defcustom bib-cite-aux-inputs nil
"List of directories to search for .aux files.
MiKTeX has the LaTeX option -aux-directory to store .aux files in an alternate
directory. You may set this variable to let bib-cite find these .aux files."
- :group 'bib-cite
:type '(repeat (file :format "%v")))
(defcustom bib-dos-or-os2-variable (or (equal 'emx system-type)
@@ -677,7 +669,6 @@ e.g. Use a path like
\"c:\\emtex\\bibinput;c:\\latex\\bibinput\"
\(You can change the environment variable which is searched by
setting the elisp variable bib-bibtex-env-variable)"
- :group 'bib-cite
:type 'boolean)
(defcustom bib-etags-command "etags -r '/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/'
-o "
@@ -686,21 +677,18 @@ In unix, this is usually \"etags -r
'/.*\\\(eq\|page\|[fvF]\)ref.*/' -o \"
\(we use the -r option to tell etags to list AMS-LaTeX's \\eqref command.)
In DOS and OS/2, this *may* be different, e.g. using slashes like \"etags /o=\"
If so, set it this variable."
- :group 'bib-cite
:type 'string)
(defcustom bib-etags-append-command "etags -r
'/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' -a -o "
"Variable for the etags command and its append and output option.
In unix, this is usually \"etags -r '/.*\\\(eq\|page\|[fvF]\)ref.*/' -a -o \"
In DOS and OS/2, this *may* be \"etags /a /o=\" If so, set it this variable."
- :group 'bib-cite
:type 'string)
(defcustom bib-etags-filename "TAGS"
"Variable for the filename generated by etags, by defaults this TAGS.
but you may want to change this to something like TAGSLaTeX such that it can
coexist with some other tags file in your master file directory."
- :group 'bib-cite
:type 'string)
(defcustom bib-ref-regexp "\\\\\\(eq\\|page\\|[fvF]\\)?ref"
@@ -709,14 +697,12 @@ without the curly bracket.
If you change this variable and you use multi-file documents, make sure you
also edit the variables bib-etags-command and bib-etags-append-command."
- :group 'bib-cite
:type 'regexp)
(defcustom bib-substitute-string-in-display t
"Determines if bib-display will substitute @string definitions.
If t, then the @string text is substituted.
If nil, the text is not substituted but the @string entry is included."
- :group 'bib-cite
:type 'boolean)
(defcustom bib-string-ignored-warning
@@ -726,7 +712,6 @@ If nil, the text is not substituted but the @string entry
is included."
"toms" "toois" "toplas" )
"@string abbreviations for which a warning is not given if not defined.
These are usually month abbreviations (or journals) defined in a style file."
- :group 'bib-cite
:type '(repeat (string :tag "Entry")))
;;<<<<<<User-Modifiable variables end here.
diff --git a/tex-fold.el b/tex-fold.el
index c91e523..9fa310d 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -67,8 +67,7 @@ macros, 'math for math macros and 'comment for comments."
:type '(set (const :tag "Environments" env)
(const :tag "Macros" macro)
(const :tag "Math Macros" math)
- (const :tag "Comments" comment))
- :group 'TeX-fold)
+ (const :tag "Comments" comment)))
(defcustom TeX-fold-macro-spec-list
`(("[f]" ("footnote" "marginpar"))
@@ -118,8 +117,7 @@ Customize or reset the mode."
:type '(repeat (group (choice (string :tag "Display String")
(integer :tag "Number of argument" :value 1)
(function :tag "Function to execute"))
- (repeat :tag "Macros" (string))))
- :group 'TeX-fold)
+ (repeat :tag "Macros" (string)))))
(defvar TeX-fold-macro-spec-list-internal nil
"Internal list of display strings and macros to fold.
@@ -134,8 +132,7 @@ and <mode-prefix>-fold-macro-spec-list.")
"List of display strings and environments to fold."
:type '(repeat (group (choice (string :tag "Display String")
(integer :tag "Number of argument" :value 1))
- (repeat :tag "Environments" (string))))
- :group 'TeX-fold)
+ (repeat :tag "Environments" (string)))))
(defvar TeX-fold-env-spec-list-internal nil
"Internal list of display strings and environments to fold.
@@ -149,8 +146,7 @@ and <mode-prefix>-fold-env-spec-list.")
"List of display strings and math macros to fold."
:type '(repeat (group (choice (string :tag "Display String")
(integer :tag "Number of argument" :value 1))
- (repeat :tag "Math Macros" (string))))
- :group 'TeX-fold)
+ (repeat :tag "Math Macros" (string)))))
(defvar TeX-fold-math-spec-list-internal nil
"Internal list of display strings and math macros to fold.
@@ -164,15 +160,13 @@ and <mode-prefix>-fold-math-spec-list.")
"Display string for unspecified macros.
This string will be displayed if a single macro is being hidden
which is not specified in `TeX-fold-macro-spec-list'."
- :type '(string)
- :group 'TeX-fold)
+ :type '(string))
(defcustom TeX-fold-unspec-env-display-string "[env]"
"Display string for unspecified environments.
This string will be displayed if a single environment is being
hidden which is not specified in `TeX-fold-env-spec-list'."
- :type '(string)
- :group 'TeX-fold)
+ :type '(string))
(defcustom TeX-fold-unspec-use-name t
"If non-nil use the name of an unspecified item as display string.
@@ -180,33 +174,27 @@ Set it to nil if you want to use the values of the
variables
`TeX-fold-unspec-macro-display-string' or
`TeX-fold-unspec-env-display-string' respectively as a display
string for any unspecified macro or environment."
- :type 'boolean
- :group 'TeX-fold)
+ :type 'boolean)
(defcustom TeX-fold-preserve-comments nil
"If non-nil do not fold in comments."
- :type 'boolean
- :group 'TeX-fold)
+ :type 'boolean)
(defcustom TeX-fold-unfold-around-mark t
"Unfold text around the mark, if active."
- :type 'boolean
- :group 'TeX-fold)
+ :type 'boolean)
(defcustom TeX-fold-help-echo-max-length 70
"Maximum length of help echo message for folded overlays.
Set it to zero in order to disable help echos."
- :type 'integer
- :group 'TeX-fold)
+ :type 'integer)
(defcustom TeX-fold-force-fontify t
"Force the buffer to be fully fontified by folding it."
- :group 'TeX-fold
:type 'boolean)
(defcustom TeX-fold-auto nil
"If non-nil, fold macros automatically after `TeX-insert-macro'."
- :group 'TeX-fold
:type 'boolean)
(defface TeX-fold-folded-face
@@ -219,8 +207,7 @@ Set it to zero in order to disable help echos."
(((class grayscale) (background dark))
(:foreground "LightGray"))
(t (:slant italic)))
- "Face for the display string of folded content."
- :group 'TeX-fold)
+ "Face for the display string of folded content.")
(defvar TeX-fold-folded-face 'TeX-fold-folded-face
"Face for the display string of folded content.")
@@ -235,8 +222,7 @@ Set it to zero in order to disable help echos."
(((class grayscale) (background dark))
(:background "DimGray"))
(t (:inverse-video t)))
- "Face for folded content when it is temporarily opened."
- :group 'TeX-fold)
+ "Face for folded content when it is temporarily opened.")
(defvar TeX-fold-unfolded-face 'TeX-fold-unfolded-face
"Face for folded content when it is temporarily opened.")
@@ -251,8 +237,7 @@ Set it to zero in order to disable help echos."
"Prefix key to use for commands in TeX Fold mode.
The value of this variable is checked as part of loading TeX Fold mode.
After that, changing the prefix key requires manipulating keymaps."
- :type 'string
- :group 'TeX-fold)
+ :type 'string)
(defvar TeX-fold-keymap
(let ((map (make-sparse-keymap)))
diff --git a/tex-jp.el b/tex-jp.el
index 3d47a61..d6308c5 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -46,7 +46,6 @@
(defcustom japanese-TeX-engine-default 'ptex
"Default TeX engine for Japanese TeX."
- :group 'AUCTeX-jp
:type '(choice (const :tag "pTeX" ptex)
(const :tag "jTeX" jtex)
(const :tag "upTeX" uptex)))
@@ -56,7 +55,6 @@
If `TeX-japanese-process-input-coding-system' or
`TeX-japanese-process-output-coding-system' are non-nil, the process coding
systems are determined by their values regardless of the kanji option."
- :group 'AUCTeX-jp
:type 'boolean)
(setq TeX-engine-alist-builtin
@@ -227,26 +225,22 @@ systems are determined by their values regardless of the
kanji option."
(defcustom japanese-TeX-error-messages t
"If non-nil, explain TeX error messages in Japanese."
- :group 'AUCTeX-jp
:type 'boolean)
(defcustom TeX-japanese-process-input-coding-system nil
"If non-nil, used for encoding input to Japanese TeX process.
When nil, AUCTeX tries to choose suitable coding system.
See also a user custom option `TeX-japanese-process-output-coding-system'."
- :group 'AUCTeX-jp
:type '(choice (const :tag "Default" nil) coding-system))
(defcustom TeX-japanese-process-output-coding-system nil
"If non-nil, used for decoding output from Japanese TeX process.
When nil, AUCTeX tries to choose suitable coding system.
See also a user custom option `TeX-japanese-process-input-coding-system'."
- :group 'AUCTeX-jp
:type '(choice (const :tag "Default" nil) coding-system))
(defcustom japanese-LaTeX-default-style "jarticle"
"Default when creating new Japanese documents."
- :group 'AUCTeX-jp
:type 'string)
(defcustom japanese-LaTeX-style-list
@@ -266,7 +260,6 @@ See also a user custom option
`TeX-japanese-process-input-coding-system'."
("ujarticle") ("ujreport") ("ujbook")
("utarticle") ("utreport") ("utbook"))
"List of Japanese document classes."
- :group 'AUCTeX-jp
:type '(repeat (group (string :format "%v"))))
(setq LaTeX-style-list
diff --git a/tex-site.el.in b/tex-site.el.in
index b5d4d97..c4b5d0d 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -148,7 +148,6 @@ set it with `TeX-modes-set'."
:type (cons 'set
(mapcar (lambda(x) (list 'const (car x))) TeX-mode-alist))
:set #'TeX-modes-set
- :group 'AUCTeX
:initialize(lambda (var value)
(custom-initialize-reset var value)
(unless (fboundp 'advice-add)
diff --git a/tex-style.el b/tex-style.el
index 85e891a..13811e4 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -37,13 +37,11 @@
(defcustom LaTeX-reftex-ref-style-auto-activate t
"Whether to activate automatically RefTeX reference styles."
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
(defcustom LaTeX-reftex-cite-format-auto-activate t
"Whether to activate automatically RefTeX citation format."
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
;; style/amsmath.el
@@ -61,19 +59,16 @@ Amsmath equations include \"align\", \"alignat\",
\"xalignat\",
(defcustom LaTeX-beamer-section-labels-flag nil
"If non-nil section labels are added"
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
(defcustom LaTeX-beamer-item-overlay-flag t
"If non-nil do prompt for an overlay in itemize-like environments."
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
(defcustom LaTeX-beamer-themes 'local
"Presentation themes for the LaTeX beamer package.
It can be a list of themes or a function. If it is the symbol
`local', search only once per buffer."
- :group 'LaTeX-style
:type
'(choice
(const :tag "TeX search" LaTeX-beamer-search-themes)
@@ -121,7 +116,6 @@ It can be a list of themes or a function. If it is the
symbol
"Presentation inner themes for the LaTeX beamer package.
It can be a list of themes or a function. If it is the symbol
`local', search only once per buffer."
- :group 'LaTeX-style
:type '(choice
(const :tag "TeX search" LaTeX-beamer-search-inner-themes)
(const :tag "Search once per buffer" local)
@@ -142,7 +136,6 @@ It can be a list of themes or a function. If it is the
symbol
"Presentation outer themes for the LaTeX beamer package.
It can be a list of themes or a function. If it is the symbol
`local', search only once per buffer."
- :group 'LaTeX-style
:type
'(choice
(const :tag "TeX search" LaTeX-beamer-search-outer-themes)
@@ -170,7 +163,6 @@ It can be a list of themes or a function. If it is the
symbol
"Presentation color themes for the LaTeX beamer package.
It can be a list of themes or a function. If it is the symbol
`local', search only once per buffer."
- :group 'LaTeX-style
:type
'(choice
(const :tag "TeX search" LaTeX-beamer-search-color-themes)
@@ -204,7 +196,6 @@ It can be a list of themes or a function. If it is the
symbol
"Presentation font themes for the LaTeX beamer package.
It can be a list of themes or a function. If it is the symbol
`local', search only once per buffer."
- :group 'LaTeX-style
:type
'(choice
(const :tag "TeX search" LaTeX-beamer-search-font-themes)
@@ -241,31 +232,27 @@ override the autodetection of the biblatex backend.")
"List of environment names defined with comment.sty.
Setting this variable does not take effect unless you
reinitialize affected buffers."
- :type '(repeat string)
- :group 'LaTeX-style)
+ :type '(repeat string))
;; style/csquotes.el
(defcustom LaTeX-csquotes-quote-after-quote nil
"Initial value of `TeX-quote-after-quote' for `csquotes.el'"
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
(defcustom LaTeX-csquotes-open-quote ""
"Opening quotation mark to be used with the csquotes package.
The specified string will be used for `TeX-open-quote' (and override
any language-specific setting) only if both `LaTeX-csquotes-open-quote'
and `LaTeX-csquotes-close-quote' are non-empty strings."
- :type 'string
- :group 'LaTeX-style)
+ :type 'string)
(defcustom LaTeX-csquotes-close-quote ""
"Closing quotation mark to be used with the csquotes package.
The specified string will be used for `TeX-close-quote' (and override
any language-specific setting) only if both `LaTeX-csquotes-open-quote'
and `LaTeX-csquotes-close-quote' are non-empty strings."
- :type 'string
- :group 'LaTeX-style)
+ :type 'string)
;; style/emp.el
@@ -273,8 +260,7 @@ and `LaTeX-csquotes-close-quote' are non-empty strings."
"If non-nil, insert automatically the \\write18 calling metapost.
When disabled, you have to use mpost on the mp files automatically
produced by emp.sty and then re-LaTeX the document."
- :type 'boolean
- :group 'LaTeX-style)
+ :type 'boolean)
;; style/exam.el
@@ -284,12 +270,10 @@ produced by emp.sty and then re-LaTeX the document."
A character argument for quick identification when RefTeX inserts
new references with `reftex-reference'. It must be unique. It
is initialized to ?x."
- :group 'LaTeX-style
:type 'character)
(defcustom LaTeX-exam-label "exm:"
"Default prefix to labels in environments of exam class."
- :group 'LaTeX-style
:type 'string)
;; style/fontspec.el
@@ -305,7 +289,6 @@ time `LaTeX-fontspec-arg-font' is called.
`LaTeX-fontspec-arg-font' calls `luaotf-load --list=basename' to
automatically get the list of fonts. This requires
`luaotfload-tool' version 2.3 or higher in order to work."
- :group 'LaTeX-style
:type '(choice
(const :tag "Search automatically" t)
(const :tag "Use default font list" nil)
@@ -314,7 +297,6 @@ automatically get the list of fonts. This requires
(defcustom LaTeX-fontspec-font-list-default nil
"List of default fonts to be used as completion for
`LaTeX-fontspec-arg-font'."
- :group 'LaTeX-style
:type '(repeat (string :tag "Font")))
;; style/graphicx.el
@@ -322,7 +304,6 @@ automatically get the list of fonts. This requires
(defcustom LaTeX-includegraphics-extensions
'("eps" "jpe?g" "pdf" "png")
"Extensions for images files used by \\includegraphics."
- :group 'LaTeX-style
:type '(list (set :inline t
(const "eps")
(const "jpe?g")
@@ -334,7 +315,6 @@ automatically get the list of fonts. This requires
(defcustom LaTeX-includegraphics-strip-extension-flag t
"Non-nil means to strip known extensions from image file name."
- :group 'LaTeX-style
:type 'boolean)
(defcustom LaTeX-includegraphics-read-file
@@ -365,7 +345,6 @@ Inserting the subdirectory in the filename (as
;; `----
;; See "Inefficiency" and "Unportability" in the same section for more
;; information.
- :group 'LaTeX-style
:type '(choice (const :tag "TeX" LaTeX-includegraphics-read-file-TeX)
(const :tag "relative"
LaTeX-includegraphics-read-file-relative)
@@ -388,7 +367,6 @@ Inserting the subdirectory in the filename (as
A character argument for quick identification when RefTeX inserts
new references with `reftex-reference'. It must be unique. It
is initialized to ?v."
- :group 'LaTeX-style
:type 'character)
;; style/shortvrb.el
@@ -412,7 +390,6 @@ becomes the default value meaning that verbatim
fontification is
always performed for the characters in the list, no matter if
your document actually defines shortvrb chars using
\\MakeShortVrb."
- :group 'LaTeX-style
:type '(repeat character))
(put 'LaTeX-shortvrb-chars 'safe-local-variable #'listp)
@@ -425,7 +402,6 @@ A character argument for quick identification of
\"\\sindex\"
when RefTeX inserts new index entries with `reftex-index'. It
must be unique. It is initialized to ?s when added to
`reftex-index-macros'."
- :group 'LaTeX-style
:type 'character)
;; Don't look for file-local variables before this line, so that the
diff --git a/texmathp.el b/texmathp.el
index 814dd4b..cd9336b 100644
--- a/texmathp.el
+++ b/texmathp.el
@@ -1,6 +1,6 @@
;;; texmathp.el -- Code to check if point is inside LaTeX math environment
-*- lexical-binding: t; -*-
-;; Copyright (C) 1998, 2004, 2017, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2021 Free Software Foundation, Inc.
;; Author: Carsten Dominik <dominik@strw.LeidenUniv.nl>
;; Maintainer: auctex-devel@gnu.org
@@ -212,7 +212,6 @@ The structure of each entry is (NAME TYPE)
`sw-on' Switch: turns math-mode of following text on
`sw-off' Switch: turns math-mode of following text off
`sw-toggle' Switch: toggles math mode of following text"
- :group 'texmathp
:set '(lambda (symbol value) (set-default symbol value) (texmathp-compile))
:type
'(repeat
@@ -235,7 +234,6 @@ backward to the nearest empty line.
However, during editing it happens that such lines exist temporarily.
Therefore we look a little further. This variable determines how many
empty lines we go back to fix the search limit."
- :group 'texmathp
:type 'number)
(defcustom texmathp-allow-detached-args nil
@@ -244,7 +242,6 @@ When this is t, `aaa' will be interpreted as an argument of
\\bbb in the
following construct: \\bbb [xxx] {aaa}
This is legal in TeX. The disadvantage is that any number of braces
expressions
will be considered arguments of the macro independent of its definition."
- :group 'texmathp
:type 'boolean)
(defvar texmathp-why nil
commit 1d188f59c3c413e4dec4bd34ce0dd320ba3a7fb8
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 19:22:48 2021 -0400
Use #' rather than ' to quote functions
This helps track down typos, references to functions which don't exist
any more, as well as references to obsolete functions.
diff --git a/bib-cite.el b/bib-cite.el
index 4e598eb..e97c15e 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -771,11 +771,11 @@ runs bib-find, and [mouse-3] runs bib-display."
(bib-cite-setup-highlight-mouse-keymap)
(bib-highlight-mouse)
(add-hook 'after-change-functions
- 'bib-cite-setup-mouse-function nil t))))
+ #'bib-cite-setup-mouse-function nil t))))
(t
;;;Undo the minor-mode
;; mouse overlay
- (remove-hook 'after-change-functions 'bib-cite-setup-mouse-function t)
+ (remove-hook 'after-change-functions #'bib-cite-setup-mouse-function t)
(let ((before-change-functions) (after-change-functions))
;; FIXME This detroys all mouse-faces and local-maps!
;; FIXME Hope no other package is using them in this buffer!
@@ -809,8 +809,8 @@ runs bib-find, and [mouse-3] runs bib-display."
(substitute-key-definition 'assist-key-depress-emacs19
nil m global-map))
(t ; emacs 19, not hyperbole
- (define-key m [down-mouse-3] 'bib-display-mouse)
- (define-key m [mouse-2] 'bib-find-mouse)))
+ (define-key m [down-mouse-3] #'bib-display-mouse)
+ (define-key m [mouse-2] #'bib-find-mouse)))
m)))
;;;###autoload
@@ -829,13 +829,13 @@ runs bib-find, and [mouse-3] runs bib-display."
(defvar bib-cite-minor-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map "\C-cba" 'bib-apropos)
- (define-key map "\C-cbb" 'bib-make-bibliography)
- (define-key map "\C-cbd" 'bib-display)
- (define-key map "\C-cbe" 'bib-etags)
- (define-key map "\C-cbf" 'bib-find)
- (define-key map "\C-cbn" 'bib-find-next)
- (define-key map "\C-cbh" 'bib-highlight-mouse)
+ (define-key map "\C-cba" #'bib-apropos)
+ (define-key map "\C-cbb" #'bib-make-bibliography)
+ (define-key map "\C-cbd" #'bib-display)
+ (define-key map "\C-cbe" #'bib-etags)
+ (define-key map "\C-cbf" #'bib-find)
+ (define-key map "\C-cbn" #'bib-find-next)
+ (define-key map "\C-cbh" #'bib-highlight-mouse)
map)
"Bib-cite minor-mode keymap.")
@@ -1500,7 +1500,7 @@ If within a multi-file document (in auctex only)
(defvar bib-label-prompt-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-completion-map)
- (define-key map " " 'self-insert-command)
+ (define-key map " " #'self-insert-command)
map))
(defun bib-guess-or-prompt-for-label ()
@@ -1644,7 +1644,7 @@ e.g. turns
'((\"label3\" \"label4\")(\"label1\" \"label2\") \"label\")
into
'((\"label3\") (\"label4\") (\"label1\") (\"label2\") (\"label\"))"
- (mapcar 'list (bib-cite-mh-list-to-string the-list)))
+ (mapcar #'list (bib-cite-mh-list-to-string the-list)))
;;
;; Following two functions from mh-utils.el (part of GNU emacs)
@@ -2249,7 +2249,7 @@ although BiBTeX doesn't allow it!"
(skip-chars-backward ", ")
(point))))))
(setq doNext nil)))
- (mapcar 'list the-list)))))
+ (mapcar #'list the-list)))))
(defvar TeX-auto-save)
(defvar TeX-auto-regexp-list)
diff --git a/context-en.el b/context-en.el
index c545eea..d79158c 100644
--- a/context-en.el
+++ b/context-en.el
@@ -188,7 +188,7 @@ That is, besides the section(-block) commands.")
(defun ConTeXt-en-mode-initialization ()
"ConTeXt english interface specific initialization."
- (mapc 'ConTeXt-add-environments (reverse ConTeXt-environment-list-en))
+ (mapc #'ConTeXt-add-environments (reverse ConTeXt-environment-list-en))
(TeX-add-symbols
'("but" ConTeXt-arg-define-ref (TeX-arg-literal " "))
diff --git a/context-nl.el b/context-nl.el
index 55fcb09..5be65f6 100644
--- a/context-nl.el
+++ b/context-nl.el
@@ -163,7 +163,7 @@ That is, besides the section(-block) commands.")
(defun ConTeXt-nl-mode-initialization ()
"ConTeXt dutch interface specific initialization."
- (mapc 'ConTeXt-add-environments (reverse ConTeXt-environment-list-nl))
+ (mapc #'ConTeXt-add-environments (reverse ConTeXt-environment-list-nl))
(TeX-add-symbols
'("but" ConTeXt-arg-define-ref (TeX-arg-literal " "))
diff --git a/context.el b/context.el
index 3e29f5a..9219a95 100644
--- a/context.el
+++ b/context.el
@@ -1,7 +1,6 @@
;;; context.el --- Support for ConTeXt documents. -*- lexical-binding: t; -*-
-;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2020
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Maintainer: Berend de Boer <berend@pobox.com>
;; Keywords: tex
@@ -506,7 +505,7 @@ in your .emacs file."
:type 'string
:group 'TeX-command)
(make-variable-buffer-local 'ConTeXt-Mark-version)
-(put 'ConTeXt-Mark-version 'safe-local-variable 'stringp)
+(put 'ConTeXt-Mark-version 'safe-local-variable #'stringp)
(defun ConTeXt-numbered-section-heading ()
"Hook to prompt for ConTeXt section name.
@@ -1310,18 +1309,18 @@ else. There might be text before point."
(let ((map (make-sparse-keymap)))
(set-keymap-parent map TeX-mode-map)
- (define-key map "\e\C-a" 'ConTeXt-find-matching-start)
- (define-key map "\e\C-e" 'ConTeXt-find-matching-stop)
+ (define-key map "\e\C-a" #'ConTeXt-find-matching-start)
+ (define-key map "\e\C-e" #'ConTeXt-find-matching-stop)
;; likely to change in the future
- (define-key map "\C-c!" 'ConTeXt-work-on-environment)
- (define-key map "\C-c\C-e" 'ConTeXt-environment)
- (define-key map "\C-c\n" 'ConTeXt-insert-item)
+ (define-key map "\C-c!" #'ConTeXt-work-on-environment)
+ (define-key map "\C-c\C-e" #'ConTeXt-environment)
+ (define-key map "\C-c\n" #'ConTeXt-insert-item)
(or (key-binding "\e\r")
- (define-key map "\e\r" 'ConTeXt-insert-item)) ;*** Alias
- (define-key map "\C-c]" 'ConTeXt-close-environment)
- (define-key map "\C-c\C-s" 'ConTeXt-section)
+ (define-key map "\e\r" #'ConTeXt-insert-item)) ;*** Alias
+ (define-key map "\C-c]" #'ConTeXt-close-environment)
+ (define-key map "\C-c\C-s" #'ConTeXt-section)
;; XML in ConTeXt support
- (define-key map "\C-c/" 'ConTeXt-close-xml-tag)
+ (define-key map "\C-c/" #'ConTeXt-close-xml-tag)
map)
"Keymap used in `ConTeXt-mode'.")
@@ -1741,7 +1740,7 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
(use-local-map ConTeXt-mode-map)
;; Indenting
- (set (make-local-variable 'indent-line-function) 'ConTeXt-indent-line)
+ (set (make-local-variable 'indent-line-function) #'ConTeXt-indent-line)
(set (make-local-variable 'fill-indent-according-to-mode) t)
;; Paragraph formatting
@@ -1749,7 +1748,7 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
(set (make-local-variable 'LaTeX-paragraph-commands-regexp)
(ConTeXt-paragraph-commands-regexp))
(set (make-local-variable 'paragraph-ignore-fill-prefix) t)
- (set (make-local-variable 'fill-paragraph-function) 'LaTeX-fill-paragraph)
+ (set (make-local-variable 'fill-paragraph-function) #'LaTeX-fill-paragraph)
(set (make-local-variable 'adaptive-fill-mode) nil)
(setq paragraph-start
(concat
@@ -1771,7 +1770,7 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
(if (fboundp 'make-local-hook)
(make-local-hook 'activate-menubar-hook))
- (add-hook 'activate-menubar-hook 'ConTeXt-menu-update nil t)
+ (add-hook 'activate-menubar-hook #'ConTeXt-menu-update nil t)
;; Outline support
(require 'outline)
@@ -1786,11 +1785,11 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
;; imenu support
(set (make-local-variable 'imenu-create-index-function)
- 'ConTeXt-imenu-create-index-function)
+ #'ConTeXt-imenu-create-index-function)
;; run hooks
(setq TeX-command-default "ConTeXt")
- (setq TeX-sentinel-default-function 'TeX-ConTeXt-sentinel)
+ (setq TeX-sentinel-default-function #'TeX-ConTeXt-sentinel)
(run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'ConTeXt-mode-hook))
(defun context-guess-current-interface ()
@@ -1811,7 +1810,7 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
ConTeXt-default-interface)))))
;;;###autoload
-(defalias 'ConTeXt-mode 'context-mode)
+(defalias 'ConTeXt-mode #'context-mode)
;;;###autoload
(defun context-mode ()
diff --git a/font-latex.el b/font-latex.el
index bc6e087..36edba2 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -140,7 +140,7 @@ correct value from document properties."
font-latex-quotes)))
;; Update the value of `font-latex-quotes-internal' when the list of
;; styles changes.
-(add-hook 'TeX-update-style-hook 'font-latex-quotes-set-internal)
+(add-hook 'TeX-update-style-hook #'font-latex-quotes-set-internal)
;; The definitions of the title faces were originally taken from
;; info.el (Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 97, 98, 99,
@@ -180,7 +180,7 @@ effect unless you call \\[font-lock-fontify-buffer] or
restart
Emacs."
:type '(choice (number :tag "Scale factor")
(const color))
- :initialize 'custom-initialize-default
+ :initialize #'custom-initialize-default
:set (lambda (symbol value)
(set-default symbol value)
(unless (eq value 'color)
@@ -469,7 +469,7 @@ You have to restart Emacs for a change of this variable to
take effect."
;; Name of the keyword class
(let ((name (split-string (car spec) "-")))
(setcar name (capitalize (car name)))
- (mapconcat 'identity name " "))
+ (mapconcat #'identity name " "))
" keywords in `"
;; Name of the face
(symbol-name
@@ -799,7 +799,7 @@ Generated by `font-latex-user-keyword-classes'"))))
(let ((keywords (nth 1 elt))
single-char-macro-flag)
(setq keywords (if (listp (car keywords))
- (mapcar 'car keywords)
+ (mapcar #'car keywords)
keywords))
(catch 'single-char
(dolist (keyword keywords)
@@ -2001,7 +2001,7 @@ Take into account $...$, $$...$$, \\(...\\) and
\\=\\[...\\], too."
font-latex-quotes-internal)))
(setq tail (cdr tail))))
(setq font-latex-quote-regexp-beg
- (regexp-opt (mapcar 'car font-latex-quote-list) t))))
+ (regexp-opt (mapcar #'car font-latex-quote-list) t))))
(defun font-latex-match-quotation (limit)
"Match quote patterns up to LIMIT.
diff --git a/latex.el b/latex.el
index a88caad..6f496e3 100644
--- a/latex.el
+++ b/latex.el
@@ -289,12 +289,12 @@ header is at the start of a line."
"[ \t]*"
(regexp-quote TeX-esc)
"\\(appendix\\|documentstyle\\|documentclass\\|"
- (mapconcat 'car LaTeX-section-list "\\|")
+ (mapconcat #'car LaTeX-section-list "\\|")
"\\)\\b"
(if TeX-outline-extra
"\\|"
"")
- (mapconcat 'car TeX-outline-extra "\\|")
+ (mapconcat #'car TeX-outline-extra "\\|")
"\\|" TeX-header-end
"\\|" TeX-trailer-start))
@@ -1749,7 +1749,7 @@ Split the string at commas and remove Biber file
extensions."
LaTeX-auto-style nil
LaTeX-auto-end-symbol nil))
-(add-hook 'TeX-auto-prepare-hook 'LaTeX-auto-prepare)
+(add-hook 'TeX-auto-prepare-hook #'LaTeX-auto-prepare)
(defun LaTeX-listify-package-options (options)
"Return a list from a comma-separated string of package OPTIONS.
@@ -1838,9 +1838,9 @@ The value is actually the tail of the list of options
given to PACKAGE."
;; Cleanup BibTeX/Biber files
(setq LaTeX-auto-bibliography
- (apply 'append (mapcar (lambda (arg)
- (TeX-split-string "," arg))
- LaTeX-auto-bibliography)))
+ (apply #'append (mapcar (lambda (arg)
+ (TeX-split-string "," arg))
+ LaTeX-auto-bibliography)))
;; Reset class and packages options for the current buffer
(setq LaTeX-provided-class-options nil)
@@ -1963,11 +1963,11 @@ The value is actually the tail of the list of options
given to PACKAGE."
(add-to-list 'LaTeX-auto-environment symbol)))
LaTeX-auto-end-symbol))
-(add-hook 'TeX-auto-cleanup-hook 'LaTeX-auto-cleanup)
+(add-hook 'TeX-auto-cleanup-hook #'LaTeX-auto-cleanup)
(defadvice LaTeX-add-bibliographies (after run-bib-style-hooks (&rest
bibliographies) activate)
"Add BIBLIOGRAPHIES to the list of known bibliographies and style files."
- (apply 'TeX-run-style-hooks bibliographies))
+ (apply #'TeX-run-style-hooks bibliographies))
;;; Biber support
@@ -2099,7 +2099,7 @@ string. ARGS is unused."
(LaTeX-add-index-entries entry))
(TeX-argument-insert entry optional optional)))
-(defalias 'TeX-arg-define-index 'TeX-arg-index)
+(defalias 'TeX-arg-define-index #'TeX-arg-index)
(defun TeX-arg-macro (optional &optional prompt definition)
"Prompt for a TeX macro with completion.
@@ -2138,8 +2138,8 @@ argument, otherwise as a mandatory one. Use PROMPT as
the prompt
string. DEFINITION is unused."
(let ((items (multi-prompt "," t (TeX-argument-prompt optional prompt "Key")
(LaTeX-bibitem-list))))
- (apply 'LaTeX-add-bibitems items)
- (TeX-argument-insert (mapconcat 'identity items ",") optional optional)))
+ (apply #'LaTeX-add-bibitems items)
+ (TeX-argument-insert (mapconcat #'identity items ",") optional optional)))
(defun TeX-arg-counter (optional &optional prompt definition)
"Prompt for a LaTeX counter.
@@ -2387,10 +2387,10 @@ OPTIONAL and IGNORE are ignored."
(setq options (funcall var))
(when (symbol-value var)
(setq options
- (mapconcat 'identity
+ (mapconcat #'identity
(TeX-completing-read-multiple
- optprmpt (mapcar 'list (symbol-value var)) nil
nil
- nil nil defopt)
+ optprmpt (mapcar #'list (symbol-value var))
+ nil nil nil nil defopt)
","))))
(setq options (TeX-read-string optprmpt nil nil defopt)))
(unless (zerop (length options))
@@ -2429,7 +2429,7 @@ of the options, nil otherwise."
(progn
(message "Searching for LaTeX packages...")
(setq TeX-global-input-files
- (mapcar 'list (TeX-search-files-by-type
+ (mapcar #'list (TeX-search-files-by-type
'texinputs 'global t t)))
(message "Searching for LaTeX packages...done"))))
(setq packages (TeX-completing-read-multiple
@@ -2454,9 +2454,9 @@ of the options, nil otherwise."
(setq options (funcall var))
(when (symbol-value var)
(setq options
- (mapconcat 'identity
+ (mapconcat #'identity
(TeX-completing-read-multiple
- "Options: " (mapcar 'list (symbol-value var)))
+ "Options: " (mapcar #'list (symbol-value var)))
","))))
(setq options (TeX-read-string "Options: ")))
(cons packages options))))
@@ -2470,7 +2470,7 @@ of the options, nil otherwise."
(list (cons elt opts))))
packages))
(insert LaTeX-optop options LaTeX-optcl))
- (insert TeX-grop (mapconcat 'identity packages ",") TeX-grcl)
+ (insert TeX-grop (mapconcat #'identity packages ",") TeX-grcl)
(run-hooks 'LaTeX-after-usepackage-hook)
(apply #'TeX-run-style-hooks packages))
@@ -2546,13 +2546,13 @@ files."
(unless (or TeX-global-input-files local)
(message "Searching for files...")
(setq TeX-global-input-files
- (mapcar 'list (TeX-search-files-by-type
+ (mapcar #'list (TeX-search-files-by-type
'texinputs 'global t t)))
(message "Searching for files...done"))
(setq file (completing-read
(TeX-argument-prompt optional prompt "File")
(TeX-delete-dups-by-car
- (append (mapcar 'list (TeX-search-files-by-type
+ (append (mapcar #'list (TeX-search-files-by-type
'texinputs 'local t t))
(unless local
TeX-global-input-files))))
@@ -2586,11 +2586,11 @@ string."
(message "Searching for BibTeX styles...")
(or BibTeX-global-style-files
(setq BibTeX-global-style-files
- (mapcar 'list (TeX-search-files-by-type 'bstinputs 'global t t))))
+ (mapcar #'list (TeX-search-files-by-type 'bstinputs 'global t t))))
(message "Searching for BibTeX styles...done")
(TeX-argument-insert
(completing-read (TeX-argument-prompt optional prompt "BibTeX style")
- (append (mapcar 'list (TeX-search-files-by-type
+ (append (mapcar #'list (TeX-search-files-by-type
'bstinputs 'local t t))
BibTeX-global-style-files))
optional))
@@ -2615,19 +2615,19 @@ string."
(message "Searching for BibTeX files...")
(or BibTeX-global-files
(setq BibTeX-global-files
- (mapcar 'list (TeX-search-files-by-type 'bibinputs 'global t t))))
+ (mapcar #'list (TeX-search-files-by-type 'bibinputs 'global t t))))
(message "Searching for BibTeX files...done")
(let ((styles (multi-prompt
"," t
(TeX-argument-prompt optional prompt "BibTeX files")
- (append (mapcar 'list (TeX-search-files-by-type
- 'bibinputs 'local t t))
+ (append (mapcar #'list (TeX-search-files-by-type
+ 'bibinputs 'local t t))
BibTeX-global-files))))
- (apply 'LaTeX-add-bibliographies styles)
+ (apply #'LaTeX-add-bibliographies styles)
;; Run style files associated to the bibliography database files in order
to
;; immediately fill `LaTeX-bibitem-list'.
- (mapc 'TeX-run-style-hooks styles)
- (TeX-argument-insert (mapconcat 'identity styles ",") optional)))
+ (mapc #'TeX-run-style-hooks styles)
+ (TeX-argument-insert (mapconcat #'identity styles ",") optional)))
(defun TeX-arg-corner (optional &optional prompt)
"Prompt for a LaTeX side or corner position with completion.
@@ -4801,7 +4801,7 @@ usually used in the Emacs and Elisp manuals.
Setting this variable directly does not take effect;
use \\[customize]."
:group 'LaTeX-math
- :initialize 'custom-initialize-default
+ :initialize #'custom-initialize-default
:set '(lambda (symbol value)
(define-key LaTeX-math-mode-map (LaTeX-math-abbrev-prefix) t)
(set-default symbol value)
@@ -5420,7 +5420,7 @@ MENU and CHARACTER, see `LaTeX-math-list' for details.")
(cdr parent)))))))))
;; Make the math prefix char available if it has not been used as a prefix.
(unless (lookup-key map (LaTeX-math-abbrev-prefix))
- (define-key map (LaTeX-math-abbrev-prefix) 'self-insert-command))))
+ (define-key map (LaTeX-math-abbrev-prefix) #'self-insert-command))))
(defcustom LaTeX-math-list nil
"Alist of your personal LaTeX math symbols.
@@ -5479,7 +5479,7 @@ commands are defined:
(easy-menu-add LaTeX-math-mode-menu LaTeX-math-mode-map)
(easy-menu-remove LaTeX-math-mode-menu))
(TeX-set-mode-name))
-(defalias 'latex-math-mode 'LaTeX-math-mode)
+(defalias 'latex-math-mode #'LaTeX-math-mode)
(easy-menu-define LaTeX-math-mode-menu
LaTeX-math-mode-map
@@ -5602,40 +5602,40 @@ environments."
(set-keymap-parent map TeX-mode-map)
;; Standard
- (define-key map "\n" 'reindent-then-newline-and-indent)
+ (define-key map "\n" #'reindent-then-newline-and-indent)
;; From latex.el
;; We now set `fill-paragraph-function' instead.
;; (define-key map "\eq" 'LaTeX-fill-paragraph) ;*** Alias
;; This key is now used by Emacs for face settings.
;; (define-key map "\eg" 'LaTeX-fill-region) ;*** Alias
- (define-key map "\e\C-e" 'LaTeX-find-matching-end)
- (define-key map "\e\C-a" 'LaTeX-find-matching-begin)
+ (define-key map "\e\C-e" #'LaTeX-find-matching-end)
+ (define-key map "\e\C-a" #'LaTeX-find-matching-begin)
- (define-key map "\C-c\C-q\C-p" 'LaTeX-fill-paragraph)
- (define-key map "\C-c\C-q\C-r" 'LaTeX-fill-region)
- (define-key map "\C-c\C-q\C-s" 'LaTeX-fill-section)
- (define-key map "\C-c\C-q\C-e" 'LaTeX-fill-environment)
+ (define-key map "\C-c\C-q\C-p" #'LaTeX-fill-paragraph)
+ (define-key map "\C-c\C-q\C-r" #'LaTeX-fill-region)
+ (define-key map "\C-c\C-q\C-s" #'LaTeX-fill-section)
+ (define-key map "\C-c\C-q\C-e" #'LaTeX-fill-environment)
- (define-key map "\C-c\C-z" 'LaTeX-command-section)
- (define-key map "\C-c\M-z" 'LaTeX-command-section-change-level)
+ (define-key map "\C-c\C-z" #'LaTeX-command-section)
+ (define-key map "\C-c\M-z" #'LaTeX-command-section-change-level)
- (define-key map "\C-c." 'LaTeX-mark-environment) ;*** Dubious
- (define-key map "\C-c*" 'LaTeX-mark-section) ;*** Dubious
+ (define-key map "\C-c." #'LaTeX-mark-environment) ;*** Dubious
+ (define-key map "\C-c*" #'LaTeX-mark-section) ;*** Dubious
- (define-key map "\C-c\C-e" 'LaTeX-environment)
- (define-key map "\C-c\n" 'LaTeX-insert-item)
+ (define-key map "\C-c\C-e" #'LaTeX-environment)
+ (define-key map "\C-c\n" #'LaTeX-insert-item)
(or (key-binding "\e\r")
- (define-key map "\e\r" 'LaTeX-insert-item)) ;*** Alias
- (define-key map "\C-c]" 'LaTeX-close-environment)
- (define-key map "\C-c\C-s" 'LaTeX-section)
+ (define-key map "\e\r" #'LaTeX-insert-item)) ;*** Alias
+ (define-key map "\C-c]" #'LaTeX-close-environment)
+ (define-key map "\C-c\C-s" #'LaTeX-section)
- (define-key map "\C-c~" 'LaTeX-math-mode) ;*** Dubious
+ (define-key map "\C-c~" #'LaTeX-math-mode) ;*** Dubious
- (define-key map "-" 'LaTeX-babel-insert-hyphen)
- (define-key map "(" 'LaTeX-insert-left-brace)
- (define-key map "{" 'LaTeX-insert-left-brace)
- (define-key map "[" 'LaTeX-insert-left-brace)
+ (define-key map "-" #'LaTeX-babel-insert-hyphen)
+ (define-key map "(" #'LaTeX-insert-left-brace)
+ (define-key map "{" #'LaTeX-insert-left-brace)
+ (define-key map "[" #'LaTeX-insert-left-brace)
map)
"Keymap used in `LaTeX-mode'.")
@@ -5736,9 +5736,9 @@ The argument IGNORED is not used in any way."
(or LaTeX-section-menu
(progn
(setq LaTeX-section-list-changed nil)
- (mapc 'LaTeX-section-enable LaTeX-section-list)
+ (mapc #'LaTeX-section-enable LaTeX-section-list)
(setq LaTeX-section-menu
- (mapcar 'LaTeX-section-menu-entry LaTeX-section-list)))))
+ (mapcar #'LaTeX-section-menu-entry LaTeX-section-list)))))
(defvar LaTeX-environment-menu nil)
(make-variable-buffer-local 'LaTeX-environment-menu)
@@ -5755,13 +5755,13 @@ corresponds to the variables
`LaTeX-environment-menu-name' and
(or LaTeX-environment-menu
(setq LaTeX-environment-menu
(LaTeX-split-long-menu
- (mapcar 'LaTeX-environment-menu-entry
+ (mapcar #'LaTeX-environment-menu-entry
(LaTeX-environment-list))))))
((string= menu LaTeX-environment-modify-menu-name)
(or LaTeX-environment-modify-menu
(setq LaTeX-environment-modify-menu
(LaTeX-split-long-menu
- (mapcar 'LaTeX-environment-modify-menu-entry
+ (mapcar #'LaTeX-environment-modify-menu-entry
(LaTeX-environment-list))))))))
(defadvice LaTeX-add-environments (after LaTeX-invalidate-environment-menu
(&rest environments) activate)
@@ -6073,8 +6073,8 @@ of `LaTeX-mode-hook'."
(setq TeX-base-mode-name "LaTeX")
(setq major-mode 'latex-mode)
(setq TeX-command-default "LaTeX")
- (setq TeX-sentinel-default-function 'TeX-LaTeX-sentinel)
- (add-hook 'tool-bar-mode-on-hook 'LaTeX-maybe-install-toolbar nil t)
+ (setq TeX-sentinel-default-function #'TeX-LaTeX-sentinel)
+ (add-hook 'tool-bar-mode-on-hook #'LaTeX-maybe-install-toolbar nil t)
(when (and (boundp 'tool-bar-mode) tool-bar-mode)
(LaTeX-maybe-install-toolbar))
;; Set the value of `LaTeX-using-Biber' based on the local value of
@@ -6107,7 +6107,7 @@ of `LaTeX-mode-hook'."
(turn-off-filladapt-mode))
(when (< 25 emacs-major-version)
;; Set up flymake backend, see latex-flymake.el
- (add-hook 'flymake-diagnostic-functions 'LaTeX-flymake nil t)))
+ (add-hook 'flymake-diagnostic-functions #'LaTeX-flymake nil t)))
(TeX-abbrev-mode-setup doctex-mode)
@@ -6142,7 +6142,7 @@ runs the hooks in `docTeX-mode-hook'."
;;disabled) as would be normal for our scheme.
;;;###autoload
-(defalias 'TeX-doctex-mode 'docTeX-mode)
+(defalias 'TeX-doctex-mode #'docTeX-mode)
(defcustom docTeX-clean-intermediate-suffixes
TeX-clean-default-intermediate-suffixes
@@ -6191,13 +6191,13 @@ function would return non-nil and `(match-string 1)'
would return
"Common initialization for LaTeX derived modes."
(VirTeX-common-initialization)
(set-syntax-table LaTeX-mode-syntax-table)
- (set (make-local-variable 'indent-line-function) 'LaTeX-indent-line)
+ (set (make-local-variable 'indent-line-function) #'LaTeX-indent-line)
(setq local-abbrev-table latex-mode-abbrev-table)
;; Filling
(set (make-local-variable 'paragraph-ignore-fill-prefix) t)
- (set (make-local-variable 'fill-paragraph-function) 'LaTeX-fill-paragraph)
+ (set (make-local-variable 'fill-paragraph-function) #'LaTeX-fill-paragraph)
(set (make-local-variable 'adaptive-fill-mode) nil)
(or LaTeX-largest-level
@@ -6208,7 +6208,7 @@ function would return non-nil and `(match-string 1)'
would return
(set (make-local-variable 'TeX-style-hook-dialect) TeX-dialect)
(require 'outline)
- (set (make-local-variable 'outline-level) 'LaTeX-outline-level)
+ (set (make-local-variable 'outline-level) #'LaTeX-outline-level)
(set (make-local-variable 'outline-regexp) (LaTeX-outline-regexp t))
(when (boundp 'outline-heading-alist)
(setq outline-heading-alist
@@ -6230,9 +6230,9 @@ function would return non-nil and `(match-string 1)'
would return
"\\$\\$" ; Plain TeX display math
"\\|$\\)"))
- (setq TeX-verbatim-p-function 'LaTeX-verbatim-p)
+ (setq TeX-verbatim-p-function #'LaTeX-verbatim-p)
(setq TeX-search-forward-comment-start-function
- 'LaTeX-search-forward-comment-start)
+ #'LaTeX-search-forward-comment-start)
(set (make-local-variable 'TeX-search-files-type-alist)
LaTeX-search-files-type-alist)
@@ -6715,7 +6715,7 @@ function would return non-nil and `(match-string 1)'
would return
(if (string-equal LaTeX-version "2")
()
(setq TeX-font-list LaTeX-font-list)
- (setq TeX-font-replace-function 'TeX-font-replace-macro)
+ (setq TeX-font-replace-function #'TeX-font-replace-macro)
(TeX-add-symbols
'("newcommand" TeX-arg-define-macro
[ TeX-arg-define-macro-arguments ] t)
@@ -6750,7 +6750,7 @@ function would return non-nil and `(match-string 1)'
would return
;; Use new fonts for `\documentclass' documents.
(lambda ()
(setq TeX-font-list LaTeX-font-list)
- (setq TeX-font-replace-function
'TeX-font-replace-macro)
+ (setq TeX-font-replace-function
#'TeX-font-replace-macro)
(run-hooks 'LaTeX2e-hook))
TeX-dialect)
@@ -6800,7 +6800,7 @@ function would return non-nil and `(match-string 1)'
would return
;; user overrode it.
(set (make-local-variable 'imenu-create-index-function)
- 'LaTeX-imenu-create-index-function)
+ #'LaTeX-imenu-create-index-function)
(use-local-map LaTeX-mode-map)
@@ -6811,7 +6811,7 @@ function would return non-nil and `(match-string 1)'
would return
(easy-menu-add LaTeX-mode-menu LaTeX-mode-map)
(easy-menu-add LaTeX-mode-command-menu LaTeX-mode-map)
- (define-key LaTeX-mode-map "\C-xne" 'LaTeX-narrow-to-environment)
+ (define-key LaTeX-mode-map "\C-xne" #'LaTeX-narrow-to-environment)
;; AUCTeX's brace pairing feature (`LaTeX-electric-left-right-brace') doesn't
;; play nice with `electric-pair-mode' which is a global minor mode as of
diff --git a/multi-prompt.el b/multi-prompt.el
index 9f5729e..884eddc 100644
--- a/multi-prompt.el
+++ b/multi-prompt.el
@@ -1,6 +1,6 @@
;;; multi-prompt.el --- Completing read of multiple strings
-;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2021 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: auctex-devel@gnu.org
@@ -56,7 +56,7 @@ are the arguments to `completing-read'. See that."
(define-key new-map separator (if require-match
'multi-prompt-next-must-match
'multi-prompt-next))
- (define-key new-map "\C-?" 'multi-prompt-delete)
+ (define-key new-map "\C-?" #'multi-prompt-delete)
(let* ((minibuffer-local-completion-map new-map)
(minibuffer-local-must-match-map new-map)
(multi-prompt-found nil)
diff --git a/plain-tex.el b/plain-tex.el
index 9fd0fad..93bc1ed 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -134,8 +134,8 @@ of `plain-TeX-mode-hook'."
(easy-menu-add plain-TeX-mode-command-menu plain-TeX-mode-map)
(setq TeX-base-mode-name "TeX")
(setq TeX-command-default "TeX")
- (setq TeX-sentinel-default-function 'TeX-TeX-sentinel)
- (add-hook 'tool-bar-mode-on-hook 'plain-TeX-maybe-install-toolbar nil t)
+ (setq TeX-sentinel-default-function #'TeX-TeX-sentinel)
+ (add-hook 'tool-bar-mode-on-hook #'plain-TeX-maybe-install-toolbar nil t)
(when (and (boundp 'tool-bar-mode) tool-bar-mode)
(plain-TeX-maybe-install-toolbar))
(run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'plain-TeX-mode-hook)
diff --git a/preview.el.in b/preview.el.in
index 5833b9e..9f51fb4 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -950,7 +950,7 @@ Pure borderless black-on-white will return an empty string."
(file-error nil)))
(setq TeX-sentinel-function nil))
-(defalias 'preview-dvipng-abort 'preview-dvips-abort)
+(defalias 'preview-dvipng-abort #'preview-dvips-abort)
; "Abort a DviPNG run.")
(defun preview-gs-dvips-sentinel (process _command &optional gsstart)
@@ -1033,8 +1033,8 @@ The usual PROCESS and COMMAND arguments for
(setq TeX-sentinel-function
`(lambda (process command)
(,(if preview-parsed-pdfoutput
- 'preview-pdf2dsc-sentinel
- 'preview-gs-dvips-sentinel)
+ #'preview-pdf2dsc-sentinel
+ #'preview-gs-dvips-sentinel)
process
command
t))))
@@ -1968,7 +1968,7 @@ purposes."
(setcdr strings (preview-inactive-string ov)))
(overlay-put ov 'before-string (cdr strings)))
(if old-urgent
- (apply 'preview-add-urgentization old-urgent))))
+ (apply #'preview-add-urgentization old-urgent))))
(if event
(preview-restore-position
ov
@@ -3717,8 +3717,8 @@ The fourth value is the transparent border thickness."
(if TeX-after-start-process-function
(funcall TeX-after-start-process-function process))
(TeX-command-mode-line process)
- (set-process-filter process 'TeX-command-filter)
- (set-process-sentinel process 'TeX-command-sentinel)
+ (set-process-filter process #'TeX-command-filter)
+ (set-process-sentinel process #'TeX-command-sentinel)
(set-marker (process-mark process) (point-max))
(push process compilation-in-progress)
(sit-for 0)
@@ -3759,8 +3759,8 @@ If FAST is set, do a fast conversion."
(if TeX-after-start-process-function
(funcall TeX-after-start-process-function process))
(TeX-command-mode-line process)
- (set-process-filter process 'TeX-command-filter)
- (set-process-sentinel process 'TeX-command-sentinel)
+ (set-process-filter process #'TeX-command-filter)
+ (set-process-sentinel process #'TeX-command-sentinel)
(set-marker (process-mark process) (point-max))
(push process compilation-in-progress)
(sit-for 0)
@@ -3801,8 +3801,8 @@ If FAST is set, do a fast conversion."
(if TeX-after-start-process-function
(funcall TeX-after-start-process-function process))
(TeX-command-mode-line process)
- (set-process-filter process 'TeX-command-filter)
- (set-process-sentinel process 'TeX-command-sentinel)
+ (set-process-filter process #'TeX-command-filter)
+ (set-process-sentinel process #'TeX-command-sentinel)
(set-marker (process-mark process) (point-max))
(push process compilation-in-progress)
(sit-for 0)
@@ -4188,9 +4188,9 @@ internal parameters, STR may be a log to insert into the
current log."
(set-marker (process-mark process) (point)))))
(preview-set-geometry geometry)
(setq preview-gs-file pr-file)
- (setq TeX-sentinel-function 'preview-TeX-inline-sentinel)
+ (setq TeX-sentinel-function #'preview-TeX-inline-sentinel)
(TeX-parse-reset)
- (setq TeX-parse-function 'TeX-parse-TeX)
+ (setq TeX-parse-function #'TeX-parse-TeX)
(if TeX-process-asynchronous
process
(TeX-synchronous-sentinel "Preview-LaTeX" file process)))
diff --git a/style/CJK.el b/style/CJK.el
index 446e431..baee5d9 100644
--- a/style/CJK.el
+++ b/style/CJK.el
@@ -1,6 +1,6 @@
;;; CJK.el --- AUCTeX style for the CJK package. -*- lexical-binding: t; -*-
-;; Copyright (C) 2009, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -52,7 +52,7 @@ The function can be used for CJK and CJK* environments."
(let ((font-enc (TeX-read-string "(Optional) Font encoding: ")))
(unless (zerop (length font-enc)) (format "[%s]" font-enc)))
(format "{%s}" (completing-read "Encoding: "
- (mapcar 'list LaTeX-CJK-enc-list)))
+ (mapcar #'list LaTeX-CJK-enc-list)))
(format "{%s}" (TeX-read-string "Font family: ")))))
(TeX-add-style-hook
diff --git a/style/array.el b/style/array.el
index b944103..be7baf3 100644
--- a/style/array.el
+++ b/style/array.el
@@ -1,6 +1,6 @@
;;; array.el --- AUCTeX style for `array.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2013, 2015, 2018--2020 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
;; Author: Mads Jensen <mje@inducks.org>
;; Maintainer: auctex-devel@gnu.org
@@ -59,7 +59,7 @@ package.")
"Update and uniquify the value of `LaTeX-array-column-letters'
and make it buffer local. "
(set (make-local-variable 'LaTeX-array-column-letters)
- (mapconcat 'identity
+ (mapconcat #'identity
(TeX-delete-duplicate-strings
(split-string
(concat LaTeX-array-column-letters
diff --git a/style/babel.el b/style/babel.el
index e8f792c..548f2c8 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -1,6 +1,6 @@
;;; babel.el --- AUCTeX style for `babel.sty' version 3.31. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2005, 2007, 2013-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: auctex-devel@gnu.org
@@ -253,7 +253,7 @@
"babel"
(lambda ()
(LaTeX-babel-load-languages)
- (add-hook 'LaTeX-after-usepackage-hook 'LaTeX-babel-load-languages nil t)
+ (add-hook 'LaTeX-after-usepackage-hook #'LaTeX-babel-load-languages nil t)
;; Add babel to the parser.
(TeX-auto-add-regexp LaTeX-babel-babeltags-regexp)
diff --git a/style/beamer.el b/style/beamer.el
index ea9ed4e..7c80ce8 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,6 +1,6 @@
;;; beamer.el --- AUCTeX style for the latex-beamer class -*-
lexical-binding: t; -*-
-;; Copyright (C) 2003-2005, 2008, 2013-2016, 2018, 2020 Free Software
Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Author: Thomas Baumann <thomas.baumann@ch.tum.de>
;; Created: 2003-12-20
@@ -65,7 +65,7 @@
(TeX-add-style-hook
"beamer"
(lambda ()
- (add-hook 'LaTeX-after-insert-env-hook 'LaTeX-beamer-after-insert-env nil t)
+ (add-hook 'LaTeX-after-insert-env-hook #'LaTeX-beamer-after-insert-env nil
t)
(TeX-run-style-hooks "amsmath" "amssymb" "amsthm" "color" "geometry"
"hyperref" "inputenc" "translator" "xcolor")
@@ -269,7 +269,7 @@ also be a string. Then the length of the string is used."
(TeX-argument-insert
(completing-read
(TeX-argument-prompt nil nil "Theme")
- (mapcar 'list
+ (mapcar #'list
(cond ((eq LaTeX-beamer-themes 'local)
(set (make-local-variable 'LaTeX-beamer-themes)
(LaTeX-beamer-search-themes)))
@@ -288,7 +288,7 @@ also be a string. Then the length of the string is used."
(TeX-argument-insert
(completing-read
(TeX-argument-prompt nil nil "Theme")
- (mapcar 'list
+ (mapcar #'list
(cond ((eq LaTeX-beamer-inner-themes 'local)
(set (make-local-variable 'LaTeX-beamer-inner-themes)
(LaTeX-beamer-search-themes "^beamerinnertheme")))
@@ -307,7 +307,7 @@ also be a string. Then the length of the string is used."
(TeX-argument-insert
(completing-read
(TeX-argument-prompt nil nil "Theme")
- (mapcar 'list
+ (mapcar #'list
(cond ((eq LaTeX-beamer-outer-themes 'local)
(set (make-local-variable 'LaTeX-beamer-outer-themes)
(LaTeX-beamer-search-themes "^beameroutertheme")))
@@ -326,7 +326,7 @@ also be a string. Then the length of the string is used."
(TeX-argument-insert
(completing-read
(TeX-argument-prompt nil nil "Theme")
- (mapcar 'list
+ (mapcar #'list
(cond ((eq LaTeX-beamer-color-themes 'local)
(set (make-local-variable 'LaTeX-beamer-color-themes)
(LaTeX-beamer-search-themes "^beamercolortheme")))
@@ -345,7 +345,7 @@ also be a string. Then the length of the string is used."
(TeX-argument-insert
(completing-read
(TeX-argument-prompt nil nil "Theme")
- (mapcar 'list
+ (mapcar #'list
(cond ((eq LaTeX-beamer-font-themes 'local)
(set (make-local-variable 'LaTeX-beamer-font-themes)
(LaTeX-beamer-search-themes "^beamerfonttheme")))
diff --git a/style/biblatex.el b/style/biblatex.el
index 10e76ec..e92f186 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -1,6 +1,6 @@
;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.8a. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2012-2014, 2016, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -169,13 +169,13 @@ string."
inputs 'biberinputs)
(message "Searching for BibLaTeX files...")
(or (symbol-value files)
- (set files (mapcar 'list (TeX-search-files-by-type
- 'biberinputs 'global t nil))))
+ (set files (mapcar #'list (TeX-search-files-by-type
+ 'biberinputs 'global t nil))))
(message "Searching for BibLaTeX files...done")
(setq database (completing-read
(TeX-argument-prompt optional prompt "BibLaTeX files")
- (append (mapcar 'list (TeX-search-files-by-type
- inputs 'local t nil))
+ (append (mapcar #'list (TeX-search-files-by-type
+ inputs 'local t nil))
(symbol-value files))))
(LaTeX-add-bibliographies database)
;; Run style file associated to the bibliography database file in order to
@@ -226,11 +226,11 @@ for citation keys."
(TeX-completing-read-multiple
(TeX-argument-prompt optional prompt "Key(s)")
(LaTeX-bibitem-list))))
- (apply 'LaTeX-add-bibitems items)
+ (apply #'LaTeX-add-bibitems items)
;; If input is empty, insert an empty group only the first time, when
;; `noinsert' flag is nil.
(unless (and (not items) noinsert)
- (TeX-argument-insert (mapconcat 'identity items ",") optional))
+ (TeX-argument-insert (mapconcat #'identity items ",") optional))
(setq noinsert t))))
(defun LaTeX-arg-biblatex-natbib-notes (optional)
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 8b0ccd7..035d4ec 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,6 +1,6 @@
;;; dinbrief.el --- Special code for LaTeX-Style dinbrief. -*-
lexical-binding: t; -*-
-;; Copyright (C) 1994, 2013, 2014, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; Author: Werner Fink <werner@suse.de>
;; Maintainer: auctex-devel@gnu.org
@@ -38,7 +38,7 @@
"dinbrief"
(lambda ()
(add-hook 'LaTeX-document-style-hook
- 'LaTeX-dinbrief-style)
+ #'LaTeX-dinbrief-style)
(LaTeX-add-environments
'("letter" LaTeX-dinbrief-env-recipient)
"dinquote")
diff --git a/style/dk-bib.el b/style/dk-bib.el
index 9af5445..21422a5 100644
--- a/style/dk-bib.el
+++ b/style/dk-bib.el
@@ -1,6 +1,6 @@
;;; dk-bib.el --- AUCTeX style for `dk-bib.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Arne Jørgensen <arne@arnested.dk>
;; Keywords: tex
@@ -33,7 +33,7 @@
(defun LaTeX-dk-bib-package-options nil
"Prompt for package options for the dk-bib package."
(let ((options
- (mapconcat 'identity
+ (mapconcat #'identity
(TeX-completing-read-multiple
"Options: "
'(("isbn") ("issn") ("url") ("annote")
diff --git a/style/doc.el b/style/doc.el
index 48e2714..bcdfeef 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -1,6 +1,6 @@
;;; doc.el --- AUCTeX style for `doc.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2004, 2008, 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Frank Küster <frank@kuesterei.ch>
;; Maintainer: auctex-devel@gnu.org
@@ -72,7 +72,7 @@
'("macrocode*" current-indentation) t)
(add-to-list 'LaTeX-indent-environment-list
'("macro" current-indentation) t)
- (add-hook 'LaTeX-after-insert-env-hook 'LaTeX-doc-after-insert-macrocode
+ (add-hook 'LaTeX-after-insert-env-hook #'LaTeX-doc-after-insert-macrocode
nil t)
(LaTeX-add-environments
"theglossary"
diff --git a/style/foils.el b/style/foils.el
index e87c26b..b53b532 100644
--- a/style/foils.el
+++ b/style/foils.el
@@ -1,6 +1,6 @@
;;; foils.el - Special code for FoilTeX. -*- lexical-binding: t; -*-
-;; Copyright (C) 1994-2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: auctex-devel@gnu.org
@@ -30,7 +30,7 @@
(TeX-add-style-hook "foils"
(function
(lambda ()
- (add-hook 'LaTeX-document-style-hook 'LaTeX-style-foils)
+ (add-hook 'LaTeX-document-style-hook #'LaTeX-style-foils)
(setq LaTeX-default-style "foils")
(setq LaTeX-default-options '("landscape"))
(TeX-add-symbols
diff --git a/style/fontenc.el b/style/fontenc.el
index 69d20fd..0fe194b 100644
--- a/style/fontenc.el
+++ b/style/fontenc.el
@@ -1,6 +1,6 @@
;;; fontenc.el --- AUCTeX style for `fontenc.sty' (v1.99g) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -46,7 +46,7 @@
(defun LaTeX-fontenc-package-options ()
"Prompt for package options for the fontenc package."
- (mapconcat 'identity
+ (mapconcat #'identity
(TeX-completing-read-multiple
"Encoding(s): "
LaTeX-fontenc-package-options-list) ","))
diff --git a/style/inputenc.el b/style/inputenc.el
index c04d477..14ff61c 100644
--- a/style/inputenc.el
+++ b/style/inputenc.el
@@ -1,6 +1,6 @@
;;; inputenc.el --- AUCTeX style for `inputenc.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2005, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Arne Jørgensen <arne@arnested.dk>
;; Keywords: tex
@@ -44,7 +44,7 @@
(if default
(format "Input encoding (default %s): "
default)
"Input encoding: ")
- (mapcar 'car latex-inputenc-coding-alist)
+ (mapcar #'car latex-inputenc-coding-alist)
nil
nil
nil
diff --git a/style/jurabib.el b/style/jurabib.el
index e9d4868..dc01954 100644
--- a/style/jurabib.el
+++ b/style/jurabib.el
@@ -1,6 +1,6 @@
;;; jurabib.el --- AUCTeX style for the `jurabib' package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2004, 2007, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: auctex-devel@gnu.org
@@ -62,7 +62,7 @@
("footciteauthor" . 2) ("footciteyear" . 2))))
;; Add these symbols
(apply
- 'TeX-add-symbols
+ #'TeX-add-symbols
(mapcar
(lambda (cmd)
(cond
diff --git a/style/kpfonts.el b/style/kpfonts.el
index e789ce8..6e0b4ef 100644
--- a/style/kpfonts.el
+++ b/style/kpfonts.el
@@ -1,6 +1,6 @@
;;; kpfonts.el --- AUCTeX style for `kpfonts.sty' version 3.31. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <mose@gnu.org>
@@ -498,7 +498,7 @@ the sequence by initializing this variable.")
(cdr parent)))))))))
;; Make the kpfonts prefix char available if it has not been used as a
prefix.
(unless (lookup-key map (LaTeX-kpfonts-abbrev-prefix))
- (define-key map (LaTeX-kpfonts-abbrev-prefix) 'self-insert-command)))
+ (define-key map (LaTeX-kpfonts-abbrev-prefix) #'self-insert-command)))
(define-minor-mode LaTeX-kpfonts-mode
"A minor mode with easy access to kpfonts macros.
diff --git a/style/latexinfo.el b/style/latexinfo.el
index 0232399..3796967 100644
--- a/style/latexinfo.el
+++ b/style/latexinfo.el
@@ -1,6 +1,6 @@
;;; latexinfo.el - Support for LaTeXinfo files. -*- lexical-binding: t; -*-
-;; Copyright (C) 1993, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
;; Author: Marc Gemis <makke@wins.uia.ac.be>
@@ -41,12 +41,12 @@ We ignore next, previous and up fields.")
(if LaTeXinfo-mode-map
()
(setq LaTeXinfo-mode-map (make-sparse-keymap))
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-b" 'latexinfo-format-buffer)
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-r" 'latexinfo-format-region)
- (define-key LaTeXinfo-mode-map "\C-c\C-u\C-s" 'latexinfo-show-structure)
- (define-key LaTeXinfo-mode-map "\C-c\C-ud" 'makke:latexinfo-delete-structure)
- (define-key LaTeXinfo-mode-map "\C-c\C-ug" 'latexinfo-goto-node)
- (define-key LaTeXinfo-mode-map "\C-c\C-ui" 'makke:latexinfo-structure))
+ (define-key LaTeXinfo-mode-map "\C-c\C-u\C-b" #'latexinfo-format-buffer)
+ (define-key LaTeXinfo-mode-map "\C-c\C-u\C-r" #'latexinfo-format-region)
+ (define-key LaTeXinfo-mode-map "\C-c\C-u\C-s" #'latexinfo-show-structure)
+ (define-key LaTeXinfo-mode-map "\C-c\C-ud"
#'makke:latexinfo-delete-structure)
+ (define-key LaTeXinfo-mode-map "\C-c\C-ug" #'latexinfo-goto-node)
+ (define-key LaTeXinfo-mode-map "\C-c\C-ui" #'makke:latexinfo-structure))
(or (assq 'LaTeXinfo-mode minor-mode-map-alist)
(setq minor-mode-map-alist
diff --git a/style/ntheorem.el b/style/ntheorem.el
index c0ea12c..4c57623 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -1,6 +1,6 @@
;;; ntheorem.el --- AUCTeX style for `ntheorem.sty' (v1.33) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -140,7 +140,7 @@ RefTeX users should customize or add ENVIRONMENT to
make them available as new environments. Update
`LaTeX-ntheorem-theoremstyle-list' with styles defined with
\"\\newtheoremstyle\"."
- (dolist (newthm (mapcar 'car (LaTeX-ntheorem-newtheorem-list)))
+ (dolist (newthm (mapcar #'car (LaTeX-ntheorem-newtheorem-list)))
(LaTeX-add-environments (list newthm 'LaTeX-ntheorem-env-label))
(LaTeX-add-environments (list (concat newthm "*")
'LaTeX-ntheorem-env-label)))
@@ -151,9 +151,9 @@ make them available as new environments. Update
(add-to-list (make-local-variable 'LaTeX-ntheorem-listtype-list)
newthmlist))
(when (LaTeX-provided-package-options-member "ntheorem" "thmmarks")
- (dolist (nthm (mapcar 'car (LaTeX-ntheorem-newtheorem-list)))
+ (dolist (nthm (mapcar #'car (LaTeX-ntheorem-newtheorem-list)))
(TeX-add-symbols (concat nthm "Symbol"))))
- (dolist (nthm (mapcar 'car (LaTeX-ntheorem-newtheorem-list)))
+ (dolist (nthm (mapcar #'car (LaTeX-ntheorem-newtheorem-list)))
(TeX-add-symbols (concat nthm "name"))))
(add-hook 'TeX-auto-prepare-hook #'LaTeX-ntheorem-auto-prepare t)
@@ -391,13 +391,13 @@ make them available as new environments. Update
;; 2.6 Setting End Marks
;; ... the endmark can manually be set by just saying \<name>Symbol.
(when (LaTeX-provided-package-options-member "ntheorem" "thmmarks")
- (dolist (nthm (mapcar 'car (LaTeX-ntheorem-newtheorem-list)))
+ (dolist (nthm (mapcar #'car (LaTeX-ntheorem-newtheorem-list)))
(TeX-add-symbols (concat nthm "Symbol"))))
;; 2.8 Miscellaneous
;; Inside a theorem-like environment <env>, the name given as
;; optional argument is accessible by \<env>name
- (dolist (nthm (mapcar 'car (LaTeX-ntheorem-newtheorem-list)))
+ (dolist (nthm (mapcar #'car (LaTeX-ntheorem-newtheorem-list)))
(TeX-add-symbols (concat nthm "name")))
;; Fontification
diff --git a/style/pdfsync.el b/style/pdfsync.el
index a6a9ab1..122f0eb 100644
--- a/style/pdfsync.el
+++ b/style/pdfsync.el
@@ -1,6 +1,6 @@
;;; pdfsync.el --- AUCTeX style for `pdfsync.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2008, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: auctex-devel@gnu.org
@@ -86,7 +86,7 @@
(TeX-add-style-hook
"pdfsync"
(lambda ()
- (setq TeX-source-correlate-output-page-function 'LaTeX-pdfsync-output-page))
+ (setq TeX-source-correlate-output-page-function
#'LaTeX-pdfsync-output-page))
TeX-dialect)
;;; pdfsync.el ends here
diff --git a/style/polyglossia.el b/style/polyglossia.el
index 36ec765..f17eeab 100644
--- a/style/polyglossia.el
+++ b/style/polyglossia.el
@@ -1,6 +1,6 @@
;;; polyglossia.el --- AUCTeX style for `polyglossia.sty' version 1.42.0. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <mose@gnu.org>
@@ -173,8 +173,8 @@ second mandatory argument."
;; mechanism to identify the default polyglossia language.
(let ((language (funcall
(if multiple
- 'TeX-completing-read-multiple
- 'completing-read)
+ #'TeX-completing-read-multiple
+ #'completing-read)
(if multiple "Languages: " "Language: ")
(if setkeys
(LaTeX-polyglossia-active-languages)
@@ -201,7 +201,7 @@ second mandatory argument."
(TeX-arg-closing-brace LaTeX-optcl))
(TeX-argument-insert options t)))
(if multiple
- (setq language (mapconcat 'identity language ",")))
+ (setq language (mapconcat #'identity language ",")))
(TeX-argument-insert language nil)
(if setkeys
(TeX-argument-insert options nil))))
diff --git a/style/prosper.el b/style/prosper.el
index ca59500..98c1298 100644
--- a/style/prosper.el
+++ b/style/prosper.el
@@ -1,6 +1,6 @@
;;; prosper.el --- Prosper style file for AUCTeX -*- lexical-binding: t; -*-
-;; Copyright (C) 2001, 2002, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
;; Authors: Phillip Lord<p.lord@russet.org.uk>
;; Nevin Kapur <nevin@jhu.edu>
@@ -103,7 +103,7 @@
(TeX-argument-prompt nil
(format "Transition (Default %s) " default)
t)
- (mapcar 'list LaTeX-prosper-transition-styles)
+ (mapcar #'list LaTeX-prosper-transition-styles)
nil
t
nil
diff --git a/style/pst-node.el b/style/pst-node.el
index 183ecd0..86a87e4 100644
--- a/style/pst-node.el
+++ b/style/pst-node.el
@@ -1,6 +1,6 @@
;;; pst-node.el --- AUCTeX style for `pst-node.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2007, 2013, 2014, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2021 Free Software Foundation, Inc.
;; Author: Holger Sparr <holger.sparr@gmx.net>
;; Created: 21 Jun 2007
@@ -49,7 +49,7 @@
(declare-function LaTeX-pst-point "pstricks" ())
(declare-function LaTeX-pst-arrows "pstricks" ())
-(defalias 'LaTeX-pst-node 'LaTeX-pst-point)
+(defalias 'LaTeX-pst-node #'LaTeX-pst-point)
(defvar LaTeX-pstnode-parameters-completion-regexp
"\\(npos\\|nrot\\)"
diff --git a/style/pstricks.el b/style/pstricks.el
index 3e41d64..ec24550 100644
--- a/style/pstricks.el
+++ b/style/pstricks.el
@@ -1,7 +1,6 @@
;;; pstricks.el --- AUCTeX style for the `pstricks' package. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2007, 2009, 2013-2015, 2018, 2020
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2007-2021 Free Software Foundation, Inc.
;; Author: Holger Sparr <holger.sparr@gmx.net>
;; Maintainer: auctex-devel@gnu.org
@@ -79,10 +78,10 @@
(crm-separator (nth 4 first))
res)
(setq list (cdr list))
- (cond ((eq func 'completing-read-multiple)
+ (cond ((eq func #'completing-read-multiple)
(setq res (funcall func prompt list nil compl nil hist))
- (mapconcat 'identity res crm-separator))
- ((eq func 'completing-read)
+ (mapconcat #'identity res crm-separator))
+ ((eq func #'completing-read)
(setq res
(funcall func prompt list nil compl nil hist)))))
(completing-read (concat prompt ": ") list nil nil nil hist))))
@@ -789,7 +788,7 @@ comma separated list. Point has to be within the sexp to
modify."
;; takes dvips+ps2pdf route when `TeX-PDF-mode' is enabled.
;; (TeX-PDF-mode-off)
(setq TeX-PDF-from-DVI "Dvips"))
- (mapc 'TeX-auto-add-regexp LaTeX-auto-pstricks-regexp-list)
+ (mapc #'TeX-auto-add-regexp LaTeX-auto-pstricks-regexp-list)
(LaTeX-add-environments
'("pspicture" LaTeX-pst-env-pspicture)
"overlaybox" "psclip")
diff --git a/style/siunitx.el b/style/siunitx.el
index b7a2acd..e67e817 100644
--- a/style/siunitx.el
+++ b/style/siunitx.el
@@ -1,6 +1,6 @@
;;; siunitx.el --- AUCTeX style for `siunitx.sty' version 2.5s. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2012-2015, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <giordano.mose@libero.it>
@@ -88,7 +88,7 @@ PREFIX is non-nil, insert it before the given input."
(remove (assoc 32 minibuffer-local-completion-map)
minibuffer-local-completion-map))
(crm-separator (regexp-quote TeX-esc))
- (unit (mapconcat 'identity
+ (unit (mapconcat #'identity
(TeX-completing-read-multiple
(TeX-argument-prompt optional prompt "Unit: " t)
(LaTeX-siunitx-unit-list) nil nil initial-input
diff --git a/style/theorem.el b/style/theorem.el
index 65712b8..4c3547b 100644
--- a/style/theorem.el
+++ b/style/theorem.el
@@ -1,6 +1,6 @@
;;; theorem.el --- AUCTeX style for `theorem.sty' (v2.2c) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
;; Author: Arash Esbati <arash@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -72,7 +72,7 @@ argument. Use PROMPT as the prompt string."
;; `INITIAL-INPUT' (5th argument to `TeX-completing-read-multiple')
;; is hard-coded to `TeX-esc'.
(let* ((crm-separator (regexp-quote TeX-esc))
- (fontdecl (mapconcat 'identity
+ (fontdecl (mapconcat #'identity
(TeX-completing-read-multiple
(TeX-argument-prompt optional prompt "Font")
LaTeX-theorem-fontdecl nil nil TeX-esc)
@@ -113,7 +113,7 @@ RefTeX users should customize or add ENVIRONMENT to
(defun LaTeX-theorem-auto-cleanup ()
"Move parsed results from `LaTeX-auto-theorem-newtheorem' and
make them available as new environments."
- (dolist (newthm (mapcar 'car (LaTeX-theorem-newtheorem-list)))
+ (dolist (newthm (mapcar #'car (LaTeX-theorem-newtheorem-list)))
(LaTeX-add-environments (list newthm 'LaTeX-theorem-env-label))))
(add-hook 'TeX-auto-prepare-hook #'LaTeX-theorem-auto-prepare t)
diff --git a/style/ulem.el b/style/ulem.el
index e9a7d3e..7db5716 100644
--- a/style/ulem.el
+++ b/style/ulem.el
@@ -1,6 +1,6 @@
;;; ulem.el --- AUCTeX style for `ulem.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2012, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
;; Author: Mads Jensen <mje@inducks.org>
;; Keywords: tex
@@ -101,7 +101,7 @@
"Prompt for underline command used in \\useunder"
(TeX-argument-insert
(completing-read (TeX-argument-prompt optional prompt "Underline command")
- (mapcar 'list
+ (mapcar #'list
(mapcar (lambda (str) (concat "\\" str))
'("uline" "uuline"
"uwave" "sout" "xout")))
diff --git a/tex-bar.el b/tex-bar.el
index 4f90384..72fe1dc 100644
--- a/tex-bar.el
+++ b/tex-bar.el
@@ -1,6 +1,6 @@
;;; tex-bar.el --- toolbar icons on AUCTeX in GNU emacs. -*- lexical-binding:
t; -*-
-;; Copyright (C) 2004-2008, 2012-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -214,7 +214,7 @@ format of the argument MEANING-ALIST in the mentioned
function."
(require 'toolbar-x)
(add-to-list 'toolbarx-image-path
(expand-file-name "images" TeX-data-directory))
- (add-hook 'TeX-PDF-mode-hook 'toolbarx-refresh nil t)
+ (add-hook 'TeX-PDF-mode-hook #'toolbarx-refresh nil t)
(toolbarx-install-toolbar TeX-bar-TeX-buttons
(let ((append-list))
(dolist (elt TeX-bar-TeX-all-button-alists)
@@ -359,11 +359,11 @@ format of the argument MEANING-ALIST in the mentioned
function."
(require 'toolbar-x)
(add-to-list 'toolbarx-image-path
(expand-file-name "images" TeX-data-directory))
- (add-hook 'TeX-PDF-mode-hook 'toolbarx-refresh nil t)
+ (add-hook 'TeX-PDF-mode-hook #'toolbarx-refresh nil t)
;; Refresh the toolbar after styles update because `LaTeX-using-Biber' value
;; could have been changed. Append the refresh to the hook so it is run
after
;; the other styles-related changes.
- (add-hook 'TeX-update-style-hook 'toolbarx-refresh t t)
+ (add-hook 'TeX-update-style-hook #'toolbarx-refresh t t)
(toolbarx-install-toolbar TeX-bar-LaTeX-buttons
(let ((append-list))
(dolist (elt TeX-bar-LaTeX-all-button-alists)
diff --git a/tex-buf.el b/tex-buf.el
index 419abf8..74fbf2b 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -1,6 +1,6 @@
;;; tex-buf.el --- External commands for AUCTeX. -*- lexical-binding: t; -*-
-;; Copyright (C) 1991-1999, 2001-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Keywords: tex, wp
@@ -1206,7 +1206,7 @@ run of `TeX-run-TeX', use
;; backward compatibilty
-(defalias 'TeX-run-LaTeX 'TeX-run-TeX)
+(defalias 'TeX-run-LaTeX #'TeX-run-TeX)
(defun TeX-run-BibTeX (name command file)
@@ -1312,7 +1312,7 @@ With support for MS-DOS, especially when dviout is used
with PC-9801 series."
TeX-shell-command-option command)
(if (eq system-type 'ms-dos)
(redraw-display)))
-(defalias 'TeX-run-dviout 'TeX-run-discard-foreground)
+(defalias 'TeX-run-dviout #'TeX-run-discard-foreground)
(defun TeX-run-background (name command _file)
"Start process with second argument, show output when and if it arrives."
@@ -3711,15 +3711,15 @@ forward, if negative)."
(defvar TeX-error-overview-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map "b" 'TeX-error-overview-toggle-debug-bad-boxes)
- (define-key map "j" 'TeX-error-overview-jump-to-source)
- (define-key map "l" 'TeX-error-overview-goto-log)
- (define-key map "n" 'TeX-error-overview-next-error)
- (define-key map "p" 'TeX-error-overview-previous-error)
- (define-key map "q" 'TeX-error-overview-quit)
- (define-key map "w" 'TeX-error-overview-toggle-debug-warnings)
- (define-key map "x"
'TeX-error-overview-toggle-suppress-ignored-warnings)
- (define-key map "\C-m" 'TeX-error-overview-goto-source)
+ (define-key map "b" #'TeX-error-overview-toggle-debug-bad-boxes)
+ (define-key map "j" #'TeX-error-overview-jump-to-source)
+ (define-key map "l" #'TeX-error-overview-goto-log)
+ (define-key map "n" #'TeX-error-overview-next-error)
+ (define-key map "p" #'TeX-error-overview-previous-error)
+ (define-key map "q" #'TeX-error-overview-quit)
+ (define-key map "w" #'TeX-error-overview-toggle-debug-warnings)
+ (define-key map "x"
#'TeX-error-overview-toggle-suppress-ignored-warnings)
+ (define-key map "\C-m" #'TeX-error-overview-goto-source)
map)
"Local keymap for `TeX-error-overview-mode' buffers.")
@@ -3866,10 +3866,10 @@ warnings and bad boxes"
(defvar TeX-output-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map TeX-special-mode-map)
- (define-key map "n" 'TeX-next-error)
- (define-key map "p" 'TeX-previous-error)
- (define-key map "b" 'TeX-toggle-debug-bad-boxes)
- (define-key map "w" 'TeX-toggle-debug-warnings)
+ (define-key map "n" #'TeX-next-error)
+ (define-key map "p" #'TeX-previous-error)
+ (define-key map "b" #'TeX-toggle-debug-bad-boxes)
+ (define-key map "w" #'TeX-toggle-debug-warnings)
(define-key map "i" (lambda ()
(interactive)
(with-current-buffer TeX-command-buffer
diff --git a/tex-fold.el b/tex-fold.el
index a281a32..c91e523 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -1,7 +1,6 @@
;;; tex-fold.el --- Fold TeX macros.
-;; Copyright (C) 2004-2008, 2011-2012, 2014, 2017, 2018
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -257,17 +256,17 @@ After that, changing the prefix key requires manipulating
keymaps."
(defvar TeX-fold-keymap
(let ((map (make-sparse-keymap)))
- (define-key map "\C-o" 'TeX-fold-dwim)
- (define-key map "\C-b" 'TeX-fold-buffer)
- (define-key map "\C-r" 'TeX-fold-region)
- (define-key map "\C-p" 'TeX-fold-paragraph)
- (define-key map "\C-m" 'TeX-fold-macro)
- (define-key map "\C-e" 'TeX-fold-env)
- (define-key map "\C-c" 'TeX-fold-comment)
- (define-key map "b" 'TeX-fold-clearout-buffer)
- (define-key map "r" 'TeX-fold-clearout-region)
- (define-key map "p" 'TeX-fold-clearout-paragraph)
- (define-key map "i" 'TeX-fold-clearout-item)
+ (define-key map "\C-o" #'TeX-fold-dwim)
+ (define-key map "\C-b" #'TeX-fold-buffer)
+ (define-key map "\C-r" #'TeX-fold-region)
+ (define-key map "\C-p" #'TeX-fold-paragraph)
+ (define-key map "\C-m" #'TeX-fold-macro)
+ (define-key map "\C-e" #'TeX-fold-env)
+ (define-key map "\C-c" #'TeX-fold-comment)
+ (define-key map "b" #'TeX-fold-clearout-buffer)
+ (define-key map "r" #'TeX-fold-clearout-region)
+ (define-key map "p" #'TeX-fold-clearout-paragraph)
+ (define-key map "i" #'TeX-fold-clearout-item)
map))
@@ -858,7 +857,7 @@ Remove the respective properties from the overlay OV."
(not (eq (window-buffer (car x))
(current-buffer)))))
TeX-fold-open-spots))
- (old-ols (mapcar 'cdr (car spots))))
+ (old-ols (mapcar #'cdr (car spots))))
(setq TeX-fold-open-spots (cdr spots))
(when (or (and (boundp 'disable-point-adjustment)
disable-point-adjustment)
@@ -921,8 +920,8 @@ With zero or negative ARG turn mode off."
(if TeX-fold-mode
(progn
(set (make-local-variable 'search-invisible) t)
- (add-hook 'post-command-hook 'TeX-fold-post-command nil t)
- (add-hook 'LaTeX-fill-newline-hook 'TeX-fold-update-at-point nil t)
+ (add-hook 'post-command-hook #'TeX-fold-post-command nil t)
+ (add-hook 'LaTeX-fill-newline-hook #'TeX-fold-update-at-point nil t)
(add-hook 'TeX-after-insert-macro-hook
(lambda ()
(when (and TeX-fold-mode TeX-fold-auto)
@@ -943,13 +942,13 @@ With zero or negative ARG turn mode off."
(when (boundp symbol)
(symbol-value symbol)))))))
(kill-local-variable 'search-invisible)
- (remove-hook 'post-command-hook 'TeX-fold-post-command t)
- (remove-hook 'LaTeX-fill-newline-hook 'TeX-fold-update-at-point t)
+ (remove-hook 'post-command-hook #'TeX-fold-post-command t)
+ (remove-hook 'LaTeX-fill-newline-hook #'TeX-fold-update-at-point t)
(TeX-fold-clearout-buffer))
(TeX-set-mode-name))
;;;###autoload
-(defalias 'tex-fold-mode 'TeX-fold-mode)
+(defalias 'tex-fold-mode #'TeX-fold-mode)
(provide 'tex-fold)
diff --git a/tex-info.el b/tex-info.el
index c9810d2..a695909 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -1,7 +1,6 @@
;;; tex-info.el --- Support for editing Texinfo source.
-;; Copyright (C) 1993, 1994, 1997, 2000, 2001, 2004, 2005, 2006,
-;; 2011-2015, 2017-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Keywords: tex
@@ -52,7 +51,7 @@
(defconst texinfo-environment-regexp
;; Overwrite version from `texinfo.el'.
(concat "^@\\("
- (mapconcat 'car Texinfo-environment-list "\\|")
+ (mapconcat #'car Texinfo-environment-list "\\|")
"\\|end\\)\\>")
"Regexp for environment-like Texinfo list commands.
Subexpression 1 is what goes into the corresponding `@end' statement.")
@@ -106,7 +105,7 @@ With optional ARG, modify current environment."
(defun Texinfo-find-env-end ()
"Move point to the end of the current environment."
(interactive)
- (let* ((envs (mapcar 'car Texinfo-environment-list))
+ (let* ((envs (mapcar #'car Texinfo-environment-list))
(regexp (concat "^[ \t]*" (regexp-quote TeX-esc) "\\(end \\)*"
(regexp-opt envs t) "\\b"))
(orig-pos (point))
@@ -133,7 +132,7 @@ With optional ARG, modify current environment."
(defun Texinfo-find-env-start ()
"Move point to the start of the current environment."
(interactive)
- (let* ((envs (mapcar 'car Texinfo-environment-list))
+ (let* ((envs (mapcar #'car Texinfo-environment-list))
(regexp (concat "^[ \t]*\\(" (regexp-quote TeX-esc) "\\)\\(end \\)*"
(regexp-opt envs t) "\\b"))
(level 1)
@@ -304,7 +303,7 @@ character. Return the resulting string."
commands. Return the resulting string."
(let* ((pos 0)
(map '(("," . "comma")))
- (re (regexp-opt (mapcar 'car map))) )
+ (re (regexp-opt (mapcar #'car map))) )
(while (and (< pos (length node-name)) (string-match re node-name pos))
(setq node-name (concat (substring node-name 0 (match-beginning 0))
"@" (cdr (assoc-string (match-string 0
node-name) map))
@@ -509,22 +508,22 @@ is assumed by default."
;; From texinfo.el
;; bindings for updating nodes and menus
- (define-key map "\C-c\C-um" 'texinfo-master-menu)
- (define-key map "\C-c\C-u\C-m" 'texinfo-make-menu)
- (define-key map "\C-c\C-u\C-n" 'texinfo-update-node)
- (define-key map "\C-c\C-u\C-e" 'texinfo-every-node-update)
- (define-key map "\C-c\C-u\C-a" 'texinfo-all-menus-update)
+ (define-key map "\C-c\C-um" #'texinfo-master-menu)
+ (define-key map "\C-c\C-u\C-m" #'texinfo-make-menu)
+ (define-key map "\C-c\C-u\C-n" #'texinfo-update-node)
+ (define-key map "\C-c\C-u\C-e" #'texinfo-every-node-update)
+ (define-key map "\C-c\C-u\C-a" #'texinfo-all-menus-update)
;; Simulating LaTeX-mode
- (define-key map "\C-c\C-e" 'Texinfo-environment)
- (define-key map "\C-c." 'Texinfo-mark-environment)
- (define-key map "\C-c*" 'Texinfo-mark-section)
- (define-key map "\M-\C-h" 'Texinfo-mark-node)
- (define-key map "\C-c\n" 'texinfo-insert-@item)
+ (define-key map "\C-c\C-e" #'Texinfo-environment)
+ (define-key map "\C-c." #'Texinfo-mark-environment)
+ (define-key map "\C-c*" #'Texinfo-mark-section)
+ (define-key map "\M-\C-h" #'Texinfo-mark-node)
+ (define-key map "\C-c\n" #'texinfo-insert-@item)
(or (key-binding "\e\r")
- (define-key map "\e\r" 'texinfo-insert-@item)) ;*** Alias
- (define-key map "\C-c\C-s" 'Texinfo-insert-node)
- (define-key map "\C-c]" 'texinfo-insert-@end)
+ (define-key map "\e\r" #'texinfo-insert-@item)) ;*** Alias
+ (define-key map "\C-c\C-s" #'Texinfo-insert-node)
+ (define-key map "\C-c]" #'texinfo-insert-@end)
;; Override some bindings in `TeX-mode-map'
;; FIXME: Inside @math{}, you can use all plain TeX math commands
@@ -622,7 +621,7 @@ is assumed by default."
;;; Mode:
;;;###autoload
-(defalias 'Texinfo-mode 'texinfo-mode)
+(defalias 'Texinfo-mode #'texinfo-mode)
(defvar TeX-sentinel-default-function) ;; Defined in tex-buf.el.
@@ -639,7 +638,7 @@ value of `Texinfo-mode-hook'."
(kill-all-local-variables)
(setq TeX-mode-p t)
(setq TeX-output-extension (if TeX-PDF-mode "pdf" "dvi"))
- (setq TeX-sentinel-default-function 'TeX-TeX-sentinel)
+ (setq TeX-sentinel-default-function #'TeX-TeX-sentinel)
;; Mostly stolen from texinfo.el
(setq TeX-base-mode-name "Texinfo")
(setq major-mode 'texinfo-mode)
@@ -673,7 +672,7 @@ value of `Texinfo-mode-hook'."
;; Outline settings.
(set (make-local-variable 'outline-regexp)
(concat "@\\("
- (mapconcat 'car texinfo-section-list "\\>\\|")
+ (mapconcat #'car texinfo-section-list "\\>\\|")
"\\>\\)"))
(set (make-local-variable 'outline-level) 'texinfo-outline-level)
@@ -696,7 +695,8 @@ value of `Texinfo-mode-hook'."
(list "" TeX-complete-word)))
(set (make-local-variable 'TeX-font-list) Texinfo-font-list)
- (set (make-local-variable 'TeX-font-replace-function)
'TeX-font-replace-macro)
+ (set (make-local-variable 'TeX-font-replace-function)
+ #'TeX-font-replace-macro)
(set (make-local-variable 'TeX-style-hook-dialect) :texinfo)
(add-hook 'find-file-hook (lambda ()
@@ -853,7 +853,7 @@ value of `Texinfo-mode-hook'."
'("xref" (Texinfo-arg-nodename "Node name")))
;; RefTeX plugging
- (add-hook 'reftex-mode-hook 'Texinfo-reftex-hook)
+ (add-hook 'reftex-mode-hook #'Texinfo-reftex-hook)
(if (and (boundp 'reftex-mode) reftex-mode)
(Texinfo-reftex-hook))
diff --git a/tex-site.el.in b/tex-site.el.in
index cd3cdb7..b5d4d97 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -1,6 +1,6 @@
;;; tex-site.el - Site specific variables. Don't edit.
-;; Copyright (C) 2005, 2013, 2016-2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;;
;; completely rewritten.
@@ -91,7 +91,7 @@ shared by all users of a site."
(doctex-mode . tex-mode))
"Alist of built-in TeX modes and their load files.")
-(defalias 'TeX-load-hack 'ignore)
+(defalias 'TeX-load-hack #'ignore)
(add-hook 'tex-site-unload-hook
(lambda ()
@@ -166,5 +166,5 @@ If not a regular release, the date of the last change.")
"AUCTeX release date using the ISO 8601 format, yyyy-mm-dd.")
;; Store bibitems when saving a BibTeX buffer
-(add-hook 'bibtex-mode-hook 'BibTeX-auto-store)
+(add-hook 'bibtex-mode-hook #'BibTeX-auto-store)
diff --git a/tex-style.el b/tex-style.el
index 182dae4..85e891a 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -1,6 +1,6 @@
;;; tex-style.el --- Customizable variables for AUCTeX style files
-;; Copyright (C) 2005, 2007, 2009, 2012-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Reiner Steib <Reiner.Steib@gmx.de>
;; Keywords: tex, wp, convenience
@@ -414,7 +414,7 @@ your document actually defines shortvrb chars using
\\MakeShortVrb."
:group 'LaTeX-style
:type '(repeat character))
-(put 'LaTeX-shortvrb-chars 'safe-local-variable 'listp)
+(put 'LaTeX-shortvrb-chars 'safe-local-variable #'listp)
;; style/splitidx.el
diff --git a/tex-wizard.el b/tex-wizard.el
index 8023e47..5299d32 100644
--- a/tex-wizard.el
+++ b/tex-wizard.el
@@ -1,6 +1,6 @@
;;; tex-wizard.el --- Check the TeX configuration
-;; Copyright (C) 2003, 2006, 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Author: David Kastrup <dak@gnu.org>
;; Keywords: tex, wp, convenience
@@ -76,19 +76,19 @@ and bibliographics references.\n")
(format "Enable RefTeX in `%s'" user-init-file))
(select-window wizwin)
(switch-to-buffer wizbuf))
- (add-hook 'LaTeX-mode-hook 'turn-on-reftex)
- (add-hook 'latex-mode-hook 'turn-on-reftex)
+ (add-hook 'LaTeX-mode-hook #'turn-on-reftex)
+ (add-hook 'latex-mode-hook #'turn-on-reftex)
(condition-case nil
(write-region "\
;;; Enable RefTeX
-\(add-hook 'LaTeX-mode-hook 'turn-on-reftex)
-\(add-hook 'latex-mode-hook 'turn-on-reftex)
+\(add-hook 'LaTeX-mode-hook #'turn-on-reftex)
+\(add-hook 'latex-mode-hook #'turn-on-reftex)
" nil user-init-file t)
(error (insert-before-markers
(format "Unable to write to file `%s'\n" user-init-file))))))
(when (and (featurep 'tex-site)
(boundp 'LaTeX-mode-hook)
- (memq 'turn-on-reftex LaTeX-mode-hook))
+ (memq #'turn-on-reftex LaTeX-mode-hook))
(if (and (boundp 'reftex-plug-into-AUCTeX)
reftex-plug-into-AUCTeX)
(insert-before-markers
diff --git a/tex.el b/tex.el
index d67b9f8..80de134 100644
--- a/tex.el
+++ b/tex.el
@@ -791,7 +791,7 @@ in nil across different emacs versions."
(unwind-protect
(progn
(add-hook 'choose-completion-string-functions
- 'crm--choose-completion-string)
+ #'crm--choose-completion-string)
(let* ((minibuffer-completion-table #'crm--collection-fn)
(minibuffer-completion-predicate predicate)
;; see completing_read in src/minibuf.c
@@ -813,7 +813,7 @@ in nil across different emacs versions."
nil
result)))
(remove-hook 'choose-completion-string-functions
- 'crm--choose-completion-string)))
+ #'crm--choose-completion-string)))
;; For GNU Emacs <= 24.3.
(defun TeX-completing-read-multiple
(prompt table &optional predicate require-match initial-input
@@ -1590,7 +1590,7 @@ It should be one of the following symbols:\n\n"
(TeX-engine-alist))))
(make-variable-buffer-local 'TeX-engine)
(put 'TeX-engine 'safe-local-variable
- (lambda (arg) (memq arg (mapcar 'car TeX-engine-alist-builtin))))
+ (lambda (arg) (memq arg (mapcar #'car TeX-engine-alist-builtin))))
(defun TeX-engine-set (type)
"Set TeX engine to TYPE.
@@ -1614,7 +1614,7 @@ For available TYPEs, see variable `TeX-engine'."
nil nil nil
:group 'TeX-command
(TeX-engine-set (if TeX-Omega-mode 'omega 'default)))
-(defalias 'tex-omega-mode 'TeX-Omega-mode)
+(defalias 'tex-omega-mode #'TeX-Omega-mode)
(make-obsolete 'TeX-Omega-mode 'TeX-engine-set "11.86")
(make-obsolete-variable 'TeX-Omega-mode 'TeX-engine "11.86")
@@ -1748,7 +1748,7 @@ If this is nil, an empty string will be returned."
;; in certain places of the DVI file. WHERE is a
;; comma-separated value list: cr display hbox
;; math par parend vbox
- (concat "=" (mapconcat 'identity
+ (concat "=" (mapconcat #'identity
TeX-source-specials-places ","))))
TeX-synctex-tex-flags)
""))
@@ -1874,9 +1874,9 @@ SyncTeX are recognized."
"SyncSource"
'TeX-source-correlate-sync-source))))
-(defalias 'TeX-source-specials-mode 'TeX-source-correlate-mode)
+(defalias 'TeX-source-specials-mode #'TeX-source-correlate-mode)
(make-obsolete 'TeX-source-specials-mode 'TeX-source-correlate-mode "11.86")
-(defalias 'tex-source-correlate-mode 'TeX-source-correlate-mode)
+(defalias 'tex-source-correlate-mode #'TeX-source-correlate-mode)
(put 'TeX-source-correlate-mode 'safe-local-variable #'booleanp)
(setq minor-mode-map-alist
(delq (assq 'TeX-source-correlate-mode minor-mode-map-alist)
@@ -2017,7 +2017,7 @@ enabled and the `synctex' binary is available."
(defcustom TeX-PDF-mode t nil
:group 'TeX-command
- :set 'TeX-mode-set
+ :set #'TeX-mode-set
:type 'boolean)
(put 'TeX-PDF-mode 'safe-local-variable #'booleanp)
@@ -2045,7 +2045,7 @@ function `TeX-global-PDF-mode' for toggling this value."
(not (default-value 'TeX-PDF-mode))))
(TeX-set-mode-name 'TeX-PDF-mode nil t)))
-(defalias 'tex-pdf-mode 'TeX-PDF-mode)
+(defalias 'tex-pdf-mode #'TeX-PDF-mode)
(defvar TeX-PDF-mode-parsed nil
"Set if `TeX-PDF-mode' has come about by parsing.")
@@ -2136,7 +2136,7 @@ for backward compatibility."
nil nil nil
:group 'TeX-command
(TeX-set-mode-name 'TeX-interactive-mode t t))
-(defalias 'tex-interactive-mode 'TeX-interactive-mode)
+(defalias 'tex-interactive-mode #'TeX-interactive-mode)
(add-to-list 'minor-mode-alist '(TeX-interactive-mode ""))
;;; Commands
@@ -2189,7 +2189,7 @@ Must be the car of an entry in `TeX-command-list'."
(make-variable-buffer-local 'TeX-command-default)
-(put 'TeX-command-default 'safe-local-variable 'stringp)
+(put 'TeX-command-default 'safe-local-variable #'stringp)
(defvar TeX-clean-default-intermediate-suffixes
'("\\.aux" "\\.bbl" "\\.blg" "\\.brf" "\\.fot"
@@ -2257,7 +2257,7 @@ also included in the regexp."
(intern (concat mode-prefix
"-clean-output-suffixes"))))))))
(when suffixes
- (mapconcat 'identity suffixes "\\|"))))
+ (mapconcat #'identity suffixes "\\|"))))
;;; Master File
@@ -2903,15 +2903,15 @@ side effect e.g. on variable `TeX-font-list'.")
(defsubst TeX-shdex-or (&rest args)
"OR operator for style hook dialect expressions."
- (apply 'logior (mapcar 'TeX-shdex-eval args)))
+ (apply #'logior (mapcar #'TeX-shdex-eval args)))
(defsubst TeX-shdex-and (&rest args)
"AND operator for style hook dialect expressions."
- (apply 'logand (mapcar 'TeX-shdex-eval args)))
+ (apply #'logand (mapcar #'TeX-shdex-eval args)))
(defsubst TeX-shdex-nor (&rest args)
"NOR operator for style hook dialect expressions."
- (lognot (apply 'TeX-shdex-or args)))
+ (lognot (apply #'TeX-shdex-or args)))
(defsubst TeX-shdex-not (arg)
"NOT operator for style hook dialect expressions."
@@ -3354,7 +3354,7 @@ is called with \\[universal-argument]."
(defvar TeX-electric-macro-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-completion-map)
- (define-key map " " 'minibuffer-complete-and-exit)
+ (define-key map " " #'minibuffer-complete-and-exit)
map))
(defun TeX-electric-macro ()
@@ -3555,7 +3555,7 @@ See `TeX-parse-macro' for details."
(let ((head (car arg))
(tail (cdr arg)))
(cond ((stringp head)
- (apply 'TeX-arg-string optional arg))
+ (apply #'TeX-arg-string optional arg))
((symbolp head)
(apply head optional tail))
(t (error "Unknown list argument type %s"
@@ -3760,7 +3760,7 @@ The algorithm is as follows:
;; Removed as commenting in (La)TeX is done with one `%' not two
;; (make-local-variable 'comment-add)
;; (setq comment-add 1) ;default to `%%' in comment-region
- (set (make-local-variable 'comment-indent-function) 'TeX-comment-indent)
+ (set (make-local-variable 'comment-indent-function) #'TeX-comment-indent)
(set (make-local-variable 'comment-multi-line) nil)
(make-local-variable 'compile-command)
(unless (boundp 'compile-command)
@@ -3787,7 +3787,7 @@ The algorithm is as follows:
;; we enter TeX mode the first time.
(add-hook 'write-contents-functions #'TeX-safe-auto-write nil t)
- (define-key TeX-mode-map "\C-xng" 'TeX-narrow-to-group)
+ (define-key TeX-mode-map "\C-xng" #'TeX-narrow-to-group)
;; Minor modes
(when TeX-source-correlate-mode
@@ -3888,8 +3888,8 @@ The algorithm is as follows:
;; Sort it
(message "Sorting %s..." name)
(set local
- (sort (mapcar 'TeX-listify (apply 'append (symbol-value local)))
- 'TeX-car-string-lessp))
+ (sort (mapcar #'TeX-listify (apply #'append (symbol-value local)))
+ #'TeX-car-string-lessp))
(message "Sorting %s...done" name)
;; Make it unique
(message "Removing duplicates...")
@@ -3955,7 +3955,7 @@ Generated by `TeX-auto-add-type'.")
"Parse and apply TeX information in the current buffer."
(TeX-auto-parse)
(run-hooks 'TeX-auto-apply-hook)
- (mapcar 'TeX-auto-apply-entry TeX-auto-parser))
+ (mapcar #'TeX-auto-apply-entry TeX-auto-parser))
(defun TeX-auto-apply-entry (entry)
"Apply the information in ENTRY in `TeX-auto-parser'."
@@ -4103,7 +4103,7 @@ If TEX is a directory, generate style files for all files
in the directory."
"Extract information for AUCTeX from current buffer and store it in FILE."
(TeX-auto-parse)
- (if (member nil (mapcar 'TeX-auto-entry-clear-p TeX-auto-parser))
+ (if (member nil (mapcar #'TeX-auto-entry-clear-p TeX-auto-parser))
(let ((style (TeX-strip-extension nil TeX-all-extensions t))
(class-opts (if (boundp 'LaTeX-provided-class-options)
LaTeX-provided-class-options))
@@ -4362,7 +4362,7 @@ functions in `TeX-auto-cleanup-hook' after parsing."
(let ((case-fold-search nil))
- (mapc 'TeX-auto-clear-entry TeX-auto-parser)
+ (mapc #'TeX-auto-clear-entry TeX-auto-parser)
(run-hooks 'TeX-auto-prepare-hook)
(save-excursion
@@ -4398,7 +4398,7 @@ functions in `TeX-auto-cleanup-hook' after parsing."
"Add MATCH to TeX-auto-symbols.
Check for potential LaTeX environments."
(let ((symbol (if (listp match)
- (mapcar 'TeX-match-buffer match)
+ (mapcar #'TeX-match-buffer match)
(TeX-match-buffer match))))
(if (and (stringp symbol)
(string-match "^end\\(.+\\)$" symbol))
@@ -4481,7 +4481,7 @@ If EXTENSIONS is not specified or nil, the value of
(setq extensions TeX-file-extensions))
(let ((regexp (concat "\\.\\("
- (mapconcat 'identity extensions "\\|")
+ (mapconcat #'identity extensions "\\|")
"\\)$"))
(case-fold-search t))
(string-match regexp file)))
@@ -4948,63 +4948,63 @@ Brace insertion is only done if point is in a math
construct and
(defvar TeX-mode-map
(let ((map (make-sparse-keymap)))
;; Standard
- ;; (define-key map "\177" 'backward-delete-char-untabify)
- (define-key map "\C-c}" 'up-list)
- (define-key map "\C-c#" 'TeX-normal-mode)
- (define-key map "\C-c\C-n" 'TeX-normal-mode)
- (define-key map "\C-c?" 'TeX-documentation-texdoc)
- (define-key map "\C-c\C-i" 'TeX-goto-info-page)
- (define-key map "\r" 'TeX-newline)
+ ;; (define-key map "\177" #'backward-delete-char-untabify)
+ (define-key map "\C-c}" #'up-list)
+ (define-key map "\C-c#" #'TeX-normal-mode)
+ (define-key map "\C-c\C-n" #'TeX-normal-mode)
+ (define-key map "\C-c?" #'TeX-documentation-texdoc)
+ (define-key map "\C-c\C-i" #'TeX-goto-info-page)
+ (define-key map "\r" #'TeX-newline)
;; From tex.el
- (define-key map "\"" 'TeX-insert-quote)
- (define-key map "$" 'TeX-insert-dollar)
+ (define-key map "\"" #'TeX-insert-quote)
+ (define-key map "$" #'TeX-insert-dollar)
;; Removed because LaTeX 2e have a better solution to italic correction.
- ;; (define-key map "." 'TeX-insert-punctuation)
- ;; (define-key map "," 'TeX-insert-punctuation)
- (define-key map "\C-c{" 'TeX-insert-braces)
- (define-key map "\C-c\C-f" 'TeX-font)
- (define-key map "\C-c\C-m" 'TeX-insert-macro)
- (define-key map "\\" 'TeX-insert-backslash)
- (define-key map "^" 'TeX-insert-sub-or-superscript)
- (define-key map "_" 'TeX-insert-sub-or-superscript)
- (define-key map "\e\t" 'TeX-complete-symbol) ;*** Emacs 19 way
-
- (define-key map "\C-c'" 'TeX-comment-or-uncomment-paragraph) ;*** Old
way
- (define-key map "\C-c:" 'comment-or-uncomment-region) ;*** Old way
- (define-key map "\C-c\"" 'TeX-uncomment) ;*** Old way
-
- (define-key map "\C-c;" 'comment-or-uncomment-region)
- (define-key map "\C-c%" 'TeX-comment-or-uncomment-paragraph)
-
- (define-key map "\C-c\C-t\C-p" 'TeX-PDF-mode)
- (define-key map "\C-c\C-t\C-i" 'TeX-interactive-mode)
- (define-key map "\C-c\C-t\C-s" 'TeX-source-correlate-mode)
- (define-key map "\C-c\C-t\C-r" 'TeX-pin-region)
- (define-key map "\C-c\C-w" 'TeX-toggle-debug-bad-boxes); to be
removed
- (define-key map "\C-c\C-t\C-b" 'TeX-toggle-debug-bad-boxes)
- (define-key map "\C-c\C-t\C-w" 'TeX-toggle-debug-warnings)
- (define-key map "\C-c\C-t\C-x" 'TeX-toggle-suppress-ignored-warnings)
- (define-key map "\C-c\C-v" 'TeX-view)
+ ;; (define-key map "." #'TeX-insert-punctuation)
+ ;; (define-key map "," #'TeX-insert-punctuation)
+ (define-key map "\C-c{" #'TeX-insert-braces)
+ (define-key map "\C-c\C-f" #'TeX-font)
+ (define-key map "\C-c\C-m" #'TeX-insert-macro)
+ (define-key map "\\" #'TeX-insert-backslash)
+ (define-key map "^" #'TeX-insert-sub-or-superscript)
+ (define-key map "_" #'TeX-insert-sub-or-superscript)
+ (define-key map "\e\t" #'TeX-complete-symbol) ;*** Emacs 19 way
+
+ (define-key map "\C-c'" #'TeX-comment-or-uncomment-paragraph) ;*** Old
way
+ (define-key map "\C-c:" #'comment-or-uncomment-region) ;*** Old way
+ (define-key map "\C-c\"" #'TeX-uncomment) ;*** Old way
+
+ (define-key map "\C-c;" #'comment-or-uncomment-region)
+ (define-key map "\C-c%" #'TeX-comment-or-uncomment-paragraph)
+
+ (define-key map "\C-c\C-t\C-p" #'TeX-PDF-mode)
+ (define-key map "\C-c\C-t\C-i" #'TeX-interactive-mode)
+ (define-key map "\C-c\C-t\C-s" #'TeX-source-correlate-mode)
+ (define-key map "\C-c\C-t\C-r" #'TeX-pin-region)
+ (define-key map "\C-c\C-w" #'TeX-toggle-debug-bad-boxes); to be
removed
+ (define-key map "\C-c\C-t\C-b" #'TeX-toggle-debug-bad-boxes)
+ (define-key map "\C-c\C-t\C-w" #'TeX-toggle-debug-warnings)
+ (define-key map "\C-c\C-t\C-x" #'TeX-toggle-suppress-ignored-warnings)
+ (define-key map "\C-c\C-v" #'TeX-view)
;; From tex-buf.el
- (define-key map "\C-c\C-d" 'TeX-save-document)
- (define-key map "\C-c\C-r" 'TeX-command-region)
- (define-key map "\C-c\C-b" 'TeX-command-buffer)
- (define-key map "\C-c\C-c" 'TeX-command-master)
- (define-key map "\C-c\C-a" 'TeX-command-run-all)
- (define-key map "\C-c\C-k" 'TeX-kill-job)
- (define-key map "\C-c\C-l" 'TeX-recenter-output-buffer)
- (define-key map "\C-c^" 'TeX-home-buffer)
- (define-key map "\C-c`" 'TeX-next-error)
+ (define-key map "\C-c\C-d" #'TeX-save-document)
+ (define-key map "\C-c\C-r" #'TeX-command-region)
+ (define-key map "\C-c\C-b" #'TeX-command-buffer)
+ (define-key map "\C-c\C-c" #'TeX-command-master)
+ (define-key map "\C-c\C-a" #'TeX-command-run-all)
+ (define-key map "\C-c\C-k" #'TeX-kill-job)
+ (define-key map "\C-c\C-l" #'TeX-recenter-output-buffer)
+ (define-key map "\C-c^" #'TeX-home-buffer)
+ (define-key map "\C-c`" #'TeX-next-error)
;; Remap bindings of `next-error'
- (define-key map [remap next-error] 'TeX-next-error)
+ (define-key map [remap next-error] #'TeX-next-error)
;; Remap bindings of `previous-error'
- (define-key map [remap previous-error] 'TeX-previous-error)
+ (define-key map [remap previous-error] #'TeX-previous-error)
;; From tex-fold.el
- (define-key map "\C-c\C-o\C-f" 'TeX-fold-mode)
+ (define-key map "\C-c\C-o\C-f" #'TeX-fold-mode)
;; Multifile
- (define-key map "\C-c_" 'TeX-master-file-ask) ;*** temporary
+ (define-key map "\C-c_" #'TeX-master-file-ask) ;*** temporary
map)
"Keymap for common TeX and LaTeX commands.")
@@ -5759,7 +5759,7 @@ to use, as specified by `TeX-font-list'."
(let ((help (concat
"Font list: "
"KEY TEXTFONT MATHFONT\n\n"
- (mapconcat 'TeX-describe-font-entry
+ (mapconcat #'TeX-describe-font-entry
TeX-font-list "\n"))))
(with-output-to-temp-buffer "*Help*"
(set-buffer "*Help*")
@@ -5815,7 +5815,7 @@ See also `TeX-font-replace' and
`TeX-font-replace-function'."
(setq strings (cdr (cdr strings)))
(and (stringp (car strings)) (null (string= (car strings) ""))
(setq cmds (cons (car strings) cmds))))
- (setq regexp (mapconcat 'regexp-quote cmds "\\|"))
+ (setq regexp (mapconcat #'regexp-quote cmds "\\|"))
(save-excursion
(catch 'done
(while t
@@ -6445,7 +6445,7 @@ NAME may be a package, a command, or a document."
(throw 'found t)))))
;; Setup completion list in a format suitable for `completing-read'.
(dolist (elt docs)
- (setq completions (nconc (mapcar 'list (car elt)) completions)))
+ (setq completions (nconc (mapcar #'list (car elt)) completions)))
;; Query user.
(setq name (completing-read
(if contained
@@ -6498,7 +6498,7 @@ NAME may be a package, a command, or a document."
TeX-check-path)
"\\|")
"\\).*\\("
- (mapconcat 'regexp-quote
+ (mapconcat #'regexp-quote
(cons (file-name-nondirectory name)
(TeX-style-list)) "\\|")
"\\)\\.\\("
diff --git a/toolbar-x.el b/toolbar-x.el
index 11919c9..5ba8b25 100644
--- a/toolbar-x.el
+++ b/toolbar-x.el
@@ -1,6 +1,6 @@
;;; toolbar-x.el --- fancy toolbar handling in Emacs and XEmacs
-;; Copyright (C) 2004, 2005, 2008, 2014, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -320,7 +320,7 @@ inside Emacs. See documentation of that function for more."
`(setq ,var ,count)
`(if (memq ,count ,var)
(setq ,var (delete ,count ,var))
- (setq ,var (sort (cons ,count ,var) '<))))
+ (setq ,var (sort (cons ,count ,var) #'<))))
(toolbarx-refresh))
(when (eq real-save 'always)
`((customize-save-variable
@@ -1108,11 +1108,11 @@ function `toolbar-install-toolbar'."
(t ; otherwise, must be a list
; with 4 strings or image
; descriptors
- (apply 'vector (mapcar (lambda (img)
- (if (stringp img)
- (toolbarx-find-image img)
- img))
- image))))))
+ (apply #'vector (mapcar (lambda (img)
+ (if (stringp img)
+ (toolbarx-find-image img)
+ img))
+ image))))))
(command
(let* ((com (nth 1 (memq :command filtered-props)))
(app (nth 1 (memq :append-command filtered-props)))
commit 7d896288610577f1a9a5b76c3a6aa0211d5d2249
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 18:55:12 2021 -0400
* font-latex.el (font-latex-make-built-in-keywords): Make it a macro
This lets us expose the code it generates to the compiler without
having to call `byte-compile` explicitly. It also reduces the reliance
on `eval`, saving the souls of many kitten along the way.
(font-latex-built-in-keyword-classes): Define it at compile-time as well.
(font-latex-keywords-1, font-latex-keywords-2):
Move their definition to `font-latex-make-built-in-keywords`.
(font-latex-keyword-matcher): Define it at compile-time as well.
(font-latex--make-match-defun): Rename from `font-latex-make-match-defun`.
Define it at compile-time as well. Return the function definition (as
the docstring suggests) rather than evaluating it.
(font-latex-make-user-keywords): Adjust call to it.
(<toplevel>): Don't manually call the byte-compiler.
diff --git a/font-latex.el b/font-latex.el
index e4a313b..bc6e087 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -234,13 +234,8 @@ variable `font-latex-fontify-sectioning'." ',num)
;;; Keywords
-(defvar font-latex-keywords-1 nil
- "Subdued level highlighting for LaTeX modes.")
-
-(defvar font-latex-keywords-2 nil
- "High level highlighting for LaTeX modes.")
-
-(defvar font-latex-built-in-keyword-classes
+(eval-and-compile
+(defconst font-latex-built-in-keyword-classes
'(("warning"
("nopagebreak" "pagebreak" "newpage" "clearpage" "cleardoublepage"
"enlargethispage" "nolinebreak" "linebreak" "newline" "-" "\\" "\\*"
@@ -453,7 +448,7 @@ The fifth element is the type of construct to be matched.
It can
be one of 'noarg which will match simple macros without
arguments (like \"\\foo\"), 'declaration which will match macros
inside a TeX group (like \"{\\bfseries foo}\"), or 'command which
-will match macros of the form \"\\foo[bar]{baz}\".")
+will match macros of the form \"\\foo[bar]{baz}\"."))
(defcustom font-latex-deactivated-keyword-classes nil
"List of strings for built-in keyword classes to be deactivated.
@@ -494,7 +489,8 @@ You have to restart Emacs for a change of this variable to
take effect."
,(car spec)))
font-latex-built-in-keyword-classes)))
-(defun font-latex-make-match-defun (prefix name face type)
+(eval-and-compile
+(defun font-latex--make-match-defun (prefix name face type)
"Return a function definition for keyword matching.
The variable holding the keywords to match are determined by the
strings PREFIX and NAME. The type of matcher is determined by
@@ -510,40 +506,40 @@ use."
;; (command 1). This indicated a macro with one argument. Provide
;; a match function in this case but don't actually support it.
(cond ((or (eq type 'command) (listp type))
- (eval `(defun ,(intern (concat prefix name)) (limit)
- ,(concat "Fontify `" prefix name "' up to LIMIT.
-
-Generated by `font-latex-make-match-defun'.")
- (when ,(intern (concat prefix name))
- (font-latex-match-command-with-arguments
- ,(intern (concat prefix name))
- (append
- (when (boundp ',(intern (concat prefix name
- "-keywords-local")))
- ,(intern (concat prefix name "-keywords-local")))
- ,(intern (concat prefix name "-keywords")))
- ;; `face' can be a face symbol, a form returning
- ;; a face symbol, or a list of face attributes.
- ,(if (and (listp face) (fboundp (car face)))
- face
- `',face)
- limit)))))
+ `(defun ,(intern (concat prefix name)) (limit)
+ ,(concat "Fontify `" prefix name "' up to LIMIT.
+
+Generated by `font-latex--make-match-defun'.")
+ (when ,(intern (concat prefix name))
+ (font-latex-match-command-with-arguments
+ ,(intern (concat prefix name))
+ (append
+ (when (boundp ',(intern (concat prefix name
+ "-keywords-local")))
+ ,(intern (concat prefix name "-keywords-local")))
+ ,(intern (concat prefix name "-keywords")))
+ ;; `face' can be a face symbol, a form returning
+ ;; a face symbol, or a list of face attributes.
+ ,(if (and (listp face) (fboundp (car face)))
+ face
+ `',face)
+ limit))))
((eq type 'declaration)
- (eval `(defun ,(intern (concat prefix name)) (limit)
- ,(concat "Fontify `" prefix name "' up to LIMIT.
+ `(defun ,(intern (concat prefix name)) (limit)
+ ,(concat "Fontify `" prefix name "' up to LIMIT.
-Generated by `font-latex-make-match-defun'.")
- (when ,(intern (concat prefix name))
- (font-latex-match-command-in-braces
- ,(intern (concat prefix name)) limit)))))
+Generated by `font-latex--make-match-defun'.")
+ (when ,(intern (concat prefix name))
+ (font-latex-match-command-in-braces
+ ,(intern (concat prefix name)) limit))))
((eq type 'noarg)
- (eval `(defun ,(intern (concat prefix name)) (limit)
- ,(concat "Fontify `" prefix name "' up to LIMIT.
+ `(defun ,(intern (concat prefix name)) (limit)
+ ,(concat "Fontify `" prefix name "' up to LIMIT.
-Generated by `font-latex-make-match-defun'.")
- (when ,(intern (concat prefix name))
- (re-search-forward
- ,(intern (concat prefix name)) limit t)))))))
+Generated by `font-latex--make-match-defun'.")
+ (when ,(intern (concat prefix name))
+ (re-search-forward
+ ,(intern (concat prefix name)) limit t))))))
(defun font-latex-keyword-matcher (prefix name face type)
"Return a matcher and highlighter as required by `font-lock-keywords'.
@@ -587,11 +583,13 @@ use."
`(,(intern (concat prefix name))
(0 'font-latex-warning-face t t)
(1 'font-lock-keyword-face append t)
- (2 ,face append t)))))
+ (2 ,face append t))))))
-(defun font-latex-make-built-in-keywords ()
+(defmacro font-latex-make-built-in-keywords ()
"Build defuns, defvars and defcustoms for built-in keyword fontification."
- (dolist (item font-latex-built-in-keyword-classes)
+ (let ((flks '())
+ (defs '()))
+ (dolist (item font-latex-built-in-keyword-classes)
(let ((prefix "font-latex-match-")
(name (nth 0 item))
(keywords (nth 1 item))
@@ -600,7 +598,7 @@ use."
(type (nth 4 item)))
;; defvar font-latex-match-*-keywords-local
- (eval `(defvar ,(intern (concat prefix name "-keywords-local"))
+ (push `(defvar-local ,(intern (concat prefix name "-keywords-local"))
',keywords
,(concat "Buffer-local keywords to add to `"
prefix name "-keywords'.\n\n"
@@ -618,12 +616,11 @@ regular expression\) omitting the leading backslash.")
This is an internal variable which should not be set directly.
Use `font-latex-add-keywords' instead.
-Generated by `font-latex-make-built-in-keywords'.")))
- (make-variable-buffer-local
- (intern (concat prefix name "-keywords-local")))
+Generated by `font-latex-make-built-in-keywords'."))
+ defs)
;; defcustom font-latex-match-*-keywords
- (eval `(defcustom ,(intern (concat prefix name "-keywords")) nil
+ (push `(defcustom ,(intern (concat prefix name "-keywords")) nil
,(concat "List of keywords "
(when (eq type 'command) "and formats ")
"for " name " face.\n"
@@ -647,19 +644,19 @@ Generated by `font-latex-make-built-in-keywords'.")
:set (lambda (symbol value)
(set-default symbol value)
(funcall ',(intern (concat prefix name "-make"))))
- :group 'font-latex-keywords))
+ :group 'font-latex-keywords)
+ defs)
;; defvar font-latex-match-*
- (eval `(defvar ,(intern (concat prefix name)) nil
+ (push `(defvar-local ,(intern (concat prefix name)) nil
,(concat "Regular expression to match " name
" keywords.
-Generated by `font-latex-make-built-in-keywords'")))
- (make-variable-buffer-local (intern (concat prefix name)))
+Generated by `font-latex-make-built-in-keywords'"))
+ defs)
;; defun font-latex-match-*-make
- ;; Note: The functions are byte-compiled at the end of font-latex.el.
- (eval `(defun ,(intern (concat prefix name "-make")) ()
+ (push `(defun ,(intern (concat prefix name "-make")) ()
,(concat "Make or remake the variable `" prefix name "'.
Generated by `font-latex-make-built-in-keywords'.")
@@ -686,20 +683,26 @@ Generated by `font-latex-make-built-in-keywords'.")
(concat
(when multi-char-macros "\\|")
"\\(?:" (regexp-opt single-char-macros) "\\)"))
- "\\)"))))))
+ "\\)")))))
+ defs)
;; defun font-latex-match-*
- (font-latex-make-match-defun prefix name face type)
+ (push (font-latex--make-match-defun prefix name face type) defs)
;; Add matchers and highlighters to `font-latex-keywords-{1,2}'.
(let ((keywords-entry (font-latex-keyword-matcher
prefix name face type)))
- (add-to-list (intern (concat "font-latex-keywords-"
- (number-to-string level)))
- keywords-entry t)
- (when (= level 1)
- (add-to-list 'font-latex-keywords-2
- keywords-entry t))))))
+ (push (cons level keywords-entry) flks))))
+ `(progn
+ ,@(nreverse defs)
+ (defvar font-latex-keywords-1
+ ',(nreverse (delq nil (mapcar (lambda (x) (if (eq 1 (car x)) (cdr x)))
+ flks)))
+ "Subdued level highlighting for LaTeX modes.")
+ (defvar font-latex-keywords-2
+ ',(nreverse (mapcar #'cdr flks))
+ "High level highlighting for LaTeX modes."))))
+
(font-latex-make-built-in-keywords)
(defcustom font-latex-user-keyword-classes nil
@@ -826,7 +829,7 @@ Generated by `font-latex-user-keyword-classes'"))))
Generated by `font-latex-make-user-keywords'.")))
;; defun font-latex-match-*
- (font-latex-make-match-defun prefix name face type)
+ (eval (font-latex--make-match-defun prefix name face type) t)
;; Add the matcher to `font-latex-keywords-2'.
(add-to-list 'font-latex-keywords-2
@@ -2278,13 +2281,13 @@ set to french, and >>german<< (and 8-bit) are used if
set to german."
;; yourself.
;;; Byte-compilation of generated functions
-
-(when (byte-code-function-p
- (symbol-function 'font-latex-make-built-in-keywords))
- (dolist (elt font-latex-built-in-keyword-classes)
- (let ((name (nth 0 elt)))
- (byte-compile (intern (concat "font-latex-match-" name)))
- (byte-compile (intern (concat "font-latex-match-" name "-make"))))))
+;; Not needed now that we generate the code via a macro.
+;; (when (byte-code-function-p
+;; (symbol-function 'font-latex-make-built-in-keywords))
+;; (dolist (elt font-latex-built-in-keyword-classes)
+;; (let ((name (nth 0 elt)))
+;; (byte-compile (intern (concat "font-latex-match-" name)))
+;; (byte-compile (intern (concat "font-latex-match-" name "-make"))))))
;; Provide ourselves:
commit 7c2f403f5c39a314bc0b2d9e1e7c1507f55983d1
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon Mar 22 18:41:56 2021 -0400
* font-latex.el (font-latex-make-built-in-keywords): Reorder defs
Move definition of `font-latex-match-*-make` after the `defvar`s of
the vars it uses.
diff --git a/font-latex.el b/font-latex.el
index 494fb30..e4a313b 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1,6 +1,6 @@
;;; font-latex.el --- LaTeX fontification for Font Lock mode. -*-
lexical-binding: t; -*-
-;; Copyright (C) 1996-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2021 Free Software Foundation, Inc.
;; Authors: Peter S. Galbraith <psg@debian.org>
;; Simon Marshall <Simon.Marshall@esrin.esa.it>
@@ -622,37 +622,6 @@ Generated by `font-latex-make-built-in-keywords'.")))
(make-variable-buffer-local
(intern (concat prefix name "-keywords-local")))
- ;; defun font-latex-match-*-make
- ;; Note: The functions are byte-compiled at the end of font-latex.el.
- (eval `(defun ,(intern (concat prefix name "-make")) ()
- ,(concat "Make or remake the variable `" prefix name "'.
-
-Generated by `font-latex-make-built-in-keywords'.")
- (let ((keywords
- (append
- (unless (member ,name
- font-latex-deactivated-keyword-classes)
- ,(intern (concat prefix name "-keywords-local")))
- ,(intern (concat prefix name "-keywords"))))
- multi-char-macros single-char-macros)
- (dolist (elt keywords)
- (let ((keyword (if (listp elt) (car elt) elt)))
- (if (string-match "^[A-Za-z]" keyword)
- (push keyword multi-char-macros)
- (push keyword single-char-macros))))
- (when (or multi-char-macros single-char-macros)
- (setq ,(intern (concat prefix name))
- (concat
- "\\\\\\("
- (when multi-char-macros
- (concat
- "\\(?:" (regexp-opt multi-char-macros) "\\)\\>"))
- (when single-char-macros
- (concat
- (when multi-char-macros "\\|")
- "\\(?:" (regexp-opt single-char-macros) "\\)"))
- "\\)"))))))
-
;; defcustom font-latex-match-*-keywords
(eval `(defcustom ,(intern (concat prefix name "-keywords")) nil
,(concat "List of keywords "
@@ -688,6 +657,37 @@ Generated by `font-latex-make-built-in-keywords'.")
Generated by `font-latex-make-built-in-keywords'")))
(make-variable-buffer-local (intern (concat prefix name)))
+ ;; defun font-latex-match-*-make
+ ;; Note: The functions are byte-compiled at the end of font-latex.el.
+ (eval `(defun ,(intern (concat prefix name "-make")) ()
+ ,(concat "Make or remake the variable `" prefix name "'.
+
+Generated by `font-latex-make-built-in-keywords'.")
+ (let ((keywords
+ (append
+ (unless (member ,name
+ font-latex-deactivated-keyword-classes)
+ ,(intern (concat prefix name "-keywords-local")))
+ ,(intern (concat prefix name "-keywords"))))
+ multi-char-macros single-char-macros)
+ (dolist (elt keywords)
+ (let ((keyword (if (listp elt) (car elt) elt)))
+ (if (string-match "^[A-Za-z]" keyword)
+ (push keyword multi-char-macros)
+ (push keyword single-char-macros))))
+ (when (or multi-char-macros single-char-macros)
+ (setq ,(intern (concat prefix name))
+ (concat
+ "\\\\\\("
+ (when multi-char-macros
+ (concat
+ "\\(?:" (regexp-opt multi-char-macros) "\\)\\>"))
+ (when single-char-macros
+ (concat
+ (when multi-char-macros "\\|")
+ "\\(?:" (regexp-opt single-char-macros) "\\)"))
+ "\\)"))))))
+
;; defun font-latex-match-*
(font-latex-make-match-defun prefix name face type)
@@ -2246,6 +2246,9 @@ set to french, and >>german<< (and 8-bit) are used if set
to german."
;; into a non-comment, or use `\n%' or `%^' as the comment.
;; Instead, we include it in the ^^A comment.
(eval-when-compile (string-to-syntax "< b"))
+ ;; FIXME: Those `eval-when-compile' shouldn't be needed any
+ ;; more since the byte-compiler will precompute those calls
+ ;; anyway (because `string-to-syntax' is marked as pure).
(eval-when-compile (string-to-syntax ">"))))
(let ((end (line-end-position)))
(if (< end (point-max))
-----------------------------------------------------------------------
Summary of changes:
auctex.el.in | 4 +-
bib-cite.el | 86 ++---
context-en.el | 2 +-
context-nl.el | 2 +-
context.el | 47 +--
font-latex.el | 221 ++++++-------
latex.el | 246 +++++++--------
lpath.el | 4 +-
multi-prompt.el | 8 +-
plain-tex.el | 10 +-
preview.el.in | 214 +++++++------
style/CJK.el | 4 +-
style/array.el | 4 +-
style/babel.el | 4 +-
style/beamer.el | 14 +-
style/biblatex.el | 14 +-
style/dinbrief.el | 6 +-
style/dk-bib.el | 4 +-
style/doc.el | 4 +-
style/foils.el | 4 +-
style/fontenc.el | 7 +-
style/inputenc.el | 4 +-
style/jurabib.el | 4 +-
style/kpfonts.el | 15 +-
style/latexinfo.el | 22 +-
style/ntheorem.el | 12 +-
style/pdfsync.el | 4 +-
style/polyglossia.el | 8 +-
style/prosper.el | 6 +-
style/pst-node.el | 4 +-
style/pstricks.el | 11 +-
style/siunitx.el | 4 +-
style/theorem.el | 6 +-
style/tikz.el | 18 +-
style/ulem.el | 7 +-
style/url.el | 4 +-
tests/context/context-test.el | 4 +-
tests/japanese/error-parsing.el | 4 +-
tests/japanese/parse-timing.el | 4 +-
tests/japanese/preview-latex.el | 26 +-
tests/latex/font-latex-test.el | 4 +-
tests/latex/latex-test.el | 4 +-
tests/latex/preview-latex-test.el | 4 +-
tests/latex/texmathp-test.el | 4 +-
tests/tex/command-expansion.el | 4 +-
tests/tex/error-parsing.el | 4 +-
tests/tex/navigation.el | 4 +-
tests/tex/path-expansion.el | 4 +-
tex-bar.el | 16 +-
tex-buf.el | 49 ++-
tex-fold.el | 86 +++--
tex-font.el | 10 +-
tex-info.el | 93 +++---
tex-jp.el | 645 +++++++++++++++++++-------------------
tex-mik.el | 4 +-
tex-site.el.in | 9 +-
tex-style.el | 48 +--
tex-wizard.el | 14 +-
tex.el | 194 ++++++------
texmathp.el | 7 +-
toolbar-x.el | 381 +++++++++-------------
61 files changed, 1242 insertions(+), 1422 deletions(-)
hooks/post-receive
--
GNU AUCTeX
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 7606a49da2b1c22c9ebaeb734e77b4504c91b451,
Stefan Monnier <=