diff --git a/dotemacs.el b/dotemacs.el
index ade6d41..ec5adcb 100644
--- a/dotemacs.el
+++ b/dotemacs.el
@@ -13,3 +13,6 @@
 ;; default to better frame titles
 (setq frame-title-format
       (concat  "%b - emacs@" system-name))
+
+;; default to unified diffs
+(setq diff-switches "-u")
diff --git a/emacs.spec b/emacs.spec
index 5b8aa3c..a09b8fa 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -5,7 +5,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.3
-Release: 18
+Release: 19
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -44,6 +44,7 @@ Patch10: editfns.c-Fformat-multibyte-davej.patch
 Patch11: emacs-21.3-no-rpath.patch
 Patch12: emacs-21.3-lisp-textmodes-ispell-languages.patch
 Patch13: emacs-21.3-gud-libtool-fix.patch
+Patch14: emacs-xim-status-under-window-125413.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, autoconf213
 Buildrequires: XFree86-devel, Xaw3d-devel, libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel
@@ -129,6 +130,7 @@ sets are included in this package.
 %patch9 -p1 -b .ppc64
 %patch10 -p1 -b .multibyte
 %patch11 -p1 -b .rpath
+%patch14 -p1 -b .StatusArea
 # patches 2 and 3 touch configure.in
 autoconf-2.13
 
@@ -329,10 +331,15 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 29 2004 Jens Petersen <petersen@redhat.com> - 21.3-19
+- put XIM status under the window for now to stop httx from dying (125413):
+  add emacs-xim-status-under-window-125413.patch
+- default diff to unified format in .emacs
+
 * Thu Nov  4 2004 Jens Petersen <petersen@redhat.com> - 21.3-18
+- show emacs again in the desktop menu (132567)
 - require fonts-xorg-75dpi to prevent empty boxes at startup due to missing
   fonts (Johannes Kaiser, 137060)
-- turn on emacs again in the desktop menu (132567)
 
 * Mon Oct 18 2004 Jens Petersen <petersen@redhat.com> - 21.3-17
 - fix etag alternatives removal when uninstalling (Karsten Hopp, 136137)