rpms/xemacs-packages-extra/F-11 xemacs-packages-extra-20091103-ediff-coding-system-532620.patch, 1.2, 1.3 xemacs-packages-extra.spec, 1.14, 1.15
Jerry James
jjames at fedoraproject.org
Fri Dec 4 19:57:28 UTC 2009
Author: jjames
Update of /cvs/pkgs/rpms/xemacs-packages-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983/F-11
Modified Files:
xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
xemacs-packages-extra.spec
Log Message:
* Fri Dec 4 2009 Jerry James <loganjerry at gmail.com> - 20090217-7
- Fix one more ediff problem found during testing (bz 537531).
xemacs-packages-extra-20091103-ediff-coding-system-532620.patch:
ChangeLog | 45 +++++++++++
Makefile | 2
ediff-diff.el | 45 +++++------
ediff-help.el | 6 -
ediff-hook.el | 137 ++++++++++++++++++-----------------
ediff-init.el | 71 +++++++++---------
ediff-merg.el | 36 ++++-----
ediff-mult.el | 130 +++++++++++++++++++++++++--------
ediff-ptch.el | 22 ++---
ediff-util.el | 38 ++++-----
ediff-vers.el | 27 +++---
ediff-wind.el | 30 +++----
ediff.el | 225 +++++++++++++++++++++++++++++++++++-----------------------
ediff.texi | 224 ++++++++++++++++++++++++++++++---------------------------
14 files changed, 608 insertions(+), 430 deletions(-)
Index: xemacs-packages-extra-20091103-ediff-coding-system-532620.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra-20091103-ediff-coding-system-532620.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 1 Dec 2009 17:58:49 -0000 1.2
+++ xemacs-packages-extra-20091103-ediff-coding-system-532620.patch 4 Dec 2009 19:57:27 -0000 1.3
@@ -1,6 +1,6 @@
diff -dur xemacs-packages.ORIG/ediff/ChangeLog xemacs-packages/ediff/ChangeLog
--- xemacs-packages.ORIG/ediff/ChangeLog 2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/ChangeLog 2009-12-01 09:39:07.126858310 -0700
++++ xemacs-packages/ediff/ChangeLog 2009-12-04 12:48:38.679838745 -0700
@@ -1,3 +1,48 @@
+2009-11-27 Norbert Koch <viteno at xemacs.org>
+
@@ -52,7 +52,7 @@ diff -dur xemacs-packages.ORIG/ediff/Cha
* Makefile (VERSION): XEmacs package 1.77 released.
diff -dur xemacs-packages.ORIG/ediff/ediff-diff.el xemacs-packages/ediff/ediff-diff.el
--- xemacs-packages.ORIG/ediff/ediff-diff.el 2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-diff.el 2009-12-01 09:39:07.132860465 -0700
++++ xemacs-packages/ediff/ediff-diff.el 2009-12-04 12:48:38.680839121 -0700
@@ -1,7 +1,7 @@
;;; ediff-diff.el --- diff-related utilities
@@ -207,7 +207,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-diff.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff.el xemacs-packages/ediff/ediff.el
--- xemacs-packages.ORIG/ediff/ediff.el 2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff.el 2009-12-01 09:39:07.214982518 -0700
++++ xemacs-packages/ediff/ediff.el 2009-12-04 12:48:38.681838988 -0700
@@ -1,7 +1,7 @@
;;; ediff.el --- a comprehensive visual interface to diff & patch
@@ -514,7 +514,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff-help.el xemacs-packages/ediff/ediff-help.el
--- xemacs-packages.ORIG/ediff/ediff-help.el 2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-help.el 2009-08-15 00:16:33.000000000 -0600
++++ xemacs-packages/ediff/ediff-help.el 2009-12-04 12:48:38.682839151 -0700
@@ -1,7 +1,7 @@
;;; ediff-help.el --- Code related to the contents of Ediff help buffers
@@ -544,7 +544,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
diff -dur xemacs-packages.ORIG/ediff/ediff-hook.el xemacs-packages/ediff/ediff-hook.el
--- xemacs-packages.ORIG/ediff/ediff-hook.el 2008-11-22 20:34:09.000000000 -0700
-+++ xemacs-packages/ediff/ediff-hook.el 2009-12-01 09:39:07.134857315 -0700
++++ xemacs-packages/ediff/ediff-hook.el 2009-12-04 12:48:38.682839151 -0700
@@ -1,7 +1,7 @@
;;; ediff-hook.el --- setup for Ediff's menus and autoloads
@@ -751,7 +751,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
diff -dur xemacs-packages.ORIG/ediff/ediff-init.el xemacs-packages/ediff/ediff-init.el
--- xemacs-packages.ORIG/ediff/ediff-init.el 2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-init.el 2009-12-01 09:39:07.140861277 -0700
++++ xemacs-packages/ediff/ediff-init.el 2009-12-04 12:50:03.743022940 -0700
@@ -1,7 +1,7 @@
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
@@ -969,8 +969,14 @@ diff -dur xemacs-packages.ORIG/ediff/edi
:type 'integer
:group 'ediff)
-@@ -1549,6 +1551,9 @@
- (if (eventp event-or-key) (event-key event-or-key) event-or-key)
+@@ -1545,10 +1547,13 @@
+ (t (error "Error"))))
+
+ (defun ediff-event-key (event-or-key)
+- (if (featurep 'xemacs)
+- (if (eventp event-or-key) (event-key event-or-key) event-or-key)
++ (if (and (featurep 'xemacs) (eventp event-or-key))
++ (event-to-character event-or-key t t)
event-or-key))
+(defun ediff-last-command-char ()
@@ -981,7 +987,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
(and (ediff-window-display-p) (frame-live-p frame)
diff -dur xemacs-packages.ORIG/ediff/ediff-merg.el xemacs-packages/ediff/ediff-merg.el
--- xemacs-packages.ORIG/ediff/ediff-merg.el 2008-11-15 22:21:45.000000000 -0700
-+++ xemacs-packages/ediff/ediff-merg.el 2009-12-01 09:39:07.142859733 -0700
++++ xemacs-packages/ediff/ediff-merg.el 2009-12-04 12:48:38.684839380 -0700
@@ -1,7 +1,7 @@
;;; ediff-merg.el --- merging utilities
@@ -1093,7 +1099,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-merg.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff-mult.el xemacs-packages/ediff/ediff-mult.el
--- xemacs-packages.ORIG/ediff/ediff-mult.el 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-mult.el 2009-12-01 09:39:07.149875626 -0700
++++ xemacs-packages/ediff/ediff-mult.el 2009-12-04 12:48:38.685839135 -0700
@@ -1,7 +1,7 @@
;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
@@ -1330,7 +1336,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-mult.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff-ptch.el xemacs-packages/ediff/ediff-ptch.el
--- xemacs-packages.ORIG/ediff/ediff-ptch.el 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-ptch.el 2009-08-15 00:16:34.000000000 -0600
++++ xemacs-packages/ediff/ediff-ptch.el 2009-12-04 12:48:38.685839135 -0700
@@ -1,7 +1,7 @@
;;; ediff-ptch.el --- Ediff's patch support
@@ -1401,7 +1407,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-ptch.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff.texi xemacs-packages/ediff/ediff.texi
--- xemacs-packages.ORIG/ediff/ediff.texi 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff.texi 2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff.texi 2009-12-04 12:48:38.686839033 -0700
@@ -25,12 +25,12 @@
This file documents Ediff, a comprehensive visual interface to Unix diff
and patch utilities.
@@ -1688,7 +1694,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
@ignore
diff -dur xemacs-packages.ORIG/ediff/ediff-util.el xemacs-packages/ediff/ediff-util.el
--- xemacs-packages.ORIG/ediff/ediff-util.el 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-util.el 2009-12-01 09:39:07.203961749 -0700
++++ xemacs-packages/ediff/ediff-util.el 2009-12-04 12:48:38.688839037 -0700
@@ -1,7 +1,7 @@
;;; ediff-util.el --- the core commands and utilities of ediff
@@ -1816,7 +1822,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
(with-current-buffer ediff-custom-diff-buffer
diff -dur xemacs-packages.ORIG/ediff/ediff-vers.el xemacs-packages/ediff/ediff-vers.el
--- xemacs-packages.ORIG/ediff/ediff-vers.el 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-vers.el 2009-12-01 09:39:07.212891653 -0700
++++ xemacs-packages/ediff/ediff-vers.el 2009-12-04 12:48:38.688839037 -0700
@@ -1,7 +1,7 @@
;;; ediff-vers.el --- version control interface to Ediff
@@ -1890,7 +1896,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-vers.el ends here
diff -dur xemacs-packages.ORIG/ediff/ediff-wind.el xemacs-packages/ediff/ediff-wind.el
--- xemacs-packages.ORIG/ediff/ediff-wind.el 2008-11-15 22:21:46.000000000 -0700
-+++ xemacs-packages/ediff/ediff-wind.el 2009-08-15 00:16:35.000000000 -0600
++++ xemacs-packages/ediff/ediff-wind.el 2009-12-04 12:48:38.689839136 -0700
@@ -1,7 +1,7 @@
;;; ediff-wind.el --- window manipulation utilities
@@ -2000,7 +2006,7 @@ diff -dur xemacs-packages.ORIG/ediff/edi
;;; ediff-wind.el ends here
diff -dur xemacs-packages.ORIG/ediff/Makefile xemacs-packages/ediff/Makefile
--- xemacs-packages.ORIG/ediff/Makefile 2008-12-01 02:22:37.000000000 -0700
-+++ xemacs-packages/ediff/Makefile 2009-12-01 09:39:07.130861623 -0700
++++ xemacs-packages/ediff/Makefile 2009-12-04 12:48:38.689839136 -0700
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xemacs-packages-extra.spec 1 Dec 2009 18:28:52 -0000 1.14
+++ xemacs-packages-extra.spec 4 Dec 2009 19:57:27 -0000 1.15
@@ -3,7 +3,7 @@
Name: xemacs-packages-extra
Version: 20090217
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Collection of XEmacs lisp packages
Group: Applications/Editors
@@ -249,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 4 2009 Jerry James <loganjerry at gmail.com> - 20090217-6
+- Fix one more ediff problem found during testing (bz 537531).
+
* Tue Dec 1 2009 Jerry James <loganjerry at gmail.com> - 20090217-5
- The last ediff fix included more Emacs-specific code (bz 537531).
- Don't package x-symbol fonts, which are only needed on Windows anyway.
More information about the fedora-extras-commits
mailing list