diff options
| author | Glenn Morris | 2018-01-20 08:23:30 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-01-20 08:23:30 -0800 |
| commit | 60d5a13d28705e116e0a69c48f15d20aab9d3081 (patch) | |
| tree | 3536dd2a4f35997d27c0bb3806e9a0cf7800a5de /src/alloc.c | |
| parent | 194c530034e9413071bcdc92d573b2916363ebf1 (diff) | |
| parent | cfc94fd245076ee0fba49083a55b08bbadfec4eb (diff) | |
| download | emacs-60d5a13d28705e116e0a69c48f15d20aab9d3081.tar.gz emacs-60d5a13d28705e116e0a69c48f15d20aab9d3081.zip | |
Merge from origin/emacs-26
cfc94fd (origin/emacs-26) Don't mention 'vc-stay-local' in the user m...
8ce430b Fix a typo in calendar.texi
bb748b3 Minor improvement in wording of the Emacs manual
b603aff Revert "Fix tempfile creation when byte compiling"
4fd446e Fix tempfile creation when byte compiling
7f48a11 Improve the Emacs manual as suggested in emacs-manual-bugs
728ded0 * lisp/emacs-lisp/bytecomp.el: Tweak last change
c6c05e2 Unbreak building Emacs on FreeBSD
a41ad3d Don't unnecessarily use non-ASCII characters in C sources
c28d4b6 Portability fixes in emacs-module-tests
1d50c18 Add tests for term.el
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index f7e13464892..ea8fdeee483 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -5122,7 +5122,7 @@ typedef union | |||
| 5122 | #endif | 5122 | #endif |
| 5123 | 5123 | ||
| 5124 | /* Set *P to the address of the top of the stack. This must be a | 5124 | /* Set *P to the address of the top of the stack. This must be a |
| 5125 | macro, not a function, so that it is executed in the caller’s | 5125 | macro, not a function, so that it is executed in the caller's |
| 5126 | environment. It is not inside a do-while so that its storage | 5126 | environment. It is not inside a do-while so that its storage |
| 5127 | survives the macro. Callers should be declared NO_INLINE. */ | 5127 | survives the macro. Callers should be declared NO_INLINE. */ |
| 5128 | #ifdef HAVE___BUILTIN_UNWIND_INIT | 5128 | #ifdef HAVE___BUILTIN_UNWIND_INIT |