diff options
| author | Miles Bader | 2007-06-11 00:58:11 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 00:58:11 +0000 |
| commit | fb9a13e3dca1685b81fcf4d345133fb34911594d (patch) | |
| tree | 181797239f450c33ca8fd0d4d18686bbfc68859d /src/keymap.c | |
| parent | 4d3e23e3e8273e820d69e0ecca0f409c4b9a179e (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-fb9a13e3dca1685b81fcf4d345133fb34911594d.tar.gz emacs-fb9a13e3dca1685b81fcf4d345133fb34911594d.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--unicode--0--patch-219
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 95534f9efa6..3649177d045 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2218,7 +2218,7 @@ spaces are put between sequence elements, etc. */) | |||
| 2218 | len += 2; | 2218 | len += 2; |
| 2219 | } | 2219 | } |
| 2220 | else if (len == 0) | 2220 | else if (len == 0) |
| 2221 | return empty_string; | 2221 | return empty_unibyte_string; |
| 2222 | return Fconcat (len - 1, args); | 2222 | return Fconcat (len - 1, args); |
| 2223 | } | 2223 | } |
| 2224 | 2224 | ||