From c8a30acde87ad7e5421acabb784469311133f0e48b1a77d8d0a52ce13f50f1b0 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 11 Feb 2015 08:02:50 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=73
---
 site-start.el  | 8 ++++----
 xemacs.changes | 7 +++++++
 xemacs.patch   | 5 +++--
 xemacs.spec    | 4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/site-start.el b/site-start.el
index 76f078a..450e441 100644
--- a/site-start.el
+++ b/site-start.el
@@ -6,9 +6,8 @@
 ;;;         Mike Fabian <mfabian@suse.de>, 2004, 2005
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(setq load-path (delete (concat "/usr/share/xemacs/"
-				emacs-program-version
-				"/site-packages/lisp/term/")
+(setq load-path (delete (concat lisp-directory
+				"site-packages/lisp/term/")
 			load-path))
 
 ;;
@@ -327,7 +326,8 @@
 	       (emacs-version>= 21 5 6))
 	  (define-coding-system-alias 'native (intern tmp))))))
 
-(suse-set-coding-systems)
+(if load-user-init-file-p
+  (suse-set-coding-systems))
 
 ;; Set input mode
 (let ((value (current-input-mode)))
diff --git a/xemacs.changes b/xemacs.changes
index 836bce6..9832ebb 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 10 16:58:28 UTC 2015 - werner@suse.de
+
+- Correct some load paths 
+- Set progress-feedback-use-echo-area to true to allow some modes
+  like C-mode and TeX-mode to write messages (boo#905625 and bdc#902003)
+
 -------------------------------------------------------------------
 Sat Aug  9 05:36:13 UTC 2014 - i@marguerite.su
 
diff --git a/xemacs.patch b/xemacs.patch
index 231b2ef..198f496 100644
--- a/xemacs.patch
+++ b/xemacs.patch
@@ -246,7 +246,7 @@ Index: xemacs-21.5.29/lisp/site-init.el
 ===================================================================
 --- /dev/null
 +++ xemacs-21.5.29/lisp/site-init.el
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +;;;;
 +;;; xemacs-21.1.14/lisp/site-init.el
 +;;; Author: Werner Fink <werner@suse.de>
@@ -255,7 +255,8 @@ Index: xemacs-21.5.29/lisp/site-init.el
 +(garbage-collect)
 +
 +(setq gnus-default-nntp-server "news")
-+(setq w3-directory (concat "/usr/share/xemacs/" emacs-program-version "/lisp/w3"))
++(setq w3-directory (concat lisp-directory "w3"))
++(setq progress-feedback-use-echo-area t) ;; boo#905625 and bsc#902003
 +
 +(garbage-collect)
 +(garbage-collect)
diff --git a/xemacs.spec b/xemacs.spec
index 33e8aa5..3a31078 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xemacs
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -67,7 +67,7 @@ Source4:        xemacs.png
 Source5:        suse-xft-init.el
 Source6:        site-start.el
 Source7:        skel.init.el
-Source90:		xemacs-rpmlintrc
+Source90:       xemacs-rpmlintrc
 Patch0:         xemacs.patch
 # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package:
 Patch3:         xemacs-app-defaults.patch