* fringe.c (Fset_fringe_bitmap_face): Handle the noninteractive case.

Fixes: debbugs:9752

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d93c65fa1f8889e883b60bd15bddbda28690fb6..c221746824adf274c1b05bf14af2bc915b59038f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-09  Chong Yidong  <cyd@gnu.org>
+
+       * fringe.c (Fset_fringe_bitmap_face): Handle the noninteractive
+       case (Bug#9752).
+
 2012-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xdisp.c (vmessage): Treat frame message as multibyte.

diff --git a/src/fringe.c b/src/fringe.c
index c591d391e9fc170eaa5f170490690e83a5548136..39f7e8dbb54d983f911740111e7a4c6d89b55f91 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1671,23 +1671,27 @@ If FACE is nil, reset face to default fringe face.  */)
   (Lisp_Object bitmap, Lisp_Object face)
 {
   int n;
-  int face_id;
 
   CHECK_SYMBOL (bitmap);
   n = lookup_fringe_bitmap (bitmap);
   if (!n)
     error ("Undefined fringe bitmap");
 
+  /* The purpose of the following code is to signal an error if FACE
+     is not a face.  This is for the caller's convenience only; the
+     redisplay code should be able to fail gracefully.  Skip the check
+     if FRINGE_FACE_ID is unrealized (as in batch mode and during
+     daemon startup).  */
   if (!NILP (face))
     {
-      face_id = lookup_derived_face (SELECTED_FRAME (), face,
-                                    FRINGE_FACE_ID, 1);
-      if (face_id < 0)
+      struct frame *f = SELECTED_FRAME ();
+
+      if (FACE_FROM_ID (f, FRINGE_FACE_ID)
+         && lookup_derived_face (f, face, FRINGE_FACE_ID, 1) < 0)
        error ("No such face");
     }
 
   fringe_faces[n] = face;
-
   return Qnil;
 }