From: Ulf Jasper <ulf.jasper@web.de>
Date: Wed, 17 Dec 2014 20:42:23 +0000 (+0100)
Subject: Partially disabled previous change.
X-Git-Tag: emacs-25.0.90~2635^2~49
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af2952fb27c17d1aaeacb017ddb4eeacfd88853c;p=emacs.git

Partially disabled previous change.

* src/image.c (svg_load): Temporarily disabled filename thing for
not-a-file case as it can cause crashs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e10ffd8fcd..455ec1e8387 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-17  Ulf Jasper  <ulf.jasper@web.de>
+
+	Partially disabled previous change.
+
+	* image.c (svg_load): Temporarily disabled filename thing for
+	not-a-file case as it can cause crashs.
+
 2014-12-17  Ulf Jasper  <ulf.jasper@web.de>
 
 	Fix problem with images referenced within svg files. (bug#19373)
diff --git a/src/image.c b/src/image.c
index 0bebd45d893..954d66424d1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8823,8 +8823,10 @@ svg_load (struct frame *f, struct image *img)
 	  return 0;
 	}
       original_filename = BVAR (current_buffer, filename);
+      /* FIXME: disabled the filename thing for the time being as it
+         can cause crashs. */
       success_p = svg_load_image (f, img, SDATA (data), SBYTES (data),
-                                  SDATA(original_filename));
+                                  NULL /* SDATA(original_filename) */);
     }
 
   return success_p;