Mercurial > emacs
comparison src/keymap.c @ 83632:cc587bfd19ca
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 11 Jun 2007 01:00:07 +0000 |
parents | 41aaac7180d5 323c37a99c44 |
children | 0ece58f6e0aa |
comparison
equal
deleted
inserted
replaced
83631:7d63b897231b | 83632:cc587bfd19ca |
---|---|
2179 { | 2179 { |
2180 args[len] = Fsingle_key_description (meta_prefix_char, Qnil); | 2180 args[len] = Fsingle_key_description (meta_prefix_char, Qnil); |
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 |
2188 if (STRINGP (list)) | 2188 if (STRINGP (list)) |
2189 size = SCHARS (list); | 2189 size = SCHARS (list); |