From 2443b15a91c66df52089b99d9e8fb2b54ecede2e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 27 Oct 2020 17:43:29 +0200 Subject: [PATCH 1/6] * src/buffer.c (syms_of_buffer) : Improve doc string. --- src/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/buffer.c b/src/buffer.c index 92ed405b6f7..5433c80edb0 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5625,6 +5625,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), From 85d1d8d76876db25c4e6aec4f7e5dc00cb0f1b4b Mon Sep 17 00:00:00 2001 From: Clemens Radermacher Date: Tue, 27 Oct 2020 18:31:47 +0100 Subject: [PATCH 2/6] Fix NEWS entry for fix of Bug#44080 --- etc/NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f0b5dd088af..61f9c0e1fe2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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 From 8abce5b0c62d41f1f6a074742af1a4749ae7d4ab Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Wed, 28 Oct 2020 10:22:37 +0000 Subject: [PATCH 3/6] CC Mode: Only recognize foo (*bar) as a function pointer when followed by ( * lisp/progmodes/cc-engine.el (c-forward-over-decl-or-cast-1): (after CASE 2) test variables got-suffix-after-parens and at-decl-end before invoking c-fdoc-shift-type-backward. --- lisp/progmodes/cc-engine.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 4b14dd131c2..f751e72de47 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -9858,8 +9858,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 From 2d15296db112740bcb6e7fa5808b57f12a99e49e Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Thu, 29 Oct 2020 08:45:29 -0400 Subject: [PATCH 4/6] Fix failure of 'emacs --daemon' on Cygwin * src/emacs.c (DAEMON_MUST_EXEC): Define unconditionally on Cygwin, not just if HAVE_NTGUI is defined. This fixes the failure of 'emacs --daemon' to start on the non-w32 Cygwin builds. (Bug#44285) --- src/emacs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emacs.c b/src/emacs.c index 11dcdb33fe0..3836f179abc 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -171,7 +171,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 From da6234e2dfd8c345bad1ff3075033b282b64f958 Mon Sep 17 00:00:00 2001 From: Noah Friedman Date: Thu, 29 Oct 2020 14:55:37 -0700 Subject: [PATCH 5/6] Make sure pixel sizes are zero when setting window size for ptys. * sysdep.c (set_window_size): Initialize data to zero to avoid passing any garbage from the stack to ioctl. --- src/sysdep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sysdep.c b/src/sysdep.c index cb2f7f2f23c..addaf4dc28a 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1447,6 +1447,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; @@ -1457,6 +1458,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; From 1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 30 Oct 2020 19:20:24 -0700 Subject: [PATCH 6/6] Improve reproducibility of generated -pkg.el files * lisp/emacs-lisp/package.el (package-generate-description-file): Don't include the full name of the source file in the header, since that varies non-reproducibly according to the build directory. https://bugs.debian.org/972861 Note that elpa.gnu.org's admin/archive-contents.el does this by hand and already only includes the nondirectory part. --- lisp/emacs-lisp/package.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index fc8dfe12ca2..504eb99eb1d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -963,7 +963,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