procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2014-08-10 17:59:34 -07:00
commit c7367d2de3
20 changed files with 323 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/coding.c
View file

@ -1190,8 +1190,8 @@ alloc_destination (struct coding_system *coding, ptrdiff_t nbytes,
#define UTF_8_BOM_2 0xBB
#define UTF_8_BOM_3 0xBF
/* Unlike the other detect_coding_XXX, this function counts number of
characters and check EOL format. */
/* Unlike the other detect_coding_XXX, this function counts the number
of characters and checks the EOL format. */
static bool
detect_coding_utf_8 (struct coding_system *coding,
@ -11265,7 +11265,7 @@ decode text as usual. */);
DEFVAR_BOOL ("disable-ascii-optimization", disable_ascii_optimization,
doc: /* If non-nil, Emacs does not optimize code decoder for ASCII files.
Internal use only. Removed after the experimental optimizer gets stable. */);
Internal use only. Remove after the experimental optimizer becomes stable. */);
disable_ascii_optimization = 0;
DEFVAR_LISP ("translation-table-for-input", Vtranslation_table_for_input,