[MERGED-BEN-MULE] japanese.el won't compile...

I have checked out xemacs some hours ago and compiled it. But I have encountered an error while byte-compiling japanese.el. I have applied following patch to japanese.el and it compiled smoothly. --- japanese.el.orig Sat Mar 16 10:39:06 2002 +++ japanese.el Sun Mar 17 17:35:20 2002 ＠＠ -499,43 +499,43 ＠＠ (native-coding-system ;; first, see if an explicit encoding was given. - #'(lambda (locale) + (lambda (locale) (let ((case-fold-search t)) (cond ;; many unix versions - ((string-match "\\.euc" locale) 'euc-jp) - ((string-match "\\.sjis" locale) 'shift-jis) + ((string-match "\\.euc" locale) euc-jp) + ((string-match "\\.sjis" locale) shift-jis) ;; X11R6 (CJKV p. 471) - ((string-match "\\.jis7" locale) 'jis7) - ((string-match "\\.jis8" locale) 'jis8) - ((string-match "\\.mscode" locale) 'shift-jis) - ((string-match "\\.pjis" locale) 'iso-2022-jp) - ((string-match "\\.ujis" locale) 'euc-jp) + ((string-match "\\.jis7" locale) jis7) + ((string-match "\\.jis8" locale) jis8) + ((string-match "\\.mscode" locale) shift-jis) + ((string-match "\\.pjis" locale) iso-2022-jp) + ((string-match "\\.ujis" locale) euc-jp) ;; other names in X11R6 locale.alias - ((string-match "\\.ajec" locale) 'euc-jp) - ((string-match "-euc" locale) 'euc-jp) - ((string-match "\\.iso-2022-jp" locale) 'iso-2022-jp) - ((string-match "\\.jis" locale) 'jis7) ;; or just jis? + ((string-match "\\.ajec" locale) euc-jp) + ((string-match "-euc" locale) euc-jp) + ((string-match "\\.iso-2022-jp" locale) iso-2022-jp) + ((string-match "\\.jis" locale) jis7) ;; or just jis? ))) ;; aix (CJKV p. 465) - #'(lambda (locale) + (lambda (locale) (when (eq system-type 'aix) (cond - ((string-match "^Ja_JP" locale) 'shift-jis) - ((string-match "^ja_JP" locale) 'euc-jp)))) + ((string-match "^Ja_JP" locale) shift-jis) + ((string-match "^ja_JP" locale) euc-jp)))) ;; other X11R6 locale.alias - #'(lambda (locale) + (lambda (locale) (cond - ((string-match "^Jp_JP" locale) 'euc-jp) + ((string-match "^Jp_JP" locale) euc-jp) ((and (eq system-type 'hpux) (eq locale "japanese")) - 'shift-jis))) + shift-jis))) ;; fallback - 'euc-jp) + euc-jp) ;; (input-method . "japanese") (features japan-util) -- =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= Ronnie Shin Mimura E-mail jerry(a)xa.catv.ne.jp URI http://home.catv.ne.jp/pp/jerry/ =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=