[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116212: Fix for fancy-splash image inconsistency
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r116212: Fix for fancy-splash image inconsistency |
Date: |
Fri, 31 Jan 2014 01:58:53 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116212
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16574
author: Darren Hoo <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-30 20:58:51 -0500
message:
Fix for fancy-splash image inconsistency
* lisp/startup.el (fancy-splash-image-file): New function,
split from fancy-splash-head.
(fancy-splash-head, use-fancy-splash-screens-p): Use it,
so that we are both using the same image.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/startup.el startup.el-20091113204419-o5vbwnq5f7feedwu-260
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-30 17:42:48 +0000
+++ b/lisp/ChangeLog 2014-01-31 01:58:51 +0000
@@ -1,3 +1,10 @@
+2014-01-31 Darren Hoo <address@hidden>
+
+ * startup.el (fancy-splash-image-file): New function,
+ split from fancy-splash-head.
+ (fancy-splash-head, use-fancy-splash-screens-p): Use it,
+ so that we are both using the same image. (Bug#16574)
+
2014-01-30 Glenn Morris <address@hidden>
* simple.el (eval-expression): Doc fix.
=== modified file 'lisp/startup.el'
--- a/lisp/startup.el 2014-01-01 07:43:34 +0000
+++ b/lisp/startup.el 2014-01-31 01:58:51 +0000
@@ -1590,24 +1590,26 @@
(declare-function image-size "image.c" (spec &optional pixels frame))
+(defun fancy-splash-image-file ()
+ (cond ((stringp fancy-splash-image) fancy-splash-image)
+ ((display-color-p)
+ (cond ((<= (display-planes) 8)
+ (if (image-type-available-p 'xpm)
+ "splash.xpm"
+ "splash.pbm"))
+ ((or (image-type-available-p 'svg)
+ (image-type-available-p 'imagemagick))
+ "splash.svg")
+ ((image-type-available-p 'png)
+ "splash.png")
+ ((image-type-available-p 'xpm)
+ "splash.xpm")
+ (t "splash.pbm")))
+ (t "splash.pbm")))
+
(defun fancy-splash-head ()
"Insert the head part of the splash screen into the current buffer."
- (let* ((image-file (cond ((stringp fancy-splash-image)
- fancy-splash-image)
- ((display-color-p)
- (cond ((<= (display-planes) 8)
- (if (image-type-available-p 'xpm)
- "splash.xpm"
- "splash.pbm"))
- ((or (image-type-available-p 'svg)
- (image-type-available-p 'imagemagick))
- "splash.svg")
- ((image-type-available-p 'png)
- "splash.png")
- ((image-type-available-p 'xpm)
- "splash.xpm")
- (t "splash.pbm")))
- (t "splash.pbm")))
+ (let* ((image-file (fancy-splash-image-file))
(img (create-image image-file))
(image-width (and img (car (image-size img))))
(window-width (window-width)))
@@ -1811,10 +1813,7 @@
(image-type-available-p 'pbm)))
(let ((frame (fancy-splash-frame)))
(when frame
- (let* ((img (create-image (or fancy-splash-image
- (if (and (display-color-p)
- (image-type-available-p 'xpm))
- "splash.xpm" "splash.pbm"))))
+ (let* ((img (create-image (fancy-splash-image-file)))
(image-height (and img (cdr (image-size img nil frame))))
;; We test frame-height so that, if the frame is split
;; by displaying a warning, that doesn't cause the normal
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116212: Fix for fancy-splash image inconsistency,
Glenn Morris <=