[Emacs-diffs] emacs doc/emacs/ChangeLog doc/emacs/cmdargs.tex...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/29 02:25:08

Modified files:
        doc/emacs      : ChangeLog cmdargs.texi mule.texi 
        etc            : NEWS 
        lisp           : disp-table.el 
        src            : ChangeLog emacs.c 

Log message:
        * NEWS: Declare unibyte sessions obsolete.
        * emacs.c (USAGE1): Remove --(no-)multibyte, --(no-)unibyte.
        (main): Use enable-multibyte-characters rather than
        default-enable-multibyte-characters.  Output a warning message when
        running a unibyte session.
        * mule.texi (Enabling Multibyte):
        * cmdargs.texi (General Variables): Remove EMACS_UNIBYTE.
        (Initial Options): Remove --(no-)multibyte, --(no-)unibyte.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/ChangeLog?cvsroot=emacs&r1=1.360&r2=1.361
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/cmdargs.texi?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/mule.texi?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2068&r2=1.2069
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/disp-table.el?cvsroot=emacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7722&r2=1.7723
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs.c?cvsroot=emacs&r1=1.467&r2=1.468

Patches:
Index: doc/emacs/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -b -r1.360 -r1.361
--- doc/emacs/ChangeLog 20 Aug 2009 07:11:54 -0000      1.360
+++ doc/emacs/ChangeLog 29 Aug 2009 02:25:03 -0000      1.361
@@ -1,3 +1,9 @@
+2009-08-29  Stefan Monnier  <address@hidden>
+
+       * mule.texi (Enabling Multibyte):
+       * cmdargs.texi (General Variables): Remove EMACS_UNIBYTE.
+       (Initial Options): Remove --(no-)multibyte, --(no-)unibyte.
+
 2009-08-20  Glenn Morris  <address@hidden>
 
        * cal-xtra.texi (Non-Gregorian Diary): Mention ``Adar I'' special case.

Index: doc/emacs/cmdargs.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/cmdargs.texi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- doc/emacs/cmdargs.texi      1 Jul 2009 14:02:27 -0000       1.14
+++ doc/emacs/cmdargs.texi      29 Aug 2009 02:25:03 -0000      1.15
@@ -333,27 +333,6 @@
 @xref{Error Debugging,, Entering the Debugger on an Error, elisp, The
 GNU Emacs Lisp Reference Manual}.
 
address@hidden --unibyte
address@hidden --unibyte
address@hidden --no-multibyte
address@hidden --no-multibyte
address@hidden unibyte operation, command-line argument
-Do almost everything with single-byte buffers and strings.
-All buffers and strings are unibyte unless you (or a Lisp program)
-explicitly ask for a multibyte buffer or string.  (Note that Emacs
-always loads Lisp files in multibyte mode, even if @samp{--unibyte} is
-specified; see @ref{Enabling Multibyte}.)  Setting the environment
-variable @env{EMACS_UNIBYTE} has the same effect
-(@pxref{General Variables}).
-
address@hidden --multibyte
address@hidden --multibyte
address@hidden --no-unibyte
address@hidden --no-unibyte
-Inhibit the effect of @env{EMACS_UNIBYTE}, so that Emacs
-uses multibyte characters by default, as usual.
address@hidden table
-
 @node Command Example
 @appendixsec Command Argument Example
 
@@ -479,12 +458,6 @@
 @item CDPATH
 Used by the @code{cd} command to search for the directory you specify,
 when you specify a relative directory name.
address@hidden EMACS_UNIBYTE
address@hidden unibyte operation, environment variable
-Defining this environment variable with a nonempty value directs Emacs
-to do almost everything with single-byte buffers and strings.  It is
-equivalent to using the @samp{--unibyte} command-line option on each
-invocation.  @xref{Initial Options}.
 @item EMACSDATA
 Directory for the architecture-independent files that come with Emacs.
 This is used to initialize the Lisp variable @code{data-directory}.

Index: doc/emacs/mule.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/mule.texi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- doc/emacs/mule.texi 27 Aug 2009 04:24:00 -0000      1.18
+++ doc/emacs/mule.texi 29 Aug 2009 02:25:03 -0000      1.19
@@ -249,8 +249,8 @@
 
 @cindex turn multibyte support on or off
   Under very special circumstances, you may want to disable multibyte
-character support, either for Emacs as a whole, or for a single
-buffer.  When multibyte characters are disabled in a buffer, we call
+character support, for a specific buffer.
+When multibyte characters are disabled in a buffer, we call
 that @dfn{unibyte mode}.  In unibyte mode, each character in the
 buffer has a character code ranging from 0 through 255 (0377 octal); 0
 through 127 (0177 octal) represent @acronym{ASCII} characters, and 128
@@ -268,22 +268,12 @@
 @samp{raw-text} doesn't disable format conversion, uncompression, or
 auto mode selection.
 
address@hidden enable-multibyte-characters
address@hidden environment variables, and address@hidden characters
-  To turn off multibyte character support by default, start Emacs with
-the @samp{--unibyte} option (@pxref{Initial Options}), or set the
-environment variable @env{EMACS_UNIBYTE}.
-With @samp{--unibyte}, multibyte strings are not created during
-initialization from the values of environment variables,
address@hidden/etc/passwd} entries etc., even if those contain
address@hidden characters.
-
 @cindex Lisp files, and multibyte operation
 @cindex multibyte operation, and Lisp files
 @cindex unibyte operation, and Lisp files
 @cindex init file, and address@hidden characters
