From 97af20a2d48d80c8dc4e4e66b63527b609a9657efc910e6e7d843d15223f4c95 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 10 Jul 2015 11:24:28 +0000 Subject: [PATCH 1/2] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=84 --- skel.init.el | 7 ++++--- xemacs-21.5.34-custom-fonts.patch | 26 ++++++++++++++++++++++++++ xemacs.changes | 6 ++++++ xemacs.spec | 5 ++++- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 xemacs-21.5.34-custom-fonts.patch diff --git a/skel.init.el b/skel.init.el index 1055217..10f1381 100644 --- a/skel.init.el +++ b/skel.init.el @@ -2,16 +2,17 @@ ;;; File name: ` ~/.xemacs/init.el ' ;;; --------------------- ;;; -;;; Copyright (c) 2002 SuSE Gmbh Nuernberg, Germany. +;;; Copyright (c) 2002,2015 SuSE Gmbh Nuernberg, Germany. ;;; -;;; Author: Werner Fink, 2002 +;;; Author: Werner Fink, 2002,2015 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Load custom file ;; ---------------- (setq custom-file "~/.xemacs/custom.el") -(load "~/.xemacs/custom.el" t t) +(if (file-exists-p custom-file) + (load-options-file custom-file)) ;; ;; More coding systems (UNICODE) diff --git a/xemacs-21.5.34-custom-fonts.patch b/xemacs-21.5.34-custom-fonts.patch new file mode 100644 index 0000000..bf16040 --- /dev/null +++ b/xemacs-21.5.34-custom-fonts.patch @@ -0,0 +1,26 @@ +--- + lisp/cus-face.el | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- lisp/cus-face.el ++++ lisp/cus-face.el 2015-07-10 10:52:20.177518702 +0000 +@@ -42,6 +42,9 @@ + (eval-when-compile + (require 'font)) + ++;; Simply to apply any custom faces ++(autoload 'initialize-custom-faces "faces") ++ + ;;; Declaring a face. + + ;;;###autoload +@@ -336,7 +339,8 @@ and non-nil, FACE will also be created a + COMMENT is a string comment about FACE. + + See `defface' for the format of SPEC." +- (apply #'custom-theme-set-faces 'user args)) ++ (apply #'custom-theme-set-faces 'user args) ++ (initialize-custom-faces)) + + ;;;###autoload + (defun custom-theme-set-faces (theme &rest args) diff --git a/xemacs.changes b/xemacs.changes index 8a8d30f..dd9b727 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 10 11:23:15 UTC 2015 - werner@suse.de + +- Add patch xemacs-21.5.34-custom-fonts.patch to be able to apply + any custom font/face change at startup (bsc#932321) + ------------------------------------------------------------------- Tue Jun 23 17:18:48 UTC 2015 - schwab@suse.de diff --git a/xemacs.spec b/xemacs.spec index f30b5bd..b88e28d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -89,8 +89,10 @@ Patch54: xemacs-21.5.34-gcc5.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch -# PATCH-FIC-UPSTREAM bsc#930170 +# PATCH-FIX-UPSTREAM bsc#930170 Patch57: xemacs-21.5.34-Xaw3D_I18N.patch +# PATCH-FIX-SUSE bsc#932321 +Patch58: xemacs-21.5.34-custom-fonts.patch Requires(pre): permissions Requires: ctags Requires: efont-unicode @@ -181,6 +183,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar. %patch292811 -p1 %patch301352 -p1 %patch57 -p0 +%patch58 -p0 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f find . -name CVS -type d | xargs rm -rf From 504412f5b3a94828edd90d9cd0b27446251556bce655655049ee8e61226861a8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 13 Jul 2015 11:17:23 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=85 --- skel.init.el | 3 +-- xemacs-21.5.34-custom-fonts.patch | 14 +++++++++++++- xemacs.changes | 5 +++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/skel.init.el b/skel.init.el index 10f1381..7545675 100644 --- a/skel.init.el +++ b/skel.init.el @@ -11,8 +11,7 @@ ;; Load custom file ;; ---------------- (setq custom-file "~/.xemacs/custom.el") -(if (file-exists-p custom-file) - (load-options-file custom-file)) +(load-options-file custom-file) ;; ;; More coding systems (UNICODE) diff --git a/xemacs-21.5.34-custom-fonts.patch b/xemacs-21.5.34-custom-fonts.patch index bf16040..dd2a9f6 100644 --- a/xemacs-21.5.34-custom-fonts.patch +++ b/xemacs-21.5.34-custom-fonts.patch @@ -1,6 +1,7 @@ --- lisp/cus-face.el | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + lisp/startup.el | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) --- lisp/cus-face.el +++ lisp/cus-face.el 2015-07-10 10:52:20.177518702 +0000 @@ -24,3 +25,14 @@ ;;;###autoload (defun custom-theme-set-faces (theme &rest args) +--- lisp/startup.el ++++ lisp/startup.el 2015-07-13 11:14:12.609518333 +0000 +@@ -1101,7 +1101,7 @@ exact problem." + Currently this does nothing but call `load', but it might be redefined + in the future to support automatically converting older options files to + a new format, when variables have changed, etc." +- (load filename)) ++ (load filename t)) + + (defun command-line-1 () + (cond diff --git a/xemacs.changes b/xemacs.changes index dd9b727..827d3f4 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 13 11:16:32 UTC 2015 - werner@suse.de + +- Avoid error on not existing custom.el + ------------------------------------------------------------------- Fri Jul 10 11:23:15 UTC 2015 - werner@suse.de