aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2020-11-02 09:27:40 -0800
committerGlenn Morris2020-11-02 09:27:40 -0800
commit018e0c36fbae6570e58a95d2ac47c0577a496f91 (patch)
tree058be5b8f0a5145d8739e240058c37d1d267afbf /src
parente654b41c6f9eae424736bc8845d92b9dd97ccd3e (diff)
parent1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2 (diff)
downloademacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.tar.gz
emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c3
-rw-r--r--src/emacs.c2
-rw-r--r--src/sysdep.c2
3 files changed, 6 insertions, 1 deletions
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. */);
5645 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column), 5645 DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
5646 Qintegerp, 5646 Qintegerp,
5647 doc: /* Column beyond which automatic line-wrapping should happen. 5647 doc: /* Column beyond which automatic line-wrapping should happen.
5648It is used by filling commands, such as `fill-region' and `fill-paragraph',
5649and by `auto-fill-mode', which see.
5650See also `current-fill-column'.
5648Interactively, you can set the buffer local value using \\[set-fill-column]. */); 5651Interactively, you can set the buffer local value using \\[set-fill-column]. */);
5649 5652
5650 DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin), 5653 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;
170 We mark being in the exec'd process by a daemon name argument of 170 We mark being in the exec'd process by a daemon name argument of
171 form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors, 171 form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors,
172 NAME is the original daemon name, if any. */ 172 NAME is the original daemon name, if any. */
173#if defined NS_IMPL_COCOA || (defined HAVE_NTGUI && defined CYGWIN) 173#if defined NS_IMPL_COCOA || defined CYGWIN
174# define DAEMON_MUST_EXEC 174# define DAEMON_MUST_EXEC
175#endif 175#endif
176 176
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)
1440 1440
1441 /* BSD-style. */ 1441 /* BSD-style. */
1442 struct winsize size; 1442 struct winsize size;
1443 memset (&size, 0, sizeof (size));
1443 size.ws_row = height; 1444 size.ws_row = height;
1444 size.ws_col = width; 1445 size.ws_col = width;
1445 1446
@@ -1450,6 +1451,7 @@ set_window_size (int fd, int height, int width)
1450 1451
1451 /* SunOS - style. */ 1452 /* SunOS - style. */
1452 struct ttysize size; 1453 struct ttysize size;
1454 memset (&size, 0, sizeof (size));
1453 size.ts_lines = height; 1455 size.ts_lines = height;
1454 size.ts_cols = width; 1456 size.ts_cols = width;
1455 1457