diff options
| author | Miles Bader | 2007-07-24 01:23:55 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-24 01:23:55 +0000 |
| commit | d918f936d5bfc7e126cc3b1bbf6ce80836c8d6f1 (patch) | |
| tree | c2dad763df03a5380928485043f9999c7a3533a6 /src/coding.c | |
| parent | a1ef75fc233b19951f65bd2a177751751f9676a3 (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-d918f936d5bfc7e126cc3b1bbf6ce80836c8d6f1.tar.gz emacs-d918f936d5bfc7e126cc3b1bbf6ce80836c8d6f1.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 816-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
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 e4ecbf50f62..59592fdd09d 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8400,7 +8400,7 @@ contents (not yet decoded). If `file-coding-system-alist' specifies a | |||
| 8400 | function to call for FILENAME, that function should examine the | 8400 | function to call for FILENAME, that function should examine the |
| 8401 | contents of BUFFER instead of reading the file. | 8401 | contents of BUFFER instead of reading the file. |
| 8402 | 8402 | ||
| 8403 | usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */) | 8403 | usage: (find-operation-coding-system OPERATION ARGUMENTS...) */) |
| 8404 | (nargs, args) | 8404 | (nargs, args) |
| 8405 | int nargs; | 8405 | int nargs; |
| 8406 | Lisp_Object *args; | 8406 | Lisp_Object *args; |