summaryrefslogtreecommitdiff
path: root/ChangeLog.2
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-02-15 14:11:03 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-02-15 14:11:03 -0800
commit220613e089ec012ae4ab319637365132ce8dc306 (patch)
tree715595598dfd3d80ba7c4306a0ea8f010b320db4 /ChangeLog.2
parentca03b85b9c1b8908f2651eaf594780c7b5217f61 (diff)
parentd4b93e11a519cf71beca69654fda158d01a26c3b (diff)
downloademacs-220613e089ec012ae4ab319637365132ce8dc306.tar.gz
Merge from origin/emacs-25
d4b93e1 Minor fixes in global-auto-composition-mode 02b037b Allow arithmetic operators inside C++ template constructs. 44b16f6 Avoid crashes in semi-malformed 'condition-case' 652e5b4 Allow arithmetic operators inside C++ template constructs. d9ea795 Fix regression with 'recent-keys' and keyboard macros 903603f Fix wording in a doc-view.el comment cf79616 ; Spelling fixes f8bf1b3 CONTRIBUTE cleanups and updates f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang 1834ac7 Port to x86 GCC 4.3.1 and earlier 8482949 Fix point movement under 'scroll-conservatively' c1313b5 Replace colon in file name (not legal on Windows) f7af26c Fix a typo in edt.texi 8badf95 Make 'mmap_realloc' on MS-Windows more reliable 856cd94 Grep alias `all' shall not match parent directory
Diffstat (limited to 'ChangeLog.2')
-rw-r--r--ChangeLog.24
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index 024eff0f051..6edc6546034 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -13864,7 +13864,7 @@
(unexec): Don't search for bss style sections by name. Instead,
use the last PT_LOAD header address range covered by p_memsz
but not p_filesz and match any SHT_NOBITS section in that
- address range. Simplify initialisation of section header vars.
+ address range. Simplify initialization of section header vars.
Don't assume that section headers are above bss segment. Move
copying of bss area out of section loop. Align .data2 section
to 1, since it now covers the entire bss area. For SHT_NOBITS
@@ -13923,7 +13923,7 @@
Separate out some of the more mechanical changes so following patches
are smaller.
- * src/unexelf.c (unexec): Rearrange initialisation of program
+ * src/unexelf.c (unexec): Rearrange initialization of program
header vars. Use pointer vars in loops rather than indexing
section header array via macros. Simplify _OBJC_ sym code
and reloc handling code.