diff --git a/yahtml.el b/yahtml.el index 2a243ac..e4ffb1f 100644 --- a/yahtml.el +++ b/yahtml.el @@ -1,6 +1,6 @@ ;;; -*- Emacs-Lisp -*- ;;; (c) 1994-2010 by HIROSE Yuuji [yuuji(@)yatex.org] -;;; Last modified Sun Sep 12 10:58:31 2010 on firestorm +;;; Last modified Mon Sep 13 08:09:46 2010 on firestorm ;;; $Id$ (defconst yahtml-revision-number "1.74.2" @@ -907,6 +907,7 @@ (and (setq a (yahtml-css-get-element-completion-alist form)) (not (equal last-command-char ?\C-j)) (memq yahtml-current-completion-type '(multiline inline)) + (not (string-match "#" form)) (yahtml-make-optional-argument ;should be made generic? "class" (yahtml-read-css a))) (if (and (intern-soft addin) (fboundp (intern-soft addin)) @@ -1135,6 +1136,10 @@ ((eq alist 'file) (let ((insert-default-directory)) (read-file-name prompt "" default nil ""))) + ((eq alist 'command) + (if (fboundp 'read-shell-command) + (read-shell-command prompt) + (read-string prompt))) ((and alist (symbolp alist)) (completing-read prompt (symbol-value alist) nil nil default)) (alist @@ -1685,7 +1690,8 @@ (format "%s=\"%s\"--" (if (string-match "/" file) "virtual" "file") file))) (defun yahtml:!--\#exec () - (format "cmd=\"%s\"--" (yahtml-read-parameter "cmd" "" '(("cmd" . file))))) + (format "cmd=\"%s\"--" + (yahtml-read-parameter "cmd" "" '(("cmd" . command))))) ;;; ---------- Jump ---------- (defun yahtml-on-href-p () diff --git a/yatex.new b/yatex.new index f6a8948..909f4cd 100644 --- a/yatex.new +++ b/yatex.new @@ -5,6 +5,9 @@ [prefix] t e �Ń|�C���g�ʒu���܂ފ‹��������‹����^�C�v�Z�b�g�B M-C-SPC �Ŋ‹������łȂ������‹����}�[�N����B [prefix] t d �Ń^�C�v�Z�b�^�N�������̂��� dvipdfmx ���N���B + === yahtml === + [prefix] t �u���E�U���j���[�Ɂun:�V�K�y�[�W�쐬�v��lj�(����)�B + [prefix] t j ��lint�R�}���h�� �Ŏw��B 1.74 === yatex === YaTeX-kanji-code �� 4 �̂Ƃ��� UTF-8 �Ƃ����B diff --git a/yatexprc.el b/yatexprc.el index f044ecc..067e85f 100644 --- a/yatexprc.el +++ b/yatexprc.el @@ -2,7 +2,7 @@ ;;; YaTeX process handler. ;;; yatexprc.el ;;; (c)1993-2010 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Fri May 28 13:05:14 2010 on firestorm +;;; Last modified Fri Sep 10 17:47:38 2010 on firestorm ;;; $Id$ ;(require 'yatex) @@ -918,28 +918,6 @@ (YaTeX-switch-to-buffer-other-window (concat (YaTeX-get-preview-file-name) ".tex")))) -(defun YaTeX-get-builtin (key) - "Read source built-in command of %# usage." - (catch 'builtin - (let ((bl (delq nil (list (current-buffer) - (and YaTeX-parent-file - (get-file-buffer YaTeX-parent-file)))))) - (save-excursion - (while bl - (set-buffer (car bl)) - (save-excursion - (goto-char (point-min)) - (if (and (re-search-forward - (concat "^" (regexp-quote (concat "%#" key))) nil t) - (not (eolp))) - (throw 'builtin - (YaTeX-buffer-substring - (progn - (skip-chars-forward " \t" (point-end-of-line)) - (point)) - (point-end-of-line))))) - (setq bl (cdr bl))))))) - (defun YaTeX-save-buffers () "Save buffers whose major-mode is equal to current major-mode." (basic-save-buffer)