Mercurial > emacs
comparison src/doc.c @ 109956:ce960720ed3f
Make obsolete --unibyte argument do nothing (Bug#6886).
* src/emacs.c (main): Remove --unibyte handling (Bug#6886).
* lisp/startup.el (command-line-1): Issue warning for ignored arguments
--unibyte, etc (Bug#6886).
* doc/lispref/nonascii.texi (Text Representations):
* doc/lispref/loading.texi (Loading Non-ASCII):
* doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete
--unibyte command-line argument.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 22 Aug 2010 17:15:20 -0400 |
| parents | 53205019b195 |
| children | 3132ab826fc5 |
comparison
equal
deleted
inserted
replaced
| 109955:4ed076eb5529 | 109956:ce960720ed3f |
|---|---|
| 283 if (unibyte) | 283 if (unibyte) |
| 284 return make_unibyte_string (get_doc_string_buffer + offset, | 284 return make_unibyte_string (get_doc_string_buffer + offset, |
| 285 to - (get_doc_string_buffer + offset)); | 285 to - (get_doc_string_buffer + offset)); |
| 286 else | 286 else |
| 287 { | 287 { |
| 288 /* Let the data determine whether the string is multibyte, | 288 /* The data determines whether the string is multibyte. */ |
| 289 even if Emacs is running in --unibyte mode. */ | |
| 290 int nchars = multibyte_chars_in_text (get_doc_string_buffer + offset, | 289 int nchars = multibyte_chars_in_text (get_doc_string_buffer + offset, |
| 291 to - (get_doc_string_buffer + offset)); | 290 to - (get_doc_string_buffer + offset)); |
| 292 return make_string_from_bytes (get_doc_string_buffer + offset, | 291 return make_string_from_bytes (get_doc_string_buffer + offset, |
| 293 nchars, | 292 nchars, |
| 294 to - (get_doc_string_buffer + offset)); | 293 to - (get_doc_string_buffer + offset)); |