rpms/xemacs/devel xemacs-21.5.28-revert-modified-245017.patch, NONE, 1.1 xemacs.spec, 1.36, 1.37

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.28-revert-modified-245017.patch 
Log Message:
* Sun Jun 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-3
- Apply upstream fix for #245017.


xemacs-21.5.28-revert-modified-245017.patch:

--- NEW FILE xemacs-21.5.28-revert-modified-245017.patch ---
2007-06-22  Aidan Kehoe  <kehoea at parhasard.net>

	* files.el (revert-buffer):
	* files.el (recover-file):
	Pass NOMODIFY to set-buffer-file-coding-systems after reverting a
	buffer and after recovering a file.


XEmacs Trunk source patch:
Diff command:   cvs -q diff -Nu
Files affected: lisp/files.el
===================================================================
RCS

Index: lisp/files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v
retrieving revision 1.77
diff -u -u -r1.77 files.el
--- lisp/files.el	2006/11/30 07:29:36	1.77
+++ lisp/files.el	2007/06/21 22:49:14
@@ -3473,7 +3473,7 @@
 				   (coding-system-base
 				    buffer-file-coding-system-when-loaded)
 				 buffer-file-coding-system-when-loaded)
-			       (not adjust-eol))))))
+			       (not adjust-eol) t)))))
 		      (goto-char (min opoint (point-max)))
 		      ;; Recompute the truename in case changes in symlinks
 		      ;; have changed the truename.
@@ -3616,7 +3616,8 @@
 			      (coding-system-for-read 'escape-quoted))
 			  (erase-buffer)
 			  (insert-file-contents file-name nil)
-			  (set-buffer-file-coding-system coding-system))
+			  (set-buffer-file-coding-system coding-system
+                                                         nil t))
 			(after-find-file nil nil t)
 			(return nil))
 		       (diff


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xemacs.spec	6 Jun 2007 21:26:20 -0000	1.36
+++ xemacs.spec	24 Jun 2007 09:54:09 -0000	1.37
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -44,6 +44,7 @@
 Patch7:         %{name}-21.5.27-finder-lisp-dir.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.28-destdir.patch
+Patch10:        %{name}-21.5.28-revert-modified-245017.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -197,6 +198,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p1
+%patch10 -p0
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
@@ -530,6 +532,9 @@
 
 
 %changelog
+* Sun Jun 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-3
+- Apply upstream fix for #245017.
+
 * Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-2
 - Set more dirs explicitly until upstream configure honors them better.
 - Borrow DESTDIR install patch from openSUSE.