PHP Mode for Emacs Code

--- a/trunk/php-mode-src/php-mode.texi
+++ b/trunk/php-mode-src/php-mode.texi
@@ -205,6 +205,7 @@
 
 @cindex motion
 @cindex movement
+@cindex C mode, movement
 @cindex point
 The traditional point movement commands for Emacs@footnote{@xref{Moving
 Point, Changing the Location of Point, Changing the Location
@@ -315,14 +316,35 @@
 @c opportunity to create a cross-reference to those free
 @c manuals.
 
-@cindex indentation
-@cindex PEAR
+@cindex indentation, rules for
+@cindex C mode, indentation rules
+PHP mode's indentation settings inherit the defaults set by
+Emacs C mode, or the rules customized for C
+mode.@footnote{@xref{Customizing Indentation, Customizing
+Indentation, Customizing Indentation, ccmode,
+CC Mode Manual}.}
+
+@cindex PEAR, indentation
 @cindex spaces
 @cindex tabs
-PHP mode's indentation settings follow the PHP PEAR ``Coding
+PHP mode provides indentation settings that follow the PHP
+PEAR ``Coding
 Standards''@footnote{@url{http://pear.php.net/manual/en/standards.php}}.
-This has the consequence in PHP mode of making the
-indentation commands use four spaces, and not tabs.
+It has the consequence in PHP mode of making the indentation
+commands use four spaces, and not tabs.  This setting is
+turned on whenever the file name associated with a buffer
+includes the string ``PEAR'', case insensitive and the file
+ends in ``.php''.
+
+@cindex indentation, force PEAR rules
+@vindex php-mode-force-pear
+@findex customize-variable
+You can force the use of this setting for
+all files edited with PHP mode by setting
+@code{php-mode-force-pear} to non-nil.  Configure the
+variable with either @kbd{M-x customize-variable RET
+php-mode-force-pear RET}, or by setting its value in your
+Emacs initialization file (@file{~/.emacs}).
 
 @cindex HTML
 PHP does not appropriately indent HTML tags.  @xref{Embedded
@@ -342,12 +364,12 @@
 
 @table @code
 
-@cindex indentation level
+@cindex indentation, level of
 @vindex c-basic-offset
 @item c-basic-offset
-This style variable of CC mode controls how many columns in
+This style variable of C mode controls how many columns in
 the level of indentation.  By default this is 4 spaces in
-PHP mode (and in CC mode).
+PHP mode (and in C mode).
 @vindex indent-tabs-mode
 @item indent-tabs-mode
 Variable of Emacs that determines whether indentation
@@ -360,9 +382,15 @@
 buffer should be considered.  This is also traditionally
 described as setting the distance between ``tab stops''.  By
 default, PHP mode does not insert tabs for indentation.
-
-@end table
-
+@item php-mode-force-pear
+Use the indentation rules of PHP PEAR for all files opened
+in PHP mode.  See above.
+
+@end table
+
+@cindex indentation, commands for
+@cindex C mode, indentation rules
+@cindex C mode, indentation commands
 The usual commands for indenting in
 Emacs@footnote{@xref{Indentation Commands, Indentation
 Commands, Indentation Commands, emacs, GNU Emacs Manual}.}
@@ -526,7 +554,7 @@
 @var{php-manual-path} to the location of these files.
 Configure this setting with either @kbd{M-x
 customize-variable RET php-manual-path RET}, or by setting
-the value in your Emacs initialization file
+its value in your Emacs initialization file
 (@file{~/.emacs}).
 
 @c FIXME: Explain how the function name completion works, as
@@ -607,9 +635,9 @@
 
 @end enumerate
 
-Configure the variable with either @kbd{M-x
+Configure this setting with either @kbd{M-x
 customize-variable RET php-completion-file RET}, or by
-setting the value in your Emacs initialization file
+setting its value in your Emacs initialization file
 (@file{~/.emacs}).
 
 To create a file that can be set for
@@ -843,7 +871,7 @@
 To have Emacs automatically rescan the current buffer,
 change the setting for @code{imenu-auto-rescan} to non-nil
 with either @kbd{M-x customize-variable RET
-php-completion-file RET}, or by setting the value in your
+php-completion-file RET}, or by setting its value in your
 Emacs initialization file (@file{~/.emacs}).
 
 @node Change Logs
@@ -946,7 +974,7 @@
 @cindex XML
 @cindex SGML
 @cindex embedded code
-@cindex indentation
+@cindex indentation, markup
 @cindex HTML
 @findex php-mode
 @kindex M-x php-mode