changeset 511:551fcb1d22a0 dev

Call-builtin command line candidate should not be %-expanded
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 04 Jan 2018 00:14:21 +0900
parents 7a64b7761d6b
children 46f02e576ee1
files yatexprc.el
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/yatexprc.el	Wed Jan 03 23:58:59 2018 +0900
+++ b/yatexprc.el	Thu Jan 04 00:14:21 2018 +0900
@@ -1,7 +1,7 @@
 ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*-
 ;;; 
 ;;; (c)1993-2018 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Jan  3 23:54:10 2018 on firestorm
+;;; Last modified Thu Jan  4 00:09:28 2018 on firestorm
 ;;; $Id$
 
 ;;; Code:
@@ -836,10 +836,8 @@
 		  (save-excursion (YaTeX-visit-main t) buffer-file-name)))
 	(mainroot (file-name-nondirectory (substring main 0 (rindex main ?.))))
 	(alist YaTeX-call-builtin-on-file)
-	(b-in (YaTeX-replace-format
-	       (or (YaTeX-get-builtin builtin-type)
-		   (cdr (assoc builtin-type alist)))
-	       "k" (YaTeX-kanji-ptex-mnemonic)))
+	(b-in (or (YaTeX-get-builtin builtin-type)
+		  (cdr (assoc builtin-type alist))))
 	(command b-in))
     (if (or update (null b-in))
 	(progn
@@ -861,7 +859,7 @@
 			 (key-description (this-command-keys)))
 		(sit-for 2)))))
     (YaTeX-typeset
-     command
+     (YaTeX-replace-format command "k" (YaTeX-kanji-ptex-mnemonic))
      (format " *YaTeX-%s*" (downcase builtin-type))
      builtin-type builtin-type)))