(c-enable-xemacs-performance-kludge-p): New variable.

(c-default-style): Start doc string with *.

(c-default-style): Renamed from c-site-default-style.

1 files changed, 24 insertions, 9 deletions

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index dc69729aa88..06dc8432eb6 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1,6 +1,6 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
-;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1985,87,92,93,94,95,96,97,98 Free Software Foundation, Inc.
 
 ;; Authors:    1992-1997 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
@@ -309,13 +309,19 @@ this variable to nil."
   :type 'integer
   :group 'c)
 
-(defcustom c-site-default-style "gnu"
-  "Default style for your site.
-To change the default style at your site, you can set this variable to
-any style defined in `c-style-alist'.  However, if CC Mode is usually
-loaded into your Emacs at compile time, you will need to set this
-variable in the `site-init.el' file before CC Mode is loaded, then
-re-dump Emacs."
+(defcustom c-default-style "gnu"
+  "*Style which gets installed by default.
+
+The value of this variable can be any style defined in
+`c-style-alist', including styles you add, if you add them before CC
+Mode gets initialized.  Note that if you set any CC Mode variables in
+the top-level of your .emacs file (i.e. *not* in a hook), these get
+incorporated into the `user' style so you would need to add:
+
+  (setq c-default-style \"user\")
+
+to see your customizations.  This is also true if you use the Custom
+interface -- be sure to set the default style to `user'."
   :type 'string
   :group 'c)
 
@@ -381,6 +387,15 @@ This hook is only run once per Emacs session and can be used as a
   :type 'hook
   :group 'c)
 
+(defcustom c-enable-xemacs-performance-kludge-p t
+  "*Enables a XEmacs only hack that may improve speed for some coding styles.
+For styles that hang top-level opening braces (as is common with JDK
+Java coding styles) this can improve performance between 3 and 60
+times for core indentation functions (e.g. `c-parse-state').  For
+styles that conform to the Emacs recommendation of putting these
+braces in column zero, this may slightly degrade performance in some
+situations, but only by a few percentage points.  This variable only
+has effect in XEmacs.")
 
 
 ;; Non-customizable variables, still part of the interface to CC Mode
@@ -406,7 +421,7 @@ as designated in the variable `c-file-style'.")
 (defvar c-syntactic-context nil
   "Variable containing syntactic analysis list during indentation.")
 
-(defvar c-indentation-style c-site-default-style
+(defvar c-indentation-style c-default-style
   "Name of style installed in the current buffer.")