# HG changeset patch
# User HIROSE Yuuji <yuuji@koeki-u.ac.jp>
# Date 1322630566 -32400
# Node ID 85e57c4b27a21ac3e6d14fdc3e75d1239449ecaa
# Parent  bdc00b25045d84c707c8ce145d9216519735e131# Parent  1c41dc8a28eb37460263a572744ff7708b7809b7
merged

diff -r bdc00b25045d -r 85e57c4b27a2 docs/qanda
--- a/docs/qanda	Wed Nov 30 14:21:28 2011 +0900
+++ b/docs/qanda	Wed Nov 30 14:22:46 2011 +0900
@@ -344,8 +344,8 @@
 		└──────────────┘
 	
 	てな具合になるわけですよ。おおかちょええ。さて、小文字program環
-	境のマクロ定義を良く見ると環境に渡した foo.c はそのまま
-	\label{#1} でラベルとして自動的に打たれることになる。あ、pLaTeX 
+	境のマクロ定義を良く見ると環境に渡した foo.c はそのまま自動的に
+	\label{#1} でラベルとして打たれることになります。あ、pLaTeX 
 	のラベルは日本語もOKよ。で、その暗黙のうちに打たれたラベル名を野
 	鳥に教えるというのがスマートなやり方です。これを定義するのが変数
 	YaTeX::ref-labeling-regexp-alist-private なり。これには
diff -r bdc00b25045d -r 85e57c4b27a2 yatex.el
--- a/yatex.el	Wed Nov 30 14:21:28 2011 +0900
+++ b/yatex.el	Wed Nov 30 14:22:46 2011 +0900
@@ -1,15 +1,15 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; Yet Another tex-mode for emacs - //野鳥//
-;;; yatex.el rev. 1.74.4
+;;; yatex.el rev. 1.74.5
 ;;; (c)1991-2011 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Nov 30 14:20:13 2011 on duke
+;;; Last modified Wed Nov 30 14:22:06 2011 on duke
 ;;; $Id$
 ;;; The latest version of this software is always available at;
 ;;; http://www.yatex.org/
 
 (require 'comment)
 (require 'yatexlib)
-(defconst YaTeX-revision-number "1.74.4"
+(defconst YaTeX-revision-number "1.74.5"
   "Revision number of running yatex.el")
 
 ;---------- Local variables ----------
@@ -510,7 +510,7 @@
   (if YaTeX-dos
       (define-key YaTeX-prefix-map "\C-r"
 	'(lambda () (interactive)
-	   (set-screen-height YaTeX-saved-screen-height) (recenter)))))
+	   (YaTeX-set-screen-height YaTeX-saved-screen-height) (recenter)))))
 
 (defvar YaTeX-section-completion-map nil
   "*Key map used at YaTeX completion in the minibuffer.")
@@ -692,7 +692,7 @@
 	))
   (use-local-map YaTeX-mode-map)
   (set-syntax-table YaTeX-mode-syntax-table)
-  (if YaTeX-dos (setq YaTeX-saved-screen-height (screen-height)))
+  (if YaTeX-dos (setq YaTeX-saved-screen-height (YaTeX-screen-height)))
   (YaTeX-read-user-completion-table)
   (and (fboundp 'YaTeX-hilit-setup-alist) (YaTeX-hilit-setup-alist))
   (makunbound 'inenv)
diff -r bdc00b25045d -r 85e57c4b27a2 yatexlib.el
--- a/yatexlib.el	Wed Nov 30 14:21:28 2011 +0900
+++ b/yatexlib.el	Wed Nov 30 14:22:46 2011 +0900
@@ -2,7 +2,7 @@
 ;;; YaTeX and yahtml common libraries, general functions and definitions
 ;;; yatexlib.el
 ;;; (c)1994-2009 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Fri Feb 18 15:05:08 2011 on firestorm
+;;; Last modified Thu Oct 13 09:36:20 2011 on firestorm
 ;;; $Id$
 
 ;; General variables
@@ -530,11 +530,15 @@
 (cond
  ((fboundp 'screen-height)
   (fset 'YaTeX-screen-height 'screen-height)
-  (fset 'YaTeX-screen-width 'screen-width))
+  (fset 'YaTeX-screen-width 'screen-width)
+  (fset 'YaTeX-set-screen-height 'set-screen-height)
+  (fset 'YaTeX-set-screen-width 'set-screen-width))
  ((fboundp 'frame-height)
   (fset 'YaTeX-screen-height 'frame-height)
-  (fset 'YaTeX-screen-width 'frame-width))
- (t (error "I don't know how to run windows.el on this Emacs...")))
+  (fset 'YaTeX-screen-width 'frame-width)
+  (fset 'YaTeX-set-screen-height 'set-frame-height)
+  (fset 'YaTeX-set-screen-width 'set-frame-width))
+ (t (error "I don't know how to run YaTeX on this Emacs...")))
 
 ;;;###autoload
 (defun split-window-calculate-height (height)
diff -r bdc00b25045d -r 85e57c4b27a2 yatexmth.el
--- a/yatexmth.el	Wed Nov 30 14:21:28 2011 +0900
+++ b/yatexmth.el	Wed Nov 30 14:22:46 2011 +0900
@@ -2,7 +2,7 @@
 ;;; YaTeX math-mode-specific functions.
 ;;; yatexmth.el
 ;;; (c)1993-2010 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Thu Mar 24 10:30:18 2011 on firestorm
+;;; Last modified Fri Oct  7 15:53:34 2011 on firestorm
 ;;; $Id$
 
 ;;; [Customization guide]