rpms/xemacs/devel xemacs-21.5.27-canna-222559.patch, NONE, 1.1 xemacs-sitestart.el, 1.6, 1.7 xemacs.spec, 1.32, 1.33

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30684

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Added Files:
	xemacs-21.5.27-canna-222559.patch 
Log Message:
* Wed Jan 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-8
- Fix canna_api.ell install/load paths (#222559).
- Fix site-start.el locale setup when the LANG env var is unset.


xemacs-21.5.27-canna-222559.patch:

--- NEW FILE xemacs-21.5.27-canna-222559.patch ---
--- lisp/mule/canna-leim.el	21 Oct 2005 15:48:33 -0000	1.9
+++ lisp/mule/canna-leim.el	20 Jan 2007 12:08:13 -0000
@@ -45,7 +45,7 @@
 
 (defun canna-activate (&optional name)
   ;; XEmacs 21.5.10 and later have 3-argument require.
-  (unless (require 'CANNA "canna/canna_api" 'no-error)
+  (unless (require 'CANNA "canna_api" 'no-error)
     (error 'file-error
 	   "No Canna API support!? See M-x describe-installation & C-h v module-load-path."))
   (unless (require 'canna nil 'no-error)


Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xemacs-sitestart.el	3 Jan 2007 22:00:58 -0000	1.6
+++ xemacs-sitestart.el	24 Jan 2007 16:50:04 -0000	1.7
@@ -110,7 +110,7 @@
 
     ;; set-language-environment changes the locale; restore it.
     (setenv "LANG" locale)
-    (set-current-locale locale)
+    (set-current-locale (or locale "C"))
 
     (let* ((tmp (shell-command-to-string "locale charmap"))
            (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp)))


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xemacs.spec	3 Jan 2007 22:48:26 -0000	1.32
+++ xemacs.spec	24 Jan 2007 16:50:04 -0000	1.33
@@ -19,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -34,6 +34,7 @@
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
+Patch2:         %{name}-21.5.27-canna-222559.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
@@ -177,6 +178,7 @@
 sed -i -e /tetris/d lisp/menubar-items.el
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 %patch3 -p1
 %ifarch ia64
 touch -r aclocal.m4 aclocal.m4-stamp
@@ -491,6 +493,10 @@
 
 
 %changelog
+* Wed Jan 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-8
+- Fix canna_api.ell install/load paths (#222559).
+- Fix site-start.el locale setup when the LANG env var is unset.
+
 * Thu Jan  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-7
 - Don't run autoconf during build.