diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/data.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index 955c39727bb..dedbd51f36e 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -377,7 +377,8 @@ DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, | |||
| 377 | 377 | ||
| 378 | DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, | 378 | DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, |
| 379 | 1, 1, 0, | 379 | 1, 1, 0, |
| 380 | doc: /* Return t if OBJECT is a multibyte string. */) | 380 | doc: /* Return t if OBJECT is a multibyte string. |
| 381 | Return nil if OBJECT is either a unibyte string, or not a string. */) | ||
| 381 | (Lisp_Object object) | 382 | (Lisp_Object object) |
| 382 | { | 383 | { |
| 383 | if (STRINGP (object) && STRING_MULTIBYTE (object)) | 384 | if (STRINGP (object) && STRING_MULTIBYTE (object)) |