diff options
| author | Karoly Lorentey | 2005-04-25 11:49:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-04-25 11:49:38 +0000 |
| commit | 351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6 (patch) | |
| tree | b487571bcab596eefd9c6049e9d9354e8ec0ac67 /src/coding.c | |
| parent | 5ad1bc4dead80db3e81a6855714bc0b5817f5fc0 (diff) | |
| parent | 61b397cdc2019424c47f1fc5571fc127e2ed747d (diff) | |
| download | emacs-351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6.tar.gz emacs-351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 67, 270-278)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-272
src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-275
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-277
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-67
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-332
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index a1dd77872f5..b914574bbca 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -6671,7 +6671,7 @@ highest priority. */) | |||
| 6671 | STRING_MULTIBYTE (string)); | 6671 | STRING_MULTIBYTE (string)); |
| 6672 | } | 6672 | } |
| 6673 | 6673 | ||
| 6674 | /* Subroutine for Fsafe_coding_systems_region_internal. | 6674 | /* Subroutine for Ffind_coding_systems_region_internal. |
| 6675 | 6675 | ||
| 6676 | Return a list of coding systems that safely encode the multibyte | 6676 | Return a list of coding systems that safely encode the multibyte |
| 6677 | text between P and PEND. SAFE_CODINGS, if non-nil, is an alist of | 6677 | text between P and PEND. SAFE_CODINGS, if non-nil, is an alist of |