1.1 --- a/yatexlib.el	Tue Dec 16 13:28:38 1997 +0000
     1.2 +++ b/yatexlib.el	Mon Oct 26 12:05:32 1998 +0000
     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-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
     1.7 -;;; Last modified Tue Dec 16 14:48:22 1997 on firestorm
     1.8 +;;; Last modified Mon Oct 19 13:41:29 1998 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;; General variables
    1.12 @@ -30,8 +30,8 @@
    1.13  	   1 (cond (YaTeX-dos 'shift_jis-dos)
    1.14  		   ((member 'shift_jis (coding-system-list)) 'shift_jis-unix)
    1.15  		   (t 'sjis)))
    1.16 -	  '(2 . iso-2022-7bit-unix)
    1.17 -	  '(3 . euc-japan))))
    1.18 +	  '(2 . iso-2022-jp-unix)
    1.19 +	  '(3 . euc-jp-unix))))
    1.20    "Kanji-code expression translation table.")
    1.21  (defvar YaTeX-inhibit-prefix-letter nil
    1.22    "*T for changing key definitions from [prefix] Letter to [prefix] C-Letter.")
    1.23 @@ -190,11 +190,11 @@
    1.24  	(message
    1.25  	 (cond
    1.26  	  (YaTeX-japan
    1.27 -	   "`%s'$B$NEPO?@h(B: U)$B%f!<%6<-=q(B L)$B%m!<%+%k<-=q(B N)$B%a%b%j(B D)$B$7$J$$(B")
    1.28 +	   "`%s'の登録先: U)ユーザ辞書 L)ローカル辞書 N)メモリ D)しない")
    1.29  	  (t
    1.30  	   "Register `%s' into: U)serDic L)ocalDic N)one D)iscard"))
    1.31  	 (if (> (length car-v) 23)
    1.32 -	     (concat (substring car-v 0 10) "..." (substring car-v -10))
    1.33 +	     (concat (substring car-v 0 10) "..." (substring car-v -9))
    1.34  	   car-v))
    1.35  	(setq answer (char-to-string (read-char))))
    1.36        (cond
    1.37 @@ -486,10 +486,11 @@
    1.38    "Replace recursively OLDDEF with NEWDEF for any keys in KEYMAP now
    1.39  defined as OLDDEF. In other words, OLDDEF is replaced with NEWDEF
    1.40  where ever it appears."
    1.41 -  (mapcar
    1.42 -   (function (lambda (key) (define-key keymap key newdef)))
    1.43 -   (where-is-internal olddef keymap))
    1.44 -)
    1.45 +  (if YaTeX-emacs-19
    1.46 +      (substitute-key-definition olddef newdef keymap global-map)
    1.47 +    (mapcar
    1.48 +     (function (lambda (key) (define-key keymap key newdef)))
    1.49 +     (where-is-internal olddef keymap))))
    1.50  
    1.51  ;;;###autoload
    1.52  (defun YaTeX-match-string (n &optional m)
    1.53 @@ -798,11 +799,17 @@
    1.54       bindlist))))
    1.55  
    1.56  
    1.57 +;;;
    1.58 +;; Functions for the Installation time
    1.59 +;;;
    1.60  
    1.61  (defun bcf-and-exit ()
    1.62    "Byte compile rest of argument and kill-emacs."
    1.63    (if command-line-args-left
    1.64 -      (progn
    1.65 +      (let ((load-path (cons "." load-path)))
    1.66 +	(and (fboundp 'set-language-environment)
    1.67 +	     (featurep 'mule)
    1.68 +	     (set-language-environment "Japanese"))
    1.69  	(mapcar 'byte-compile-file command-line-args-left)
    1.70  	(kill-emacs))))
    1.71