1.1 --- a/yatexlib.el	Sun Dec 24 06:16:52 2006 +0000
     1.2 +++ b/yatexlib.el	Mon Sep 28 07:56:08 2009 +0900
     1.3 @@ -2,7 +2,7 @@
     1.4  ;;; YaTeX and yahtml common libraries, general functions and definitions
     1.5  ;;; yatexlib.el
     1.6  ;;; (c)1994-2006 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Sun Dec 24 15:12:20 2006 on firestorm
     1.8 +;;; Last modified Sat Apr 18 07:32:45 2009 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;; General variables
    1.12 @@ -313,8 +313,9 @@
    1.13  
    1.14  ;;;###autoload
    1.15  (defun YaTeX-define-begend-key (key env &optional map)
    1.16 -  "Define short cut key for begin type completion both for normal
    1.17 -and region mode.  To customize YaTeX, user should use this function."
    1.18 +  "Define short cut key for begin type completion.
    1.19 +Define both strokes for normal and region mode.
    1.20 +To customize YaTeX, user should use this function."
    1.21    (YaTeX-define-begend-key-normal key env map)
    1.22    (if YaTeX-inhibit-prefix-letter nil
    1.23      (YaTeX-define-begend-region-key
    1.24 @@ -487,7 +488,7 @@
    1.25  that gives the maximum value by the FUNC.  FUNC should take an argument
    1.26  of its window object.  Non-nil for optional third argument SELECT selects
    1.27  that window.  This function never selects minibuffer window."
    1.28 -  (or (and (if (and YaTeX-emacs-19 select)
    1.29 +  (or (and (if (and YaTeX-emacs-19 select window-system)
    1.30  	       (get-buffer-window buffer t)
    1.31  	     (get-buffer-window buffer))
    1.32  	   (progn
    1.33 @@ -516,7 +517,7 @@
    1.34  	  (or select (select-window window)))
    1.35  	 (t				;if one-window
    1.36  	  (cond
    1.37 -	   ((and YaTeX-emacs-19 (get-buffer-window buffer t))
    1.38 +	   ((and YaTeX-emacs-19 window-system (get-buffer-window buffer t))
    1.39  	    nil)			;if found in other frame
    1.40  	   (YaTeX-default-pop-window-height
    1.41  	    (split-window-calculate-height YaTeX-default-pop-window-height)