Merge from origin/emacs-27

1fc9de4b81 Improve reproducibility of generated -pkg.el files
da6234e2df Make sure pixel sizes are zero when setting window size fo...
2d15296db1 Fix failure of 'emacs --daemon' on Cygwin
8abce5b0c6 CC Mode: Only recognize foo (*bar) as a function pointer w...
85d1d8d768 Fix NEWS entry for fix of Bug#44080
2443b15a91 * src/buffer.c (syms_of_buffer) <fill-column>: Improve doc...

# Conflicts:
#	etc/NEWS

6 files changed, 15 insertions, 8 deletions

diff --git a/etc/NEWS.27 b/etc/NEWS.27
index f0b5dd088af..61f9c0e1fe2 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -35,10 +35,10 @@ This is a bug-fix release with no new features.
 
 * Lisp Changes in Emacs 27.2
 
-*** The behavior of the user option 'resize-mini-frames' has changed.
-If set to non-nil, resize the mini frame using the new function
-'fit-mini-frame-to-buffer' which won't skip leading or trailing empty
-lines of the buffer.
+** The behavior of the user option 'resize-mini-frames' has changed.
+If set to a non-nil value which isn't a function, resize the mini
+frame using the new function 'fit-mini-frame-to-buffer' which won't
+skip leading or trailing empty lines of the buffer.
 
 
 * Editing Changes in Emacs 27.2
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 23692aab32a..fbab6debd5d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -982,7 +982,8 @@ untar into a directory named DIR; otherwise, signal an error."
       (write-region
        (concat
         ";;; Generated package description from "
-        (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file)
+        (replace-regexp-in-string "-pkg\\.el\\'" ".el"
+                                  (file-name-nondirectory pkg-file))
         "  -*- no-byte-compile: t -*-\n"
         (prin1-to-string
          (nconc
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 1649f507363..75e2f0d21f5 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9894,8 +9894,9 @@ This function might do hidden buffer changes."
 		 (throw 'at-decl-or-cast t))
 
 	       (when (and got-parens
-			  (not got-function-name-prefix)
-			  ;; (not got-suffix-after-parens)
+			  (or (not got-function-name-prefix)
+			      (and (not got-suffix-after-parens)
+				   at-decl-end))
 			  (or backup-at-type
 			      maybe-typeless
 			      backup-maybe-typeless
diff --git a/src/buffer.c b/src/buffer.c
index 241f2d43a93..4fd2b0c8b17 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5645,6 +5645,9 @@ Use the command `abbrev-mode' to change this variable.  */);
   DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
 		     Qintegerp,
 		     doc: /* Column beyond which automatic line-wrapping should happen.
+It is used by filling commands, such as `fill-region' and `fill-paragraph',
+and by `auto-fill-mode', which see.
+See also `current-fill-column'.
 Interactively, you can set the buffer local value using \\[set-fill-column].  */);
 
   DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin),
diff --git a/src/emacs.c b/src/emacs.c
index e9e9661c398..172e4607694 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -170,7 +170,7 @@ static uintmax_t heap_bss_diff;
    We mark being in the exec'd process by a daemon name argument of
    form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors,
    NAME is the original daemon name, if any. */
-#if defined NS_IMPL_COCOA || (defined HAVE_NTGUI && defined CYGWIN)
+#if defined NS_IMPL_COCOA || defined CYGWIN
 # define DAEMON_MUST_EXEC
 #endif
 
diff --git a/src/sysdep.c b/src/sysdep.c
index a96de2c18bf..29c88f5308e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1440,6 +1440,7 @@ set_window_size (int fd, int height, int width)
 
   /* BSD-style.  */
   struct winsize size;
+  memset (&size, 0, sizeof (size));
   size.ws_row = height;
   size.ws_col = width;
 
@@ -1450,6 +1451,7 @@ set_window_size (int fd, int height, int width)
 
   /* SunOS - style.  */
   struct ttysize size;
+  memset (&size, 0, sizeof (size));
   size.ts_lines = height;
   size.ts_cols = width;