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

Merged from emacs@sv.gnu.org

Browse source 
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-285
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-286
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-287
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-288
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-102
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
This commit is contained in:
Karoly Lorentey 2006-05-20 10:32:11 +00:00
commit aabd1a8b13
44 changed files with 1215 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/coding.c
View file

@ -365,6 +365,7 @@ Lisp_Object Qno_conversion, Qundecided;
Lisp_Object Qcoding_system_history;
Lisp_Object Qsafe_chars;
Lisp_Object Qvalid_codes;
Lisp_Object Qascii_incompatible;
extern Lisp_Object Qinsert_file_contents, Qwrite_region;
Lisp_Object Qcall_process, Qcall_process_region;
@ -3621,7 +3622,10 @@ setup_coding_system (coding_system, coding)
= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
}
else
coding->eol_type = CODING_EOL_LF;
{
coding->common_flags = 0;
coding->eol_type = CODING_EOL_LF;
}
coding_type = XVECTOR (coding_spec)->contents[0];
/* Try short cut. */
@ -3681,6 +3685,12 @@ setup_coding_system (coding_system, coding)
if (!NILP (val))
coding->composing = COMPOSITION_NO;
/* If the coding system is ascii-incompatible, record it in
common_flags. */
val = Fplist_get (plist, Qascii_incompatible);
if (! NILP (val))
coding->common_flags |= CODING_ASCII_INCOMPATIBLE_MASK;
switch (XFASTINT (coding_type))
{
case 0:
@ -7820,6 +7830,9 @@ syms_of_coding ()
Qvalid_codes = intern ("valid-codes");
staticpro (&Qvalid_codes);
Qascii_incompatible = intern ("ascii-incompatible");
staticpro (&Qascii_incompatible);
Qemacs_mule = intern ("emacs-mule");
staticpro (&Qemacs_mule);