diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/lread.c | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index d38fb515bff..2a7b7a8585d 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Lisp parsing and input streams. | 1 | /* Lisp parsing and input streams. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1985-1989, 1993-1995, 1997-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -3119,7 +3119,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 3119 | if (uninterned_symbol && ! NILP (Vpurify_flag)) | 3119 | if (uninterned_symbol && ! NILP (Vpurify_flag)) |
| 3120 | name = make_pure_string (read_buffer, nchars, nbytes, multibyte); | 3120 | name = make_pure_string (read_buffer, nchars, nbytes, multibyte); |
| 3121 | else | 3121 | else |
| 3122 | name = make_specified_string (read_buffer, nchars, nbytes,multibyte); | 3122 | name = make_specified_string (read_buffer, nchars, nbytes, multibyte); |
| 3123 | result = (uninterned_symbol ? Fmake_symbol (name) | 3123 | result = (uninterned_symbol ? Fmake_symbol (name) |
| 3124 | : Fintern (name, Qnil)); | 3124 | : Fintern (name, Qnil)); |
| 3125 | 3125 | ||