From: Po Lu <luangruo@yahoo.com>
Date: Thu, 20 Jan 2022 05:06:51 +0000 (+0800)
Subject: Make `nil' values of the `:position' underline property work correctly
X-Git-Tag: emacs-29.0.90~2923
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a43b6656056bab1016030668f8e579c75a33724b;p=emacs.git

Make `nil' values of the `:position' underline property work correctly

* src/xfaces.c (Finternal_set_lisp_face_attribute): Handle cases
where the underline property `:position' is nil.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index e148b5d3987..6a279f87192 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3165,14 +3165,15 @@ FRAME 0 means change the face on all frames, and change the default
           */
           valid_p = true;
 
-          while (!NILP (CAR_SAFE(list)))
+          while (!NILP (CAR_SAFE (list)))
             {
               key = CAR_SAFE (list);
               list = CDR_SAFE (list);
               val = CAR_SAFE (list);
               list = CDR_SAFE (list);
 
-              if (NILP (key) || NILP (val))
+              if (NILP (key) || (NILP (val)
+				 && !EQ (key, QCposition)))
                 {
                   valid_p = false;
                   break;