-  Emacs normally loads Lisp files as multibyte, regardless of whether
-you used @samp{--unibyte}.  This includes the Emacs initialization
+  Emacs normally loads Lisp files as multibyte.
+This includes the Emacs initialization
 file, @file{.emacs}, and the initialization files of Emacs packages
 such as Gnus.  However, you can specify unibyte loading for a
 particular Lisp file, by putting @address@hidden: t;-*-}} in a

Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2068
retrieving revision 1.2069
diff -u -b -r1.2068 -r1.2069
--- etc/NEWS    28 Aug 2009 19:26:38 -0000      1.2068
+++ etc/NEWS    29 Aug 2009 02:25:05 -0000      1.2069
@@ -34,6 +34,12 @@
 
 * Changes in Emacs 23.2
 
+** Unibyte sessions are declared obsolete.
+I.e. the use of the environment variable EMACS_UNIBYTE, or command line
+arguments --unibyte, --multibyte, --no-multibyte, and --no-unibyte
+is deprecated.  Similarly for custom-izing enable-multibyte-characters, or
+setting default-enable-multibyte-characters.
+
 ** The default value of `trash-directory' has changed to nil, which
 means that `move-file-to-trash' trashes files according to
 freedesktop.org specifications, the same method used by the Gnome,

Index: lisp/disp-table.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/disp-table.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- lisp/disp-table.el  5 Jan 2009 03:18:55 -0000       1.76
+++ lisp/disp-table.el  29 Aug 2009 02:25:06 -0000      1.77
@@ -216,14 +216,11 @@
 (defun standard-display-european (arg)
   "Semi-obsolete way to toggle display of ISO 8859 European characters.
 
-This function is semi-obsolete; if you want to do your editing with
-unibyte characters, it is better to `set-language-environment' coupled
-with either the `--unibyte' option or the EMACS_UNIBYTE environment
-variable, or else customize `enable-multibyte-characters'.
-
-With prefix argument, this command enables European character display
-if ARG is positive, disables it otherwise.  Otherwise, it toggles
-European character display.
+This function is semi-obsolete; you probably don't need it, or else you
+probably should use `set-language-environment' or `set-locale-environment'.
+
+This function enables European character display if ARG is positive,
+disables it if negative.  Otherwise, it toggles European character display.
 
 When this mode is enabled, characters in the range of 160 to 255
 display not as octal escapes, but as accented characters.  Codes 146
@@ -231,10 +228,9 @@
 ASCII codes for apostrophe and space.
 
 Enabling European character display with this command noninteractively
-from Lisp code also selects Latin-1 as the language environment, and
-selects unibyte mode for all Emacs buffers \(both existing buffers and
-those created subsequently).  This provides increased compatibility
-for users who call this function in `.emacs'."
+from Lisp code also selects Latin-1 as the language environment.
+This provides increased compatibility for users who call this function
+in `.emacs'."
 
   (if (or (<= (prefix-numeric-value arg) 0)
          (and (null arg)

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7722
retrieving revision 1.7723
diff -u -b -r1.7722 -r1.7723
--- src/ChangeLog       28 Aug 2009 22:50:11 -0000      1.7722
+++ src/ChangeLog       29 Aug 2009 02:25:06 -0000      1.7723
@@ -1,3 +1,10 @@
+2009-08-29  Stefan Monnier  <address@hidden>
+
+       * emacs.c (USAGE1): Remove --(no-)multibyte, --(no-)unibyte.
+       (main): Use enable-multibyte-characters rather than
+       default-enable-multibyte-characters.  Output a warning message when
+       running a unibyte session.
+
 2009-08-28  YAMAMOTO Mitsuharu  <address@hidden>
 
        * unexmacosx.c (print_load_command_name) [LC_DYLD_INFO]: Add cases

Index: src/emacs.c
===================================================================
RCS file: /sources/emacs/emacs/src/emacs.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -b -r1.467 -r1.468
--- src/emacs.c 26 Aug 2009 19:57:46 -0000      1.467
+++ src/emacs.c 29 Aug 2009 02:25:08 -0000      1.468
@@ -271,7 +271,6 @@
 --daemon                    start a server in the background\n\
 --debug-init                enable Emacs Lisp debugger for init file\n\
 --display, -d DISPLAY       use X server DISPLAY\n\
---multibyte, --no-unibyte   inhibit the effect of EMACS_UNIBYTE\n\
 --no-desktop                do not load a saved desktop\n\
 --no-init-file, -q          load neither ~/.emacs nor default.el\n\
 --no-shared-memory, -nl     do not use shared memory\n\
@@ -281,7 +280,6 @@
 --quick, -Q                 equivalent to -q --no-site-file --no-splash\n\
 --script FILE               run FILE as an Emacs Lisp script\n\
 --terminal, -t DEVICE       use DEVICE for terminal I/O\n\
---unibyte, --no-multibyte   run Emacs in unibyte mode\n\
 --user, -u USER             load ~USER/.emacs instead of your own\n\
 \n%s"
 
@@ -1439,8 +1437,8 @@
          Lisp_Object old_log_max;
          Lisp_Object symbol, tail;
 
-         symbol = intern ("default-enable-multibyte-characters");
-         Fset (symbol, Qnil);
+         symbol = intern ("enable-multibyte-characters");
+         Fset_default (symbol, Qnil);
 
          if (initialized)
            {
@@ -1467,6 +1465,7 @@
                  set_buffer_temp (current);
                }
            }
+         message ("Warning: unibyte sessions are obsolete and will disappear");
        }
     }