From d92d0dd4f2d6b04a3ae148ac36ff96c9b109196d Mon Sep 17 00:00:00 2001 From: Joakim Verona Date: Mon, 23 Jun 2014 10:04:07 +0200 Subject: [PATCH] fixes: PREPARE_FACE_FOR_DISPLAY was removed, DEFUN less lenient --- src/xdisp.c | 2 +- src/xwidget.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 82ec9e8ce4e..975f872389d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -25347,7 +25347,7 @@ produce_xwidget_glyph (struct it *it) face = FACE_FROM_ID (it->f, it->face_id); eassert (face); /* Make sure X resources of the face is loaded. */ - PREPARE_FACE_FOR_DISPLAY (it->f, face); + prepare_face_for_display (it->f, face); xw = it->xwidget; it->ascent = it->phys_ascent = glyph_ascent = xw->height/2; diff --git a/src/xwidget.c b/src/xwidget.c index aafdfe63662..15e5978a2fb 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -606,7 +606,8 @@ xwidget_osr_event_forward (GtkWidget *widget, } GIRepository *girepository ; -DEFUN( "xwgir-require-namespace",Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0, + +DEFUN ("xwgir-require-namespace", Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0, doc: /*require a namespace. must be done for all namespaces we want to use, before using other xwgir functions.*/) (Lisp_Object lnamespace, Lisp_Object lnamespace_version) { -- 2.39.2