1.1 --- a/yatex.el	Mon Jan 09 20:21:13 2012 +0900
     1.2 +++ b/yatex.el	Tue Jan 10 13:19:55 2012 +0900
     1.3 @@ -2,7 +2,7 @@
     1.4  ;;; Yet Another tex-mode for emacs - //野鳥//
     1.5  ;;; yatex.el rev. 1.74.7
     1.6  ;;; (c)1991-2012 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Mon Jan  9 20:12:52 2012 on firestorm
     1.8 +;;; Last modified Tue Jan 10 13:17:19 2012 on firestorm
     1.9  ;;; $Id$
    1.10  ;;; The latest version of this software is always available at;
    1.11  ;;; http://www.yatex.org/
    1.12 @@ -1233,8 +1233,8 @@
    1.13  	      (momentary-string-display
    1.14  	       (format
    1.15  		(cond
    1.16 -		 (YaTeX-japan "{begin/end入力には %s を使いましょう}")
    1.17 -		 (t "{You don't understand Zen of `%s'!}"))
    1.18 +		 (YaTeX-japan "begin/end入力には %s を使いましょう")
    1.19 +		 (t "You don't understand Zen of `%s'!"))
    1.20  		(key-description
    1.21  		 (car (where-is-internal 'YaTeX-make-begin-end))))
    1.22  	       (point))
    1.23 @@ -1242,7 +1242,7 @@
    1.24  		   (+ 1 (string-to-int ;increment counter of beg-end guidance
    1.25  			 (prin1-to-string
    1.26  			  (get 'YaTeX-insert-braces 'begend-guide)))))))))
    1.27 -	env macro not-literal)
    1.28 +	env macro not-literal b e)
    1.29      (cond
    1.30       ((YaTeX-jmode) (YaTeX-self-insert arg))
    1.31       ((not (YaTeX-closable-p)) (YaTeX-self-insert arg))
    1.32 @@ -1274,20 +1274,25 @@
    1.33  	   (equal "end" (setq macro (YaTeX-get-macro-at-point)))
    1.34  	   (setq env (YaTeX-inner-environment)))
    1.35        (funcall begend-guide)
    1.36 -      (insert (or open "{") env (or close "}")))
    1.37 +      (insert "{" env "}"))
    1.38       ((and not-literal (equal "begin" macro))
    1.39 +      (insert "{")
    1.40 +      (save-excursion
    1.41 +	(indent-to (prog1 (- (current-column) 7) (insert "}\n")))
    1.42 +	(insert "\\end{}")
    1.43 +	(setq e (point)))
    1.44        (setq env
    1.45  	    (YaTeX-read-environment
    1.46  	     (format "Begin environment(default %s): " YaTeX-env-name)))
    1.47        (if (string= "" env) (setq env YaTeX-env-name))
    1.48        (setq YaTeX-env-name env)
    1.49        (funcall begend-guide)
    1.50 -      (delete-region (- (point) 6) (point))
    1.51 +      (delete-region (- (point) 7) e)
    1.52        (YaTeX-insert-begin-end env nil))
    1.53       (t
    1.54        (insert (or open "{") (or close "}"))
    1.55        (forward-char -1)
    1.56 -      (if (and (eq (char-after (point)) ?\})
    1.57 +      (if (and (eq (char-after (point)) ?\}) ;; the case `\\{}'
    1.58  	       (eq (char-after (- (point) 2)) ?\\ ))
    1.59  	  (progn (insert "\\") (forward-char -1)))
    1.60        ))))