From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 23 Nov 2008 15:06:44 +0000 (+0000)
Subject: (uniscribe_encode_char): Ensure context is restored before returning.
X-Git-Tag: emacs-pretest-23.0.90~1590
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a608bcbf777d126198b046c317af58cf4f373002;p=emacs.git

(uniscribe_encode_char): Ensure context is restored before returning.
---

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index ce2dd166313..25224302247 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -524,9 +524,9 @@ uniscribe_encode_char (font, c)
               result = ScriptGetCMap (context, &(uniscribe_font->cache),
                                       ch, len, 0, glyphs);
               if (SUCCEEDED (result))
-                return glyphs[0];
+                code = glyphs[0];
               else
-                return 0; /* notdef - enough in some cases to get the script
+                code = 0; /* notdef - enough in some cases to get the script
                              engine working, but not others... */
             }
 	}