summaryrefslogtreecommitdiff
path: root/src/charset.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-17 07:50:28 -0800
committerGlenn Morris <rgm@gnu.org>2018-02-17 07:50:28 -0800
commit4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch)
tree6c0a7893b3aab0166b35938338fa289c3a01df74 /src/charset.c
parentcb3863370cbe574810f796726faa39ba0de0a429 (diff)
parente5a29330aae4491fd384bacaff6f453c6434d322 (diff)
downloademacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'src/charset.c')
-rw-r--r--src/charset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c
index cc61300b6bd..05290e86b4e 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2332,7 +2332,7 @@ init_charset_once (void)
Don't make the value so small that the table is reallocated during
bootstrapping, as glibc malloc calls larger than just under 64 KiB
during an initial bootstrap wreak havoc after dumping; see the
- M_MMAP_THRESHOLD value in alloc.c, plus there is a extra overhead
+ M_MMAP_THRESHOLD value in alloc.c, plus there is an extra overhead
internal to glibc malloc and perhaps to Emacs malloc debugging. */
static struct charset charset_table_init[180];