rpms/xemacs-packages-base/F-10 xemacs-packages-base-20090901-mule-480845.patch, NONE, 1.1 xemacs-packages-base.spec, 1.4, 1.5

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25384/F-10

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090901-mule-480845.patch 
Log Message:
* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 20070427-3
- Backport mule-base patch to fix 480845 for F-10 users.


xemacs-packages-base-20090901-mule-480845.patch:
 ChangeLog    |    7 +++++
 mule-util.el |   69 -----------------------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

--- NEW FILE xemacs-packages-base-20090901-mule-480845.patch ---
Index: mule-packages/mule-base/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/ChangeLog,v
retrieving revision 1.66
diff -d -u -r1.66 ChangeLog
--- mule-packages/mule-base/ChangeLog	9 Aug 2008 12:41:17 -0000	1.66
+++ mule-packages/mule-base/ChangeLog	1 Sep 2009 18:56:15 -0000
@@ -1,3 +1,10 @@
+2009-09-01  Jerry James  <james at xemacs.org>
+
+	* mule-util.el (store-substring): Remove older version of a
+	function that is now defined in subr.el.
+	(truncate-string-to-width): Ditto.
+	(truncate-string): Ditto.
+
 2008-08-09  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.53 released.
Index: mule-packages/mule-base/mule-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/mule-util.el,v
retrieving revision 1.3
diff -d -u -r1.3 mule-util.el
--- mule-packages/mule-base/mule-util.el	20 May 2007 19:32:53 -0000	1.3
+++ mule-packages/mule-base/mule-util.el	1 Sep 2009 18:56:15 -0000
@@ -68,75 +68,6 @@
 ;;   "Return a vector of characters in STRING."
 ;;   (string-to-sequence string 'vector))
 
-;;;###autoload
-(defun store-substring (string idx obj)
-  "Embed OBJ (string or character) at index IDX of STRING."
-  (if (characterp obj)
-      (aset string idx obj)
-    (let ((len1 (length obj))
-	  (len2 (length string))
-	  (i 0))
-      (while (< i len1)
-	(aset string (+ idx i) (aref obj i))
-	(setq i (1+ i)))))
-  string)
-
-;;;###autoload
-(defun truncate-string-to-width (str end-column &optional start-column padding)
-  "Truncate string STR to end at column END-COLUMN.
-The optional 2nd arg START-COLUMN, if non-nil, specifies
-the starting column; that means to return the characters occupying
-columns START-COLUMN ... END-COLUMN of STR.
-
-The optional 3rd arg PADDING, if non-nil, specifies a padding character
-to add at the end of the result if STR doesn't reach column END-COLUMN,
-or if END-COLUMN comes in the middle of a character in STR.
-PADDING is also added at the beginning of the result
-if column START-COLUMN appears in the middle of a character in STR.
-
-If PADDING is nil, no padding is added in these cases, so
-the resulting string may be narrower than END-COLUMN."
-  (or start-column
-      (setq start-column 0))
-  (let ((len (length str))
-	(idx 0)
-	(column 0)
-	(head-padding "") (tail-padding "")
-	ch last-column last-idx from-idx)
-    (condition-case nil
-	(while (< column start-column)
-	  (setq ch (aref str idx)
-		column (+ column (char-width ch))
-		idx (1+ idx)))
-      (args-out-of-range (setq idx len)))
-    (if (< column start-column)
-	(if padding (make-string end-column padding) "")
-      (if (and padding (> column start-column))
-	  (setq head-padding (make-string (- column start-column) padding)))
-      (setq from-idx idx)
-      (if (< end-column column)
-	  (setq idx from-idx)
-	(condition-case nil
-	    (while (< column end-column)
-	      (setq last-column column
-		    last-idx idx
-		    ch (aref str idx)
-		    column (+ column (char-width ch))
-		    idx (1+ idx)))
-	  (args-out-of-range (setq idx len)))
-	(if (> column end-column)
-	    (setq column last-column idx last-idx))
-	(if (and padding (< column end-column))
-	    (setq tail-padding (make-string (- end-column column) padding))))
-      (setq str (substring str from-idx idx))
-      (if padding
-	  (concat head-padding str tail-padding)
-	str))))
-
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-(make-obsolete 'truncate-string 'truncate-string-to-width)
 

 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/F-10/xemacs-packages-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xemacs-packages-base.spec	16 Aug 2007 15:28:51 -0000	1.4
+++ xemacs-packages-base.spec	15 Oct 2009 21:42:11 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20070427
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -13,6 +13,9 @@ URL:            http://www.xemacs.org/Do
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.bz2
 Source99:       %{name}-checkout.sh
+# This patch has been committed upstream.  Remove obsolete definitions that
+# lead to a crash in the menubar code.
+Patch0:         xemacs-packages-base-20090901-mule-480845.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -43,6 +46,7 @@ developing or debugging the packages.
 
 %prep
 %setup -q
+%patch0
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -105,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 20070427-3
+- Backport mule-base patch to fix 480845 for F-10 users.
+
 * Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070427-2
 - License: GPLv2+ and GPL+