andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
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
This commit is contained in:
Glenn Morris 2020-11-02 09:27:40 -08:00
commit 018e0c36fb
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/NEWS.27
View file

@ -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

3
lisp/emacs-lisp/package.el
View file

@ -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

5
lisp/progmodes/cc-engine.el
View file

@ -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

3
src/buffer.c
View file

@ -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),

2
src/emacs.c
View file

@ -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

2
src/sysdep.c
View file

@ -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;