Re: patch: removal of -q switch from emacspeak.sh

[Jarek Czekalski <jarekczek@xxxxxxxxxxx>]

The next step would be updating info files. I had have fun reading the 
whole paragraph in tutorial.html. It says that the first thing before 
using Emacspeak is removing the -q switch from the script and the 
unibyte mode. I guess this paragraph should be deleted once we do it in 
the repository.

I attach the patch modifying texi and org files. Could you regenerate 
html and info from that? They all belong to the repository, but if I 
remake them and include in the patch, it would be unreadable, because 
almost all resulting files get changed.

Jarek

Index: info/tutorial.org
===================================================================
--- info/tutorial.org	(revision 8561)
+++ info/tutorial.org	(working copy)
@@ -378,13 +378,8 @@
 
 **  Setting up your environment 
 
-This section talks about how to set up how Emacspeak speaks to you and how to make it present information for you in certain ways.  Before you can customize it though, you need to edit the shell script that launches Emacspeak found in /usr/bin/emacspeak.  To do this, type the following at a terminal:
+This section talks about how to set up how Emacspeak speaks to you and how to make it present information for you in certain ways.
 
-#+BEGIN_EXAMPLE
-sudo gedit /usr/bin/emacspeak
-#+END_EXAMPLE
-Once that's done, arrow down till you get to the part that begins to talk about exporting to unary mode.  You need to get rid of those lines.  Do this either by commenting them out with a # sine or by just deleting them altogether.  Unary mode isn't necessary for Emacspeak anymore and it will slow your system down some.  Next, find the line that begins with execute emacs -q -l followed by a path to the emacspeak file in the /usr/share/emacs directory.  You need to get rid of the -q flag since this will prevent you from being able to customize your Emacs at all.  If  you want to play it safe, comment the line out then select, copy and paste a copy of it underneath and just delete the -q from that one. When you are done, save your changes and you are ready to customize.
-
 ***  Voice rate, punctuation level and key echo 
 Hopefully, your distribution came with emacspeak more or less
 preconfigured for use without a setting turned on that totally drives
Index: info/introducing-emacspeak.texi
===================================================================
--- info/introducing-emacspeak.texi	(revision 8561)
+++ info/introducing-emacspeak.texi	(working copy)
@@ -1350,10 +1350,6 @@
 #$Id$
 # with minor changes, 2006 Mar 18
 
-if [ -f $HOME/.emacs ]
-then
-        INITSTR="-l $HOME/.emacs"
-fi
 @end group
 
 @group
@@ -1365,8 +1361,6 @@
                 elif [ "$CL" = "-d" ]; then
                 DTK_PROGRAM=dtk-soft
                 export DTK_PROGRAM
-        elif [ "$CL" = "-q" ]; then
-                INITSTR=""
         else
                 CL_ALL="$CL_ALL $CL"
         fi
@@ -1374,13 +1368,11 @@
 @end group
 
 @group
-export EMACS_UNIBYTE=1
 export DTK_PROGRAM=/usr/local/bin/eflite
 export DTK_TCL=/usr/local/bin/eflite
 
-exec emacs -q \
-           -l /usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el \
-           $INITSTR $CL_ALL
+exec emacs -l /usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el \
+           $CL_ALL
 ### end /usr/local/bin/emacspeak-eflite
 @end group
 @end smallexample
@@ -1399,10 +1391,6 @@
 #$Id$
 # with minor changes, 2006 Mar 18
 
-if [ -f $HOME/.emacs ]
-   then
-        INITSTR="-l $HOME/.emacs"
-fi
 @end group
 
 @group
@@ -1414,8 +1402,6 @@
                 elif [ "$CL" = "-d" ]; then
                 DTK_PROGRAM=dtk-soft
                 export DTK_PROGRAM
-        elif [ "$CL" = "-q" ]; then
-                INITSTR=""
         else
                 CL_ALL="$CL_ALL $CL"
         fi
@@ -1423,13 +1409,11 @@
 @end group
 
 @group
-export EMACS_UNIBYTE=1
 export DTK_PROGRAM=/usr/local/src/espeakf/espeakf.pl
 export DTK_TCL=/usr/bin/perl
 
-exec emacs -q \
-           -l /usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el \
-           $INITSTR $CL_ALL
+exec emacs -l /usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el \
+           $CL_ALL
 ### end /usr/local/bin/emacspeak-espeakf
 @end group
 @end smallexample