diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/fns.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.bz2 emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index 121143439e0..b4430292c75 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,5 +1,5 @@ /* Random utility Lisp functions. - Copyright (C) 1985-1987, 1993-1995, 1997-2011 + Copyright (C) 1985-1987, 1993-1995, 1997-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3247,7 +3247,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string, /* Base64-decode the data at FROM of LENGTH bytes into TO. If MULTIBYTE is nonzero, the decoded result should be in multibyte - form. If NCHARS_RETRUN is not NULL, store the number of produced + form. If NCHARS_RETURN is not NULL, store the number of produced characters in *NCHARS_RETURN. */ static ptrdiff_t |