diff options
| author | Karoly Lorentey | 2005-12-11 22:42:40 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-11 22:42:40 +0000 |
| commit | be3d2d66d2dff979604134c5dc5fb506ded4aa54 (patch) | |
| tree | 683fc7324392d0023e995b593a627c294375aba1 /src/lread.c | |
| parent | 16986fcfcca94e88e620c38775e15f758aa44935 (diff) | |
| parent | ac8fcf0f17ab5d81f3b30db5599337d000ad12d9 (diff) | |
| download | emacs-be3d2d66d2dff979604134c5dc5fb506ded4aa54.tar.gz emacs-be3d2d66d2dff979604134c5dc5fb506ded4aa54.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-157
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-158
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-159
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-160
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-161
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-162
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-163
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-164
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-165
Update from CVS: texi/message.texi: Fix default values.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-166
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-167
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-168
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-448
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c index 234fbe6e395..e6f1987a50b 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1739,13 +1739,12 @@ read_escape (readcharfun, stringp, byterep) | |||
| 1739 | return c | alt_modifier; | 1739 | return c | alt_modifier; |
| 1740 | 1740 | ||
| 1741 | case 's': | 1741 | case 's': |
| 1742 | if (stringp) | ||
| 1743 | return ' '; | ||
| 1744 | c = READCHAR; | 1742 | c = READCHAR; |
| 1745 | if (c != '-') { | 1743 | if (c != '-') |
| 1746 | UNREAD (c); | 1744 | { |
| 1747 | return ' '; | 1745 | UNREAD (c); |
| 1748 | } | 1746 | return ' '; |
| 1747 | } | ||
| 1749 | c = READCHAR; | 1748 | c = READCHAR; |
| 1750 | if (c == '\\') | 1749 | if (c == '\\') |
| 1751 | c = read_escape (readcharfun, 0, byterep); | 1750 | c = read_escape (readcharfun, 0, byterep); |