* src/lread.c (intern_1): Make sure we'd find the symbol we add

Fixes: debbugs:20334

* src/xfaces.c (resolve_face_name): Don't use `intern' with Lisp_Strings.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/lread.c b/src/lread.c
index 050e43e2d08..fa9a63e63a9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3778,8 +3778,11 @@ intern_1 (const char *str, ptrdiff_t len)
   Lisp_Object obarray = check_obarray (Vobarray);
   Lisp_Object tem = oblookup (obarray, str, len, len);
 
-  return SYMBOLP (tem) ? tem : intern_driver (make_string (str, len),
-                                              obarray, tem);
+  return (SYMBOLP (tem) ? tem
+          /* The above `oblookup' was done on the basis of nchars==nbytes, so
+             the string has to be unibyte.  */
+          : intern_driver (make_unibyte_string (str, len),
+                           obarray, tem));
 }
 
 Lisp_Object
diff --git a/src/xfaces.c b/src/xfaces.c
index b2697220bce..d198c4be1a9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1822,7 +1822,7 @@ resolve_face_name (Lisp_Object face_name, bool signal_p)
   Lisp_Object tortoise, hare;
 
   if (STRINGP (face_name))
-    face_name = intern (SSDATA (face_name));
+    face_name = Fintern (face_name, Qnil);
 
   if (NILP (face_name) || !SYMBOLP (face_name))
     return face_name;