diff options
| author | Miles Bader | 2007-07-24 01:25:28 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-24 01:25:28 +0000 |
| commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
| tree | c87779daf272535b621216ef05179fa48102e57e /src/coding.c | |
| parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-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--multi-tty--0--patch-26
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 2b7a7422d5c..52fe696b23d 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7482,7 +7482,7 @@ contents (not yet decoded). If `file-coding-system-alist' specifies a | |||
| 7482 | function to call for FILENAME, that function should examine the | 7482 | function to call for FILENAME, that function should examine the |
| 7483 | contents of BUFFER instead of reading the file. | 7483 | contents of BUFFER instead of reading the file. |
| 7484 | 7484 | ||
| 7485 | usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */) | 7485 | usage: (find-operation-coding-system OPERATION ARGUMENTS...) */) |
| 7486 | (nargs, args) | 7486 | (nargs, args) |
| 7487 | int nargs; | 7487 | int nargs; |
| 7488 | Lisp_Object *args; | 7488 | Lisp_Object *args; |