diff options
| author | Chong Yidong | 2010-08-22 17:15:20 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-08-22 17:15:20 -0400 |
| commit | 198a7a97ff99b96523f7c0736aa303d305595094 (patch) | |
| tree | 956fc21f7bd577ca58c981dd67859409dfb0153e /src/doc.c | |
| parent | b0126eac41487b9bca5af5cbb2212ff5b2c58b80 (diff) | |
| download | emacs-198a7a97ff99b96523f7c0736aa303d305595094.tar.gz emacs-198a7a97ff99b96523f7c0736aa303d305595094.zip | |
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.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 3 |
1 files changed, 1 insertions, 2 deletions
| @@ -285,8 +285,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) | |||
| 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, |