master f56034ca3c6 01/14: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit f56034ca3c6626af331279caf347c6bedbab9ee8
Merge: 1f3995f65a0 c692bbc6596
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    c692bbc6596 Revert "Improve commentary in nsfns.m"
    bb885928d73 Fix NetBSD build --with-sound
    39873d6d5d1 Fix typo in pre-filter for underline property
---
 lisp/cus-face.el | 2 +-
 src/nsfns.m      | 6 +-----
 src/sound.c      | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index ec89b4f7ff6..a3a27263a7c 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -158,7 +158,7 @@
                    (or (and (consp real-value) (plist-get real-value :style))
                        'line))
                    (position (and (consp real-value)
-                                  (plist-get real-value :style))))
+                                  (plist-get real-value :position))))
               (list :color color :style style :position position))))
      ;; filter to make customized-value suitable for storing
      ,(lambda (cus-value)
diff --git a/src/nsfns.m b/src/nsfns.m
index 2519f1ebac8..f962de02cb9 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3840,11 +3840,7 @@ all_nonzero_ascii (unsigned char *str, ptrdiff_t n)
 /* Make a Lisp string from an NSString.  */
 - (Lisp_Object)lispString
 {
-  /* `make_string' creates a string with a given length, instead of
-     searching for a trailing NULL byte to determine its end.  This is
-     important because this function is called to convert NSString
-     objects containing clipboard data, which can contain NUL bytes,
-     into Lisp strings.  (bug#64697) */
+  // make_string behaves predictably and correctly with UTF-8 input.
   return make_string ([self UTF8String],
                       [self lengthOfBytesUsingEncoding: NSUTF8StringEncoding]);
 }
diff --git a/src/sound.c b/src/sound.c
index 145100cd433..ac29fc1aa1e 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1147,6 +1147,7 @@ alsa_write (struct sound_device *sd, const char *buffer, 
ptrdiff_t nbytes)
                 alsa_sound_perror ("Can't recover from underrun, prepare 
failed",
                                    err);
             }
+#ifdef ESTRPIPE
           else if (err == -ESTRPIPE)
             {
               while ((err = snd_pcm_resume (p->handle)) == -EAGAIN)
@@ -1160,6 +1161,7 @@ alsa_write (struct sound_device *sd, const char *buffer, 
ptrdiff_t nbytes)
                                        err);
                 }
             }
+#endif
           else
             alsa_sound_perror ("Error writing to sound device", err);