diff options
| author | Miles Bader | 2005-07-14 08:02:00 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-07-14 08:02:00 +0000 |
| commit | bacb9790f594207469f22ed9f3e8085ab76e5e2b (patch) | |
| tree | b1cee62715d6cd2797f3122e4f058d7bc18ceef6 /src/coding.c | |
| parent | d3e4babdd1267fb5690a17949196640a47c6f159 (diff) | |
| parent | ead25b5cabbe092711864eae13a76437e6a65ce1 (diff) | |
| download | emacs-bacb9790f594207469f22ed9f3e8085ab76e5e2b.tar.gz emacs-bacb9790f594207469f22ed9f3e8085ab76e5e2b.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
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 77a344eba72..8b1d3a6b626 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -316,7 +316,7 @@ Lisp_Object QCdecode_translation_table, QCencode_translation_table; | |||
| 316 | Lisp_Object QCpost_read_conversion, QCpre_write_conversion; | 316 | Lisp_Object QCpost_read_conversion, QCpre_write_conversion; |
| 317 | 317 | ||
| 318 | extern Lisp_Object Qinsert_file_contents, Qwrite_region; | 318 | extern Lisp_Object Qinsert_file_contents, Qwrite_region; |
| 319 | Lisp_Object Qcall_process, Qcall_process_region, Qprocess_argument; | 319 | Lisp_Object Qcall_process, Qcall_process_region; |
| 320 | Lisp_Object Qstart_process, Qopen_network_stream; | 320 | Lisp_Object Qstart_process, Qopen_network_stream; |
| 321 | Lisp_Object Qtarget_idx; | 321 | Lisp_Object Qtarget_idx; |
| 322 | 322 | ||