From 504412f5b3a94828edd90d9cd0b27446251556bce655655049ee8e61226861a8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 13 Jul 2015 11:17:23 +0000 Subject: [PATCH] . 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