diff options
| author | Miles Bader | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/keymap.c | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 47e3f50786b..904e3c89d55 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2181,7 +2181,7 @@ spaces are put between sequence elements, etc. */) | |||
| 2181 | len += 2; | 2181 | len += 2; |
| 2182 | } | 2182 | } |
| 2183 | else if (len == 0) | 2183 | else if (len == 0) |
| 2184 | return empty_string; | 2184 | return empty_unibyte_string; |
| 2185 | return Fconcat (len - 1, args); | 2185 | return Fconcat (len - 1, args); |
| 2186 | } | 2186 | } |
| 2187 | 2187 | ||