bug#7587: 23.2; `format-mode-line' makes Emacs crash

[Eli Zaretskii]

> Date: Fri, 10 Dec 2010 18:02:21 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 7587@debbugs.gnu.org
> 
> === modified file 'src/xfaces.c'
> --- src/xfaces.c      2010-08-06 10:12:41 +0000
> +++ src/xfaces.c      2010-12-10 15:58:25 +0000
> @@ -4673,9 +4673,6 @@ lookup_basic_face (struct frame *f, int 
>      case CURSOR_FACE_ID:             name = Qcursor;                 break;
>      case MOUSE_FACE_ID:                      name = Qmouse;                  
> break;
>      case MENU_FACE_ID:                       name = Qmenu;                   
> break;
> -
> -    default:
> -      abort ();          /* the caller is supposed to pass us a basic face 
> id */
>      }
>  
>    /* Do a quick scan through Vface_remapping_alist, and return immediately

Sorry, wrong patch.  I meant this one:

=== modified file 'src/xfaces.c'
--- src/xfaces.c        2010-08-06 10:12:41 +0000
+++ src/xfaces.c        2010-12-10 16:36:37 +0000
@@ -4675,7 +4675,7 @@ lookup_basic_face (struct frame *f, int 
     case MENU_FACE_ID:                 name = Qmenu;                   break;
 
     default:
-      abort ();            /* the caller is supposed to pass us a basic face 
id */
+      return face_id;          /* Nothing to do.  */
     }
 
   /* Do a quick scan through Vface_remapping_alist, and return immediately