[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 721c520 1/2: Fix display of images on MS-Windows br
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 721c520 1/2: Fix display of images on MS-Windows broken by a recent commit |
Date: |
Sat, 18 May 2019 10:46:37 -0400 (EDT) |
branch: master
commit 721c520f36c151a738c47404b498672390139ada
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix display of images on MS-Windows broken by a recent commit
* src/image.c (initialize_image_type): Test if the type is in
Vlibrary_cache up front, and return true without calling the
'init' method if the type was already initialized.
---
src/image.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/image.c b/src/image.c
index b82bf12..071b92a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9696,15 +9696,15 @@ static bool
initialize_image_type (struct image_type const *type)
{
#ifdef WINDOWSNT
- bool (*init) (void) = type->init;
+ Lisp_Object typesym = builtin_lisp_symbol (type->type);
+ Lisp_Object tested = Fassq (typesym, Vlibrary_cache);
+ /* If we failed to load the library before, don't try again. */
+ if (CONSP (tested))
+ return !NILP (XCDR (tested)) ? true : false;
+ bool (*init) (void) = type->init;
if (init)
{
- /* If we failed to load the library before, don't try again. */
- Lisp_Object typesym = builtin_lisp_symbol (type->type);
- Lisp_Object tested = Fassq (typesym, Vlibrary_cache);
- if (CONSP (tested) && NILP (XCDR (tested)))
- return false;
bool type_valid = init ();
Vlibrary_cache = Fcons (Fcons (typesym, type_valid ? Qt : Qnil),
Vlibrary_cache);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 721c520 1/2: Fix display of images on MS-Windows broken by a recent commit,
Eli Zaretskii <=