Anonymous avatar Anonymous committed cb78aa8

2001-12-18 Steve Youngs <youngs@xemacs.org>;

* old-c-mode.el: New file.

* p4.el: Ditto.

* php-mode.el: Ditto.

* pydoc.el: Ditto.

* verilog-mode.el: Sync to author version 3.57

* Makefile (REQUIRES): Add vc, speedbar for p4 and php-mode.
(ELCS): Add old-c-mode.elc, p4.elc, php-mode.elc, pydoc.elc
(EXTRA_SOURCES): Add pydoc-el-README, pydoc_lisp.py

* package-info.in (provides): Update for new files.

Comments (0)

Files changed (10)

+2001-12-18  Steve Youngs  <youngs@xemacs.org>
+
+	* old-c-mode.el: New file.
+
+	* p4.el: Ditto.
+
+	* php-mode.el: Ditto.
+
+	* pydoc.el: Ditto.
+
+	* verilog-mode.el: Sync to author version 3.57
+
+	* Makefile (REQUIRES): Add vc, speedbar for p4 and php-mode.
+	(ELCS): Add old-c-mode.elc, p4.elc, php-mode.elc, pydoc.elc
+	(EXTRA_SOURCES): Add pydoc-el-README, pydoc_lisp.py
+
+	* package-info.in (provides): Update for new files.
+	
 2001-12-05  Vaclav Barta  <vbar@comp.cz>
 
 	* cperl-mode.pl: Got fill-paragraph-or-region to use
 PACKAGE = prog-modes
 PKG_TYPE = single-file
 REQUIRES = mail-lib xemacs-devel xemacs-base cc-mode ps-print-nomule \
-	fsf-compat edit-utils ediff emerge efs
+	fsf-compat edit-utils ediff emerge efs vc speedbar prog-modes
 CATEGORY = standard
 
 ELCS = asm-mode.elc autoconf-mode.elc awk-mode.elc cl-indent.elc \
 	icon.elc ksh-mode.elc m4-mode.elc make-mode.elc \
 	mode-compile.elc modula2.elc pascal.elc perl-mode.elc \
 	postscript.elc prolog.elc python-mode.elc rexx-mode.elc simula.elc \
-	sql.elc tcl.elc teco.elc verilog-mode.elc vrml-mode.elc
+	sql.elc tcl.elc teco.elc verilog-mode.elc vrml-mode.elc p4.elc \
+	old-c-mode.elc php-mode.elc pydoc.elc
 
+EXTRA_SOURCES = pydoc-el-README pydoc_lisp.py
 
 include ../../XEmacs.rules
 
+;;; old-c-mode.el --- Old and fast mode for C code in XEmacs
+
+;; Copyright (C) 1985, 86, 87, 92, 94, 95 Free Software Foundation, Inc.
+
+;; Maintainer: Ben Wing <ben@xemacs.org>
+;; Keywords: c
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Ported from GNU Emacs 20.7.
+
+;; cc-mode is dog-slow on large files, even on my 700 MHz Pentium III.
+;; This version works with no problems on the XEmacs source code and is
+;; very very fast.
+
+;;; Original commentary:
+
+;; [[A smart editing mode for C code.  It knows a lot about C syntax and tries
+;; to position the cursor according to C layout conventions.  You can
+;; change the details of the layout style with option variables.  Load it
+;; and do M-x describe-mode for details.]]
+
+;;; Code:
+(defgroup old-c nil
+  "Old C code editing commands for Emacs."
+  ;; This group should have no parent.
+  ;; We don't want it to be loaded except on explicit request.
+  :prefix "c-")
+
+
+(defvar c-mode-abbrev-table nil
+  "Abbrev table in use in C mode.")
+(define-abbrev-table 'c-mode-abbrev-table ())
+
+(defvar c-mode-map (make-sparse-keymap)
+  "Keymap used in C mode.")
+
+(define-key c-mode-map "{" 'electric-c-brace)
+(define-key c-mode-map "}" 'electric-c-brace)
+(define-key c-mode-map ";" 'electric-c-semi)
+(define-key c-mode-map "#" 'electric-c-sharp-sign)
+(define-key c-mode-map ":" 'electric-c-terminator)
+(define-key c-mode-map "\e\C-h" 'mark-c-function)
+(define-key c-mode-map "\e\C-q" 'indent-c-exp)
+(define-key c-mode-map "\ea" 'c-beginning-of-statement)
+(define-key c-mode-map "\ee" 'c-end-of-statement)
+(define-key c-mode-map "\C-c\C-n" 'c-forward-conditional)
+(define-key c-mode-map "\C-c\C-p" 'c-backward-conditional)
+(define-key c-mode-map "\C-c\C-u" 'c-up-conditional)
+(define-key c-mode-map "\t" 'c-indent-command)
+(define-key c-mode-map "\C-c\C-q"  'c-indent-defun)
+(define-key c-mode-map "\C-c\C-\\" 'c-backslash-region)
+(define-key c-mode-map "\C-c\C-c"  'comment-region)
+
+(autoload 'c-macro-expand "cmacexp"
+  "Display the result of expanding all C macros occurring in the region.
+The expansion is entirely correct because it uses the C preprocessor."
+  t)
+
+;;; begin stuff from cc-mode
+
+(defun c-mode-menu (modestr)
+  (let ((m
+ 	 '(["%_Comment Out Region"     comment-region
+	    (c-fn-region-is-active-p)]
+ 	   ["%_Uncomment Region"
+ 	    (comment-region (region-beginning) (region-end) '(4))
+ 	    (c-fn-region-is-active-p)]
+ 	   ["%_Fill Comment Paragraph" c-fill-paragraph t]
+ 	   "---"
+ 	   ["%_Indent Expression"      c-indent-exp
+ 	    (memq (char-after) '(?\( ?\[ ?\{))]
+ 	   ["Indent %_Line or Region"  c-indent-line-or-region t]
+ 	   ["U%_p Conditional"         c-up-conditional t]
+ 	   ["B%_ackward Conditional"   c-backward-conditional t]
+ 	   ["F%_orward Conditional"    c-forward-conditional t]
+ 	   ["Insert Matching %_Endif"  c-insert-matching-endif t]
+ 	   ["Bac%_kward Statement"     c-beginning-of-statement t]
+ 	   ["Fo%_rward Statement"      c-end-of-statement t]
+ 	   "---"
+ 	   ["%_Macro Expand Region"    c-macro-expand (c-fn-region-is-active-p)]
+ 	   ["%_Backslashify"           c-backslash-region
+ 	    (c-fn-region-is-active-p)]
+ 	   ["U%_nbackslashify"
+ 	    (c-backslash-region (region-beginning) (region-end) '(4))
+ 	    (c-fn-region-is-active-p)]
+ 	   )))
+    (or (featurep 'menu-accelerator-support)
+ 	(setq m (mapcar #'(lambda (def)
+ 			    (if (vectorp def)
+ 				(aset def 0 (replace-in-string (aref def 0)
+ 							       "%_" "")))
+ 			    def)
+ 			m)))
+    (cons modestr m)))
+
+(defun c-populate-syntax-table (table)
+  ;; Populate the syntax TABLE
+  ;; DO NOT TRY TO SET _ (UNDERSCORE) TO WORD CLASS!
+  (modify-syntax-entry ?_  "_"     table)
+  (modify-syntax-entry ?\\ "\\"    table)
+  (modify-syntax-entry ?+  "."     table)
+  (modify-syntax-entry ?-  "."     table)
+  (modify-syntax-entry ?=  "."     table)
+  (modify-syntax-entry ?%  "."     table)
+  (modify-syntax-entry ?<  "."     table)
+  (modify-syntax-entry ?>  "."     table)
+  (modify-syntax-entry ?&  "."     table)
+  (modify-syntax-entry ?|  "."     table)
+  (modify-syntax-entry ?\' "\""    table)
+  ;; Set up block and line oriented comments.  The new C standard
+  ;; mandates both comment styles even in C, so since all languages
+  ;; now require dual comments, we make this the default.
+  (cond
+   ;; XEmacs 19 & 20
+   ((memq '8-bit c-emacs-features)
+    (modify-syntax-entry ?/  ". 1456" table)
+    (modify-syntax-entry ?*  ". 23"   table))
+   ;; Emacs 19 & 20
+   ((memq '1-bit c-emacs-features)
+    (modify-syntax-entry ?/  ". 124b" table)
+    (modify-syntax-entry ?*  ". 23"   table))
+   ;; incompatible
+   (t (error "CC Mode is incompatible with this version of Emacs"))
+   )
+  (modify-syntax-entry ?\n "> b"  table)
+  ;; Give CR the same syntax as newline, for selective-display
+  (modify-syntax-entry ?\^m "> b" table))
+
+(defvar c-mode-syntax-table nil
+  "Syntax table used in c-mode buffers.")
+(if c-mode-syntax-table
+    ()
+  (setq c-mode-syntax-table (make-syntax-table))
+  (c-populate-syntax-table c-mode-syntax-table))
+
+(defvar c-current-comment-prefix nil
+  "The current comment prefix regexp.
+Set from `c-comment-prefix-regexp' at mode initialization.")
+(make-variable-buffer-local 'c-current-comment-prefix)
+
+;(defcustom-c-stylevar c-comment-prefix-regexp
+(defcustom c-comment-prefix-regexp
+  '((pike-mode . "//+!?\\|\\**")
+    (other . "//+\\|\\**"))
+  "*Regexp to match the line prefix inside comments.
+This regexp is used to recognize the fill prefix inside comments for
+correct paragraph filling and other things.
+
+If this variable is a string, it will be used in all CC Mode major
+modes.  It can also be an association list, to associate specific
+regexps to specific major modes.  The symbol for the major mode is
+looked up in the association list, and its value is used as the line
+prefix regexp.  If it's not found, then the symbol `other' is looked
+up and its value is used instead.
+
+The regexp should match the prefix used in both C++ style line
+comments and C style block comments, but it does not need to match a
+block comment starter.  In other words, it should at least match
+\"//\" for line comments and the string in `c-block-comment-prefix',
+which is sometimes inserted by CC Mode inside block comments.  It
+should not match any surrounding whitespace.
+
+Note that CC Mode modifies other variables from this one at mode
+initialization, so you will need to do \\[c-mode] (or whatever mode
+you're currently using) if you change it in a CC Mode buffer."
+  :type '(radio
+	  (regexp :tag "Regexp for all modes")
+	  (list
+	   :tag "Mode-specific regexps"
+	   (set
+	    :inline t :format "%v"
+	    (cons :format "%v"
+		  (const :format "C     " c-mode) (regexp :format "%v"))
+	    (cons :format "%v"
+		  (const :format "C++   " c++-mode) (regexp :format "%v"))
+	    (cons :format "%v"
+		  (const :format "ObjC  " objc-mode) (regexp :format "%v"))
+	    (cons :format "%v"
+		  (const :format "Java  " java-mode) (regexp :format "%v"))
+	    (cons :format "%v"
+		  (const :format "IDL   " idl-mode) (regexp :format "%v"))
+	    (cons :format "%v"
+		  (const :format "Pike  " pike-mode) (regexp :format "%v")))
+	   (cons :format "    %v"
+		 (const :format "Other " other) (regexp :format "%v"))))
+  :group 'old-c)
+
+(defvar c-append-paragraph-start "$")
+(make-variable-buffer-local 'c-append-paragraph-start)
+(defconst c-Java-javadoc-paragraph-start
+  "\\(@[a-zA-Z]+\\>\\|$\\)")
+(defconst c-Pike-pikedoc-paragraph-start
+  "\\(@[a-zA-Z]+\\>\\([^{]\\|$\\)\\|$\\)")
+
+;; Regexp to append to paragraph-separate.
+(defvar c-append-paragraph-separate "$")
+(make-variable-buffer-local 'c-append-paragraph-separate)
+(defconst c-Pike-pikedoc-paragraph-separate c-Pike-pikedoc-paragraph-start)
+
+;;; end stuff from cc-mode
+
+(defcustom c-indent-level 2
+  "*Indentation of C statements with respect to containing block."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-brace-imaginary-offset 0
+  "*Imagined indentation of a C open brace that actually follows a statement."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-brace-offset 0
+  "*Extra indentation for braces, compared with other text in same context."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-argdecl-indent 5
+  "*Indentation level of declarations of C function arguments."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-label-offset -2
+  "*Offset of C label lines and case statements relative to usual indentation."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-continued-statement-offset 2
+  "*Extra indent for lines not starting new statements."
+  :type 'integer
+  :group 'old-c)
+(defcustom c-continued-brace-offset 0
+  "*Extra indent for substatements that start with open-braces.
+This is in addition to `c-continued-statement-offset'."
+  :type 'integer
+  :group 'old-c)
+(defconst c-style-alist
+  '(("GNU"
+     (c-indent-level               .  2)
+     (c-argdecl-indent             .  5)
+     (c-brace-offset               .  0)
+     (c-continued-brace-offset     .  0)
+     (c-label-offset               . -2)
+     (c-continued-statement-offset .  2))
+    ("K&R"
+     (c-indent-level               .  5)
+     (c-argdecl-indent             .  0)
+     (c-brace-offset               .  0)
+     (c-continued-brace-offset     . -5)
+     (c-label-offset               . -5)
+     (c-continued-statement-offset .  5))
+    ("BSD"
+     (c-indent-level               .  4)
+     (c-argdecl-indent             .  4)
+     (c-brace-offset               .  0)
+     (c-continued-brace-offset     . -4)
+     (c-label-offset               . -4)
+     (c-continued-statement-offset .  4))
+    ("C++"
+     (c-indent-level               .  4)
+     (c-argdecl-indent             .  0)
+     (c-brace-offset               .  0)
+     (c-continued-brace-offset     . -4)
+     (c-label-offset               . -4)
+     (c-continued-statement-offset .  4)
+     (c-auto-newline               .  t))
+    ("Whitesmith"
+     (c-indent-level               .  4)
+     (c-argdecl-indent             .  4)
+     (c-brace-offset               .  0)
+     (c-continued-brace-offset     .  0)
+     (c-label-offset               . -4)
+     (c-continued-statement-offset .  4))))
+
+(defcustom c-auto-newline nil
+  "*Non-nil means automatically newline before and after braces,
+and after colons and semicolons, inserted in C code.
+If you do not want a leading newline before braces then use:
+  (define-key c-mode-map \"{\" 'electric-c-semi)"
+  :type 'boolean
+  :group 'old-c)
+
+(defcustom c-tab-always-indent t
+  "*Non-nil means TAB in C mode should always reindent the current line,
+regardless of where in the line point is when the TAB command is used."
+  :type 'boolean
+  :group 'old-c)
+
+;;; Regular expression used internally to recognize labels in switch
+;;; statements.
+(defconst c-switch-label-regexp "case[ \t'/(]\\|default[ \t]*:")
+
+;; This is actually the expression for C++ mode, but it's used for C too.
+(defvar c-imenu-generic-expression
+  (`
+   ((nil
+     (,
+      (concat
+       "^"				  ; beginning of line is required
+       "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
+       "\\([a-zA-Z0-9_:]+[ \t]+\\)?"	  ; type specs; there can be no
+       "\\([a-zA-Z0-9_:]+[ \t]+\\)?"	  ; more than 3 tokens, right?
+
+       "\\("				  ; last type spec including */&
+       "[a-zA-Z0-9_:]+"
+       "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)"	  ; either pointer/ref sign or whitespace
+       "\\)?"				  ; if there is a last type spec
+       "\\("			      ; name; take that into the imenu entry
+       "[a-zA-Z0-9_:~]+"		      ; member function, ctor or dtor...
+					; (may not contain * because then
+					; "a::operator char*" would become "char*"!)
+       "\\|"
+       "\\([a-zA-Z0-9_:~]*::\\)?operator"
+       "[^a-zA-Z1-9_][^(]*"	      ; ...or operator
+       " \\)"
+       "[ \t]*([^)]*)[ \t\n]*[^	      ;]" ; require something other than a ; after
+					; the (...) to avoid prototypes.  Can't
+					; catch cases with () inside the parentheses
+					; surrounding the parameters
+					; (like "int foo(int a=bar()) {...}"
+
+       )) 6)
+    ("Class"
+     (, (concat
+	 "^"				   ; beginning of line is required
+	 "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
+	 "class[ \t]+"
+	 "\\([a-zA-Z0-9_]+\\)"                ; this is the string we want to get
+	 "[ \t]*[:{]"
+	 )) 2)
+;; Example of generic expression for finding prototypes, structs, unions, enums.
+;; Uncomment if you want to find these too.  It will be a bit slower gathering
+;; the indexes.
+;    ("Prototypes"
+;     (,
+;      (concat
+;       "^"				  ; beginning of line is required
+;       "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
+;       "\\([a-zA-Z0-9_:]+[ \t]+\\)?"	  ; type specs; there can be no
+;       "\\([a-zA-Z0-9_:]+[ \t]+\\)?"	  ; more than 3 tokens, right?
+
+;       "\\("				  ; last type spec including */&
+;       "[a-zA-Z0-9_:]+"
+;       "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)"	  ; either pointer/ref sign or whitespace
+;       "\\)?"				  ; if there is a last type spec
+;       "\\("			      ; name; take that into the imenu entry
+;       "[a-zA-Z0-9_:~]+"		      ; member function, ctor or dtor...
+;					; (may not contain * because then
+;					; "a::operator char*" would become "char*"!)
+;       "\\|"
+;       "\\([a-zA-Z0-9_:~]*::\\)?operator"
+;       "[^a-zA-Z1-9_][^(]*"	      ; ...or operator
+;       " \\)"
+;       "[ \t]*([^)]*)[ \t\n]*;" 	; require ';' after
+;					; the (...) Can't
+;					; catch cases with () inside the parentheses
+;					; surrounding the parameters
+;					; (like "int foo(int a=bar());"
+;       )) 6)
+;    ("Struct"
+;     (, (concat
+;	 "^"				; beginning of line is required
+;	 "\\(static[ \t]+\\)?"		; there may be static or const.
+;	 "\\(const[ \t]+\\)?"
+;	 "struct[ \t]+"
+;	 "\\([a-zA-Z0-9_]+\\)"		; this is the string we want to get
+;	 "[ \t]*[{]"
+;	 )) 3)
+;    ("Enum"
+;     (, (concat
+;	 "^"				; beginning of line is required
+;	 "\\(static[ \t]+\\)?"		; there may be static or const.
+;	 "\\(const[ \t]+\\)?"
+;	 "enum[ \t]+"
+;	 "\\([a-zA-Z0-9_]+\\)"		; this is the string we want to get
+;	 "[ \t]*[{]"
+;	 )) 3)
+;    ("Union"
+;     (, (concat
+;	 "^"				; beginning of line is required
+;	 "\\(static[ \t]+\\)?"		; there may be static or const.
+;	 "\\(const[ \t]+\\)?"
+;	 "union[ \t]+"
+;	 "\\([a-zA-Z0-9_]+\\)"		; this is the string we want to get
+;	 "[ \t]*[{]"
+;	 )) 3)
+    ))
+  "Imenu generic expression for C mode.  See `imenu-generic-expression'.")
+
+(defun c-mode ()
+  "Major mode for editing C code.
+Expression and list commands understand all C brackets.
+Tab indents for C code.
+Comments are delimited with /* ... */.
+Paragraphs are separated by blank lines only.
+Delete converts tabs to spaces as it moves back.
+\\{c-mode-map}
+Variables controlling indentation style:
+ c-tab-always-indent
+    Non-nil means TAB in C mode should always reindent the current line,
+    regardless of where in the line point is when the TAB command is used.
+ c-auto-newline
+    Non-nil means automatically newline before and after braces,
+    and after colons and semicolons, inserted in C code.
+ c-indent-level
+    Indentation of C statements within surrounding block.
+    The surrounding block's indentation is the indentation
+    of the line on which the open-brace appears.
+ c-continued-statement-offset
+    Extra indentation given to a substatement, such as the
+    then-clause of an if or body of a while.
+ c-continued-brace-offset
+    Extra indentation given to a brace that starts a substatement.
+    This is in addition to c-continued-statement-offset.
+ c-brace-offset
+    Extra indentation for line if it starts with an open brace.
+ c-brace-imaginary-offset
+    An open brace following other text is treated as if it were
+    this far to the right of the start of its line.
+ c-argdecl-indent
+    Indentation level of declarations of C function arguments.
+ c-label-offset
+    Extra indentation for line that is a label, or case or default.
+
+Settings for K&R and BSD indentation styles are
+  c-indent-level                5    8
+  c-continued-statement-offset  5    8
+  c-brace-offset               -5   -8
+  c-argdecl-indent              0    8
+  c-label-offset               -5   -8
+
+Turning on C mode calls the value of the variable c-mode-hook with no args,
+if that value is non-nil."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map c-mode-map)
+  (setq major-mode 'c-mode)
+  (setq mode-name "C")
+
+;;; begin stuff from cc-mode
+
+  (make-local-variable 'require-final-newline)
+  (make-local-variable 'parse-sexp-ignore-comments)
+  (make-local-variable 'indent-line-function)
+  (make-local-variable 'indent-region-function)
+  (make-local-variable 'outline-regexp)
+  (make-local-variable 'outline-level)
+  (make-local-variable 'normal-auto-fill-function)
+  (make-local-variable 'comment-start)
+  (make-local-variable 'comment-end)
+  (make-local-variable 'comment-column)
+  (make-local-variable 'comment-start-skip)
+  (make-local-variable 'comment-multi-line)
+  (make-local-variable 'paragraph-start)
+  (make-local-variable 'paragraph-separate)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (make-local-variable 'adaptive-fill-mode)
+  (make-local-variable 'adaptive-fill-regexp)
+  (make-local-variable 'imenu-generic-expression) ;set in the mode functions
+;   ;; X/Emacs 20 only
+;   (and (boundp 'comment-line-break-function)
+;        (progn
+; 	 (make-local-variable 'comment-line-break-function)
+; 	 (setq comment-line-break-function
+; 	       'c-indent-new-comment-line)))
+  ;; now set their values
+  (setq require-final-newline t
+	parse-sexp-ignore-comments t
+	indent-line-function 'c-indent-line
+	indent-region-function 'c-indent-region
+	outline-regexp "[^#\n\^M]"
+	outline-level 'c-outline-level
+	normal-auto-fill-function 'c-do-auto-fill
+	comment-column 32
+	comment-start-skip "/\\*+ *\\|//+ *"
+	comment-multi-line t)
+;   ;; now set the mode style based on c-default-style
+;   (let ((style (if (stringp c-default-style)
+; 		   c-default-style
+; 		 (or (cdr (assq major-mode c-default-style))
+; 		     (cdr (assq 'other c-default-style))
+; 		     "gnu"))))
+;     ;; Override style variables if `c-old-style-variable-behavior' is
+;     ;; set.  Also override if we are using global style variables,
+;     ;; have already initialized a style once, and are switching to a
+;     ;; different style.  (It's doubtful whether this is desirable, but
+;     ;; the whole situation with nonlocal style variables is a bit
+;     ;; awkward.  It's at least the most compatible way with the old
+;     ;; style init procedure.)
+;     (c-set-style style (not (or c-old-style-variable-behavior
+; 				(and (not c-style-variables-are-local-p)
+; 				     c-indentation-style
+; 				     (not (string-equal c-indentation-style
+; 							style)))))))
+  ;; Fix things up for paragraph recognition and filling inside
+  ;; comments by using c-current-comment-prefix in the relevant
+  ;; places.  We use adaptive filling for this to make it possible to
+  ;; use filladapt or some other fancy package.
+  (setq c-current-comment-prefix
+	(if (listp c-comment-prefix-regexp)
+	    (cdr-safe (or (assoc major-mode c-comment-prefix-regexp)
+			  (assoc 'other c-comment-prefix-regexp)))
+	  c-comment-prefix-regexp))
+  (let ((comment-line-prefix
+	 (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*")))
+    (setq paragraph-start (concat comment-line-prefix
+				  c-append-paragraph-start
+				  "\\|"
+				  page-delimiter)
+	  paragraph-separate (concat comment-line-prefix
+				     c-append-paragraph-separate
+				     "\\|"
+				     page-delimiter)
+	  paragraph-ignore-fill-prefix t
+	  adaptive-fill-mode t
+	  adaptive-fill-regexp
+	  (concat comment-line-prefix
+		  (if adaptive-fill-regexp
+		      (concat "\\(" adaptive-fill-regexp "\\)")
+		    "")))
+    (when (boundp 'adaptive-fill-first-line-regexp)
+      ;; XEmacs (20.x) adaptive fill mode doesn't have this.
+      (make-local-variable 'adaptive-fill-first-line-regexp)
+      (setq adaptive-fill-first-line-regexp
+	    (concat "\\`" comment-line-prefix
+		    ;; Maybe we should incorporate the old value here,
+		    ;; but then we have to do all sorts of kludges to
+		    ;; deal with the \` and \' it probably contains.
+		    "\\'"))))
+;   ;; we have to do something special for c-offsets-alist so that the
+;   ;; buffer local value has its own alist structure.
+;   (setq c-offsets-alist (copy-alist c-offsets-alist))
+  ;; setup the comment indent variable in a Emacs version portable way
+  ;; ignore any byte compiler warnings you might get here
+  (make-local-variable 'comment-indent-function)
+  (setq comment-indent-function 'c-comment-indent)
+  ;; add menus to menubar
+  (easy-menu-add (c-mode-menu mode-name))
+;   ;; put auto-hungry designators onto minor-mode-alist, but only once
+;   (or (assq 'c-auto-hungry-string minor-mode-alist)
+;       (setq minor-mode-alist
+; 	    (cons '(c-auto-hungry-string c-auto-hungry-string)
+; 		  minor-mode-alist)))
+
+;;; end stuff from cc-mode
+
+  (setq local-abbrev-table c-mode-abbrev-table)
+  (set-syntax-table c-mode-syntax-table)
+  (make-local-variable 'fill-paragraph-function)
+  (setq fill-paragraph-function 'c-fill-paragraph)
+  (setq comment-start "/* ")
+  (setq comment-end " */")
+  (make-local-variable 'imenu-generic-expression)
+  (setq imenu-generic-expression c-imenu-generic-expression)
+  (run-hooks 'c-mode-hook))
+
+(defun c-outline-level ()
+  ;; This so that `current-column' DTRT in otherwise-hidden text.
+  (let (buffer-invisibility-spec)
+    (save-excursion
+      (skip-chars-forward "\t ")
+      (current-column))))
+
+;; This is used by indent-for-comment
+;; to decide how much to indent a comment in C code
+;; based on its context.
+(defun c-comment-indent ()
+  (if (looking-at "^/\\*")
+      0				;Existing comment at bol stays there.
+    (let ((opoint (point)))
+      (save-excursion
+	(beginning-of-line)
+	(cond ((looking-at "[ \t]*}[ \t]*\\($\\|/\\*\\)")
+	       ;; A comment following a solitary close-brace
+	       ;; should have only one space.
+	       (search-forward "}")
+	       (1+ (current-column)))
+	      ((or (looking-at "^#[ \t]*endif[ \t]*")
+		   (looking-at "^#[ \t]*else[ \t]*"))
+	       7)			;2 spaces after #endif
+	      ((progn
+		 (goto-char opoint)
+		 (skip-chars-backward " \t")
+		 (and (= comment-column 0) (bolp)))
+	       ;; If comment-column is 0, and nothing but space
+	       ;; before the comment, align it at 0 rather than 1.
+	       0)
+	      (t
+	       (max (1+ (current-column))	;Else indent at comment column
+		    comment-column)))))))	; except leave at least one space.
+
+(defun c-fill-paragraph (&optional arg)
+  "Like \\[fill-paragraph] but handle C comments.
+If any of the current line is a comment or within a comment,
+fill the comment or the paragraph of it that point is in,
+preserving the comment indentation or line-starting decorations."
+  (interactive "P")
+  (let* (comment-start-place
+	 (first-line
+	  ;; Check for obvious entry to comment.
+	  (save-excursion
+	    (beginning-of-line)
+	    (skip-chars-forward " \t\n")
+	    (and (looking-at comment-start-skip)
+		 (setq comment-start-place (point))))))
+    (if (and (eq major-mode 'c++-mode)
+	     (save-excursion
+	       (beginning-of-line)
+	       (looking-at ".*//")))
+	(let (fill-prefix
+	      (paragraph-start
+	       ;; Lines containing just a comment start or just an end
+	       ;; should not be filled into paragraphs they are next to.
+	       (concat
+		paragraph-start
+		"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
+	      (paragraph-separate
+	       (concat
+		paragraph-separate
+		"\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$")))
+	  (save-excursion
+	    (beginning-of-line)
+	    ;; Move up to first line of this comment.
+	    (while (and (not (bobp)) (looking-at "[ \t]*//"))
+	      (forward-line -1))
+	    (if (not (looking-at ".*//"))
+		(forward-line 1))
+	    ;; Find the comment start in this line.
+	    (re-search-forward "[ \t]*//[ \t]*")
+	    ;; Set the fill-prefix to be what all lines except the first
+	    ;; should start with.
+	    (let ((endcol (current-column)))
+	      (skip-chars-backward " \t")
+	      (setq fill-prefix
+		    (concat (make-string (- (current-column) 2) ?\ )
+			    "//"
+			    (make-string (- endcol (current-column)) ?\ ))))
+	    (save-restriction
+	      ;; Narrow down to just the lines of this comment.
+	      (narrow-to-region (point)
+				(save-excursion
+				  (forward-line 1)
+				  (while (looking-at "[ \t]*//")
+				    (forward-line 1))
+				  (point)))
+	      (insert fill-prefix)
+	      (fill-paragraph arg)
+	      (delete-region (point-min)
+			     (+ (point-min) (length fill-prefix))))))
+      (if (or first-line
+	      ;; t if we enter a comment between start of function and this line.
+	      (eq (calculate-c-indent) t)
+	      ;; t if this line contains a comment starter.
+	      (setq first-line
+		    (save-excursion
+		      (beginning-of-line)
+		      (prog1
+			  (re-search-forward comment-start-skip
+					     (save-excursion (end-of-line)
+							     (point))
+					     t)
+			(setq comment-start-place (point))))))
+	  ;; Inside a comment: fill one comment paragraph.
+	  (let ((fill-prefix
+		 ;; The prefix for each line of this paragraph
+		 ;; is the appropriate part of the start of this line,
+		 ;; up to the column at which text should be indented.
+		 (save-excursion
+		   (beginning-of-line)
+		   (if (looking-at "[ \t]*/\\*.*\\*/")
+		       (progn (re-search-forward comment-start-skip)
+			      (make-string (current-column) ?\ ))
+		     (if first-line (forward-line 1))
+
+		     (let ((line-width (progn (end-of-line) (current-column))))
+		       (beginning-of-line)
+		       (prog1
+			   (buffer-substring
+			    (point)
+
+			    ;; How shall we decide where the end of the
+			    ;; fill-prefix is?
+			    ;; calculate-c-indent-within-comment bases its value
+			    ;; on the indentation of previous lines; if they're
+			    ;; indented specially, it could return a column
+			    ;; that's well into the current line's text.  So
+			    ;; we'll take at most that many space, tab, or *
+			    ;; characters, and use that as our fill prefix.
+			    (let ((max-prefix-end
+				   (progn
+				     (move-to-column
+				      (calculate-c-indent-within-comment t)
+				      t)
+				     (point))))
+			      (beginning-of-line)
+			      (skip-chars-forward " \t*" max-prefix-end)
+			      ;; Don't include part of comment terminator
+			      ;; in the fill-prefix.
+			      (and (eq (following-char) ?/)
+				   (eq (preceding-char) ?*)
+				   (backward-char 1))
+			      (point)))
+
+			 ;; If the comment is only one line followed by a blank
+			 ;; line, calling move-to-column above may have added
+			 ;; some spaces and tabs to the end of the line; the
+			 ;; fill-paragraph function will then delete it and the
+			 ;; newline following it, so we'll lose a blank line
+			 ;; when we shouldn't.  So delete anything
+			 ;; move-to-column added to the end of the line.  We
+			 ;; record the line width instead of the position of the
+			 ;; old line end because move-to-column might break a
+			 ;; tab into spaces, and the new characters introduced
+			 ;; there shouldn't be deleted.
+
+			 ;; If you can see a better way to do this, please make
+			 ;; the change.  This seems very messy to me.
+			 (delete-region (progn (move-to-column line-width)
+					       (point))
+					(progn (end-of-line) (point))))))))
+
+		(paragraph-start
+		 ;; Lines containing just a comment start or just an end
+		 ;; should not be filled into paragraphs they are next to.
+		 (concat
+		  paragraph-start
+		  "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
+		(paragraph-separate
+		 (concat
+		  paragraph-separate
+		  "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$"))
+		(chars-to-delete 0))
+	    (save-restriction
+	      ;; Don't fill the comment together with the code following it.
+	      ;; So temporarily exclude everything before the comment start,
+	      ;; and everything after the line where the comment ends.
+	      ;; If comment-start-place is non-nil, the comment starter is there.
+	      ;; Otherwise, point is inside the comment.
+	      (narrow-to-region (save-excursion
+				  (if comment-start-place
+				      (goto-char comment-start-place)
+				    (search-backward "/*"))
+				  ;; Protect text before the comment start
+				  ;; by excluding it.  Add spaces to bring back
+				  ;; proper indentation of that point.
+				  (let ((column (current-column)))
+				    (prog1 (point)
+				      (setq chars-to-delete column)
+				      (insert-char ?\  column))))
+				(save-excursion
+				  (if comment-start-place
+				      (goto-char (+ comment-start-place 2)))
+				  (search-forward "*/" nil 'move)
+				  (forward-line 1)
+				  (point)))
+	      (save-excursion
+		(goto-char (point-max))
+		(forward-line -1)
+		;; And comment terminator was on a separate line before,
+		;; keep it that way.
+		;; This also avoids another problem:
+		;; if the fill-prefix ends in a *, it could eat up
+		;; the * of the comment terminator.
+		(if (looking-at "[ \t]*\\*/")
+		    (narrow-to-region (point-min) (point))))
+	      (fill-paragraph arg)
+	      (save-excursion
+		;; Delete the chars we inserted to avoid clobbering
+		;; the stuff before the comment start.
+		(goto-char (point-min))
+		(if (> chars-to-delete 0)
+		    (delete-region (point) (+ (point) chars-to-delete)))
+		;; Find the comment ender (should be on last line of buffer,
+		;; given the narrowing) and don't leave it on its own line.
+		;; Do this with a fill command, so as to preserve sentence
+		;; boundaries.
+		(goto-char (point-max))
+		(forward-line -1)
+		(search-forward "*/" nil 'move)
+		(beginning-of-line)
+		(if (looking-at "[ \t]*\\*/")
+		    (let ((fill-column (+ fill-column 9999)))
+		      (forward-line -1)
+		      (fill-region-as-paragraph (point) (point-max)))))))
+	;; Outside of comments: do ordinary filling.
+	(fill-paragraph arg)))
+    t))
+
+(defun electric-c-brace (arg)
+  "Insert character and correct line's indentation."
+  (interactive "P")
+  (let (insertpos)
+    (if (and (not arg)
+	     (eolp)
+	     (or (save-excursion
+		   (skip-chars-backward " \t")
+		   (bolp))
+		 (if c-auto-newline (progn (c-indent-line) (newline) t) nil)))
+	(progn
+	  (insert last-command-char)
+	  (c-indent-line)
+	  (if c-auto-newline
+	      (progn
+		(newline)
+		;; (newline) may have done auto-fill
+		(setq insertpos (- (point) 2))
+		(c-indent-line)))
+	  (save-excursion
+	    (if insertpos (goto-char (1+ insertpos)))
+	    (delete-char -1))))
+    (if insertpos
+	(save-excursion
+	  (goto-char insertpos)
+	  (self-insert-command (prefix-numeric-value arg)))
+      (self-insert-command (prefix-numeric-value arg)))))
+
+(defun electric-c-sharp-sign (arg)
+  "Insert character and correct line's indentation."
+  (interactive "P")
+  (if (save-excursion
+	(skip-chars-backward " \t")
+	(bolp))
+      (let ((c-auto-newline nil))
+	(electric-c-terminator arg))
+    (self-insert-command (prefix-numeric-value arg))))
+
+(defun electric-c-semi (arg)
+  "Insert character and correct line's indentation."
+  (interactive "P")
+  (if c-auto-newline
+      (electric-c-terminator arg)
+    (self-insert-command (prefix-numeric-value arg))))
+
+(defun electric-c-terminator (arg)
+  "Insert character and correct line's indentation."
+  (interactive "P")
+  (let (insertpos (end (point)))
+    (if (and (not arg) (eolp)
+	     (not (save-excursion
+		    (beginning-of-line)
+		    (skip-chars-forward " \t")
+		    (or (= (following-char) ?#)
+			;; Colon is special only after a label, or case ....
+			;; So quickly rule out most other uses of colon
+			;; and do no indentation for them.
+			(and (eq last-command-char ?:)
+			     (not (looking-at c-switch-label-regexp))
+			     (save-excursion
+			       (skip-chars-forward "a-zA-Z0-9_$")
+			       (skip-chars-forward " \t")
+			       (< (point) end)))
+			(progn
+			  (beginning-of-defun)
+			  (let ((pps (parse-partial-sexp (point) end)))
+			    (or (nth 3 pps) (nth 4 pps) (nth 5 pps))))))))
+	(progn
+	  (insert last-command-char)
+	  (c-indent-line)
+	  (and c-auto-newline
+	       (not (c-inside-parens-p))
+	       (progn
+		 (newline)
+		 ;; (newline) may have done auto-fill
+		 (setq insertpos (- (point) 2))
+		 (c-indent-line)))
+	  (save-excursion
+	    (if insertpos (goto-char (1+ insertpos)))
+	    (delete-char -1))))
+    (if insertpos
+	(save-excursion
+	  (goto-char insertpos)
+	  (self-insert-command (prefix-numeric-value arg)))
+      (self-insert-command (prefix-numeric-value arg)))))
+
+(defun c-inside-parens-p ()
+  (condition-case ()
+      (save-excursion
+	(save-restriction
+	  (narrow-to-region (point)
+			    (progn (beginning-of-defun) (point)))
+	  (goto-char (point-max))
+	  (= (char-after (or (scan-lists (point) -1 1) (point-min))) ?\()))
+    (error nil)))
+
+(defun c-indent-command (&optional whole-exp)
+  "Indent current line as C code, or in some cases insert a tab character.
+If `c-tab-always-indent' is non-nil (the default), always indent current line.
+Otherwise, indent the current line only if point is at the left margin or
+in the line's indentation; otherwise insert a tab.
+
+A numeric argument, regardless of its value, means indent rigidly all the
+lines of the expression starting after point so that this line becomes
+properly indented.  The relative indentation among the lines of the
+expression are preserved."
+  (interactive "P")
+  (if whole-exp
+      ;; If arg, always indent this line as C
+      ;; and shift remaining lines of expression the same amount.
+      (let ((shift-amt (c-indent-line))
+	    beg end)
+	(save-excursion
+	  (if c-tab-always-indent
+	      (beginning-of-line))
+	  ;; Find beginning of following line.
+	  (save-excursion
+	    (forward-line 1) (setq beg (point)))
+	  ;; Find first beginning-of-sexp for sexp extending past this line.
+	  (while (< (point) beg)
+	    (forward-sexp 1)
+	    (setq end (point))
+	    (skip-chars-forward " \t\n")))
+	(if (> end beg)
+	    (indent-code-rigidly beg end shift-amt "#")))
+    (if (and (not c-tab-always-indent)
+	     (save-excursion
+	       (skip-chars-backward " \t")
+	       (not (bolp))))
+	(insert-tab)
+      (c-indent-line))))
+
+(defun c-indent-line ()
+  "Indent current line as C code.
+Return the amount the indentation changed by."
+  (let ((indent (calculate-c-indent nil))
+	beg shift-amt
+	(case-fold-search nil)
+	(pos (- (point-max) (point))))
+    (beginning-of-line)
+    (setq beg (point))
+    (cond ((eq indent nil)
+	   (setq indent (current-indentation)))
+	  ((eq indent t)
+	   (setq indent (calculate-c-indent-within-comment)))
+	  ((looking-at "[ \t]*#")
+	   (setq indent 0))
+	  (t
+	   (skip-chars-forward " \t")
+	   (if (listp indent) (setq indent (car indent)))
+	   (cond ((or (looking-at c-switch-label-regexp)
+		      (and (looking-at "[A-Za-z]")
+			   (save-excursion
+			     (forward-sexp 1)
+			     (looking-at ":"))))
+		  (setq indent (max 1 (+ indent c-label-offset))))
+		 ((and (looking-at "else\\b")
+		       (not (looking-at "else\\s_")))
+		  (setq indent (save-excursion
+				 (c-backward-to-start-of-if)
+				 (current-indentation))))
+		 ((and (looking-at "}[ \t]*else\\b")
+		       (not (looking-at "}[ \t]*else\\s_")))
+		  (setq indent (save-excursion
+				 (forward-char)
+				 (backward-sexp)
+				 (c-backward-to-start-of-if)
+				 (current-indentation))))
+		 ((and (looking-at "while\\b")
+		       (not (looking-at "while\\s_"))
+		       (save-excursion
+			 (c-backward-to-start-of-do)))
+		  ;; This is a `while' that ends a do-while.
+		  (setq indent (save-excursion
+				 (c-backward-to-start-of-do)
+				 (current-indentation))))
+		 ((= (following-char) ?})
+		  (setq indent (- indent c-indent-level)))
+		 ((= (following-char) ?{)
+		  (setq indent (+ indent c-brace-offset))))))
+    (skip-chars-forward " \t")
+    (setq shift-amt (- indent (current-column)))
+    (if (zerop shift-amt)
+	(if (> (- (point-max) pos) (point))
+	    (goto-char (- (point-max) pos)))
+      (delete-region beg (point))
+      (indent-to indent)
+      ;; If initial point was within line's indentation,
+      ;; position after the indentation.  Else stay at same point in text.
+      (if (> (- (point-max) pos) (point))
+	  (goto-char (- (point-max) pos))))
+    shift-amt))
+
+(defun calculate-c-indent (&optional parse-start)
+  "Return appropriate indentation for current line as C code.
+In usual case returns an integer: the column to indent to.
+Returns nil if line starts inside a string, t if in a comment."
+  (save-excursion
+    (beginning-of-line)
+    (let ((indent-point (point))
+	  (case-fold-search nil)
+	  state
+	  containing-sexp)
+      (if parse-start
+	  (goto-char parse-start)
+	(beginning-of-defun))
+      (while (< (point) indent-point)
+	(setq parse-start (point))
+	(setq state (parse-partial-sexp (point) indent-point 0))
+	(setq containing-sexp (car (cdr state))))
+      (cond ((or (nth 3 state) (nth 4 state))
+	     ;; return nil or t if should not change this line
+	     (nth 4 state))
+	    ((null containing-sexp)
+	     ;; Line is at top level.  May be data or function definition,
+	     ;; or may be function argument declaration.
+	     ;; Indent like the previous top level line
+	     ;; unless that ends in a closeparen without semicolon,
+	     ;; in which case this line is the first argument decl.
+	     (goto-char indent-point)
+	     (skip-chars-forward " \t")
+	     (if (= (following-char) ?{)
+		 0   ; Unless it starts a function body
+	       (c-backward-to-noncomment (or parse-start (point-min)))
+	       ;; Look at previous line that's at column 0
+	       ;; to determine whether we are in top-level decls
+	       ;; or function's arg decls.  Set basic-indent accordingly.
+	       (let ((basic-indent
+		      (save-excursion
+			(re-search-backward "^[^ \^L\t\n#]" nil 'move)
+			(let (comment lim)
+			  ;; Recognize the DEFUN macro in Emacs.
+			  (if (save-excursion
+				;; Move down to the (putative) argnames line.
+				(while (and (not (eobp))
+					    (not (looking-at " *[({}#/]")))
+				  (forward-line 1))
+				;; Go back to the DEFUN, if it is one.
+				(condition-case nil
+				    (backward-sexp 1)
+				  (error))
+				(beginning-of-line)
+				(looking-at "DEFUN\\b"))
+			      c-argdecl-indent
+			    (if (and (looking-at "\\sw\\|\\s_")
+				     ;; This is careful to stop at the first
+				     ;; paren if we have
+				     ;; int foo Proto ((int, int));
+				     (looking-at "[^\"\n=(]*(")
+				     (progn
+				       (goto-char (1- (match-end 0)))
+				       ;; Skip any number of paren-groups.
+				       ;; Consider typedef int (*fcn) (int);
+				       (while (= (following-char) ?\()
+					 (setq lim (point))
+					 (condition-case nil
+					     (forward-sexp 1)
+					   (error))
+					 (skip-chars-forward " \t\f"))
+				       ;; Have we reached something
+				       ;; that shows this isn't a function
+				       ;; definition?
+				       (and (< (point) indent-point)
+					    (not (memq (following-char)
+						       '(?\, ?\;)))))
+				     ;; Make sure the "function decl" we found
+				     ;; is not inside a comment.
+				     (progn
+				       ;; Move back to the `(' starting arglist
+				       (goto-char lim)
+				       (beginning-of-line)
+				       (while (and (not comment)
+						   (search-forward "/*" lim t))
+					 (setq comment
+					       (not (search-forward "*/" lim t))))
+				       (not comment)))
+				c-argdecl-indent 0))))))
+		 basic-indent)))
+
+;; 		 ;; Now add a little if this is a continuation line.
+;; 		 (+ basic-indent (if (or (bobp)
+;; 					 (memq (preceding-char) '(?\) ?\; ?\}))
+;; 					 ;; Line with zero indentation
+;; 					 ;; is probably the return-type
+;; 					 ;; of a function definition,
+;; 					 ;; so following line is function name.
+;; 					 (= (current-indentation) 0))
+;;				     0 c-continued-statement-offset))
+
+	    ((/= (char-after containing-sexp) ?{)
+	     ;; line is expression, not statement:
+	     ;; indent to just after the surrounding open.
+	     (goto-char (1+ containing-sexp))
+	     (current-column))
+	    (t
+	     ;; Statement level.  Is it a continuation or a new statement?
+	     ;; Find previous non-comment character.
+	     (goto-char indent-point)
+	     (c-backward-to-noncomment containing-sexp)
+	     ;; Back up over label lines, since they don't
+	     ;; affect whether our line is a continuation.
+	     (while (or (eq (preceding-char) ?\,)
+			(and (eq (preceding-char) ?:)
+			     (or (eq (char-after (- (point) 2)) ?\')
+				 (memq (char-syntax (char-after (- (point) 2)))
+				       '(?w ?_)))))
+	       (if (eq (preceding-char) ?\,)
+		   (progn (forward-char -1)
+			  (c-backward-to-start-of-continued-exp containing-sexp)))
+	       (beginning-of-line)
+	       (c-backward-to-noncomment containing-sexp))
+	     ;; Check for a preprocessor statement or its continuation lines.
+	     ;; Move back to end of previous non-preprocessor line,
+	     ;; or possibly beginning of buffer.
+	     (let ((found (point)) stop)
+	       (while (not stop)
+		 (beginning-of-line)
+		 (cond ((bobp)
+			(setq found (point)
+			      stop t))
+		       ((save-excursion (forward-char -1)
+					(= (preceding-char) ?\\))
+			(forward-char -1))
+		       ;; This line is not preceded by a backslash.
+		       ;; So either it starts a preprocessor command
+		       ;; or any following continuation lines
+		       ;; should not be skipped.
+		       ((= (following-char) ?#)
+			(forward-char -1)
+			(setq found (point)))
+		       (t (setq stop t))))
+	       (goto-char found))
+	     ;; Now we get the answer.
+	     (if (and (not (memq (preceding-char) '(0 ?\, ?\; ?\} ?\{)))
+		      ;; But don't treat a line with a close-brace
+		      ;; as a continuation.  It is probably the
+		      ;; end of an enum type declaration.
+		      (save-excursion
+			(goto-char indent-point)
+			(skip-chars-forward " \t")
+			(not (= (following-char) ?}))))
+		 ;; This line is continuation of preceding line's statement;
+		 ;; indent  c-continued-statement-offset  more than the
+		 ;; previous line of the statement.
+		 (progn
+		   (c-backward-to-start-of-continued-exp containing-sexp)
+		   (+ c-continued-statement-offset (current-column)
+		      (if (save-excursion (goto-char indent-point)
+					  (skip-chars-forward " \t")
+					  (eq (following-char) ?{))
+			  c-continued-brace-offset 0)))
+	       ;; This line starts a new statement.
+	       ;; Position following last unclosed open.
+	       (goto-char containing-sexp)
+	       ;; Is line first statement after an open-brace?
+	       (or
+		 ;; If no, find that first statement and indent like it.
+		 (save-excursion
+		   (forward-char 1)
+		   (let ((colon-line-end 0))
+		     (while (progn (skip-chars-forward " \t\n")
+				   (looking-at "#\\|/\\*\\|case[ \t\n'/(].*:\\|[a-zA-Z0-9_$]*:"))
+		       ;; Skip over comments and labels following openbrace.
+		       (cond ((= (following-char) ?\#)
+			      (forward-line 1))
+			     ((= (following-char) ?\/)
+			      (forward-char 2)
+			      (search-forward "*/" nil 'move))
+			     ;; case or label:
+			     (t
+			      (save-excursion (end-of-line)
+					      (setq colon-line-end (point)))
+			      (search-forward ":"))))
+		     ;; The first following code counts
+		     ;; if it is before the line we want to indent.
+		     (and (< (point) indent-point)
+			  (-
+			   (if (> colon-line-end (point))
+			       (- (current-indentation) c-label-offset)
+			     (current-column))
+			   ;; If prev stmt starts with open-brace, that
+			   ;; open brace was offset by c-brace-offset.
+			   ;; Compensate to get the column where
+			   ;; an ordinary statement would start.
+			   (if (= (following-char) ?\{) c-brace-offset 0)))))
+		 ;; If no previous statement,
+		 ;; indent it relative to line brace is on.
+		 (calculate-c-indent-after-brace))))))))
+
+(defun calculate-c-indent-after-brace ()
+  "Return the proper C indent for the first line after an open-brace.
+This function is called with point before the brace."
+  ;; For open brace in column zero, don't let statement
+  ;; start there too.  If c-indent-level is zero,
+  ;; use c-brace-offset + c-continued-statement-offset instead.
+  ;; For open-braces not the first thing in a line,
+  ;; add in c-brace-imaginary-offset.
+  (+ (if (and (bolp) (zerop c-indent-level))
+	 (+ c-brace-offset c-continued-statement-offset)
+       c-indent-level)
+     ;; Move back over whitespace before the openbrace.
+     ;; If openbrace is not first nonwhite thing on the line,
+     ;; add the c-brace-imaginary-offset.
+     (progn (skip-chars-backward " \t")
+	    (if (bolp) 0 c-brace-imaginary-offset))
+     ;; If the openbrace is preceded by a parenthesized exp,
+     ;; move to the beginning of that;
+     ;; possibly a different line
+     (progn
+       (if (eq (preceding-char) ?\))
+	   (forward-sexp -1))
+       ;; Get initial indentation of the line we are on.
+       (current-indentation))))
+
+(defun calculate-c-indent-within-comment (&optional after-star)
+  "Return the indentation amount for line inside a block comment.
+Optional arg AFTER-STAR means, if lines in the comment have a leading star,
+return the indentation of the text that would follow this star."
+  (let (end star-start)
+    (save-excursion
+      (beginning-of-line)
+      (skip-chars-forward " \t")
+      (setq star-start (= (following-char) ?\*))
+      (skip-chars-backward " \t\n")
+      (setq end (point))
+      (beginning-of-line)
+      (skip-chars-forward " \t")
+      (if after-star
+	  (and (looking-at "\\*")
+	       (re-search-forward "\\*[ \t]*")))
+      (and (re-search-forward "/\\*[ \t]*" end t)
+	   star-start
+	   (not after-star)
+	   (goto-char (1+ (match-beginning 0))))
+      (if (and (looking-at "[ \t]*$") (= (preceding-char) ?\*))
+	  (1+ (current-column))
+	(current-column)))))
+
+
+(defun c-backward-to-noncomment (lim)
+  (let (opoint stop)
+    (while (not stop)
+      (skip-chars-backward " \t\n\f" lim)
+      (setq opoint (point))
+      (if (and (>= (point) (+ 2 lim))
+	       (save-excursion
+		 (forward-char -2)
+		 (looking-at "\\*/")))
+	  (search-backward "/*" lim 'move)
+	(setq stop (or (<= (point) lim)
+		       (save-excursion
+			 (beginning-of-line)
+			 (skip-chars-forward " \t")
+			 (not (looking-at "#")))))
+	(or stop (beginning-of-line))))))
+
+(defun c-backward-to-start-of-continued-exp (lim)
+  (if (memq (preceding-char) '(?\) ?\"))
+      (forward-sexp -1))
+  (beginning-of-line)
+  (if (<= (point) lim)
+      (goto-char (1+ lim)))
+  (skip-chars-forward " \t"))
+
+(defun c-backward-to-start-of-if (&optional limit)
+  "Move to the start of the last \"unbalanced\" `if'."
+  (or limit (setq limit (save-excursion (beginning-of-defun) (point))))
+  (let ((if-level 1)
+	(case-fold-search nil))
+    (while (and (not (bobp)) (not (zerop if-level)))
+      (backward-sexp 1)
+      (cond ((and (looking-at "else\\b")
+		  (not (looking-at "else\\s_")))
+	     (setq if-level (1+ if-level)))
+	    ((and (looking-at "if\\b")
+		  (not (looking-at "if\\s_")))
+	     (setq if-level (1- if-level)))
+	    ((< (point) limit)
+	     (setq if-level 0)
+	     (goto-char limit))))))
+
+(defun c-backward-to-start-of-do (&optional limit)
+  "If point follows a `do' statement, move to beginning of it and return t.
+Otherwise return nil and don't move point."
+  (or limit (setq limit (save-excursion (beginning-of-defun) (point))))
+  (let ((first t)
+	(startpos (point))
+	(done nil))
+    (while (not done)
+      (let ((next-start (point)))
+	(condition-case nil
+	    ;; Move back one token or one brace or paren group.
+	    (backward-sexp 1)
+	  ;; If we find an open-brace, we lose.
+	  (error (setq done 'fail)))
+	(if done
+	    nil
+	  ;; If we reached a `do', we win.
+	  (if (looking-at "do\\b")
+	      (setq done 'succeed)
+	    ;; Otherwise, if we skipped a semicolon, we lose.
+	    ;; (Exception: we can skip one semicolon before getting
+	    ;; to a the last token of the statement, unless that token
+	    ;; is a close brace.)
+	    (if (save-excursion
+		  (forward-sexp 1)
+		  (or (and (not first) (= (preceding-char) ?}))
+		      (search-forward ";" next-start t
+				      (if (and first
+					       (/= (preceding-char) ?}))
+					  2 1))))
+		(setq done 'fail)
+	      (setq first nil)
+	      ;; If we go too far back in the buffer, we lose.
+	      (if (< (point) limit)
+		  (setq done 'fail)))))))
+    (if (eq done 'succeed)
+	t
+      (goto-char startpos)
+      nil)))
+
+(defun c-beginning-of-statement (count)
+  "Go to the beginning of the innermost C statement.
+With prefix arg, go back N - 1 statements.  If already at the beginning of a
+statement then go to the beginning of the preceding one.
+If within a string or comment, or next to a comment (only whitespace between),
+move by sentences instead of statements."
+  (interactive "p")
+  (let ((here (point)) state)
+    (save-excursion
+      (beginning-of-defun)
+      (setq state (parse-partial-sexp (point) here nil nil)))
+    (if (or (nth 3 state) (nth 4 state)
+	    (looking-at (concat "[ \t]*" comment-start-skip))
+	    (save-excursion (skip-chars-backward " \t")
+			    (goto-char (- (point) 2))
+			    (looking-at "\\*/")))
+	(forward-sentence (- count))
+      (while (> count 0)
+	(c-beginning-of-statement-1)
+	(setq count (1- count)))
+      (while (< count 0)
+	(c-end-of-statement-1)
+	(setq count (1+ count))))))
+
+(defun c-end-of-statement (count)
+  "Go to the end of the innermost C statement.
+With prefix arg, go forward N - 1 statements.
+Move forward to end of the next statement if already at end.
+If within a string or comment, move by sentences instead of statements."
+  (interactive "p")
+  (c-beginning-of-statement (- count)))
+
+(defun c-beginning-of-statement-1 ()
+  (let ((last-begin (point))
+	(first t))
+    (condition-case ()
+	(progn
+	  (while (and (not (bobp))
+		      (progn
+			(backward-sexp 1)
+			(or first
+			    (not (re-search-forward "[;{}]" last-begin t)))))
+	    (setq last-begin (point) first nil))
+	  (goto-char last-begin))
+      (error (if first (backward-up-list 1) (goto-char last-begin))))))
+
+(defun c-end-of-statement-1 ()
+  (condition-case ()
+      (progn
+	(while (and (not (eobp))
+		    (let ((beg (point)))
+		      (forward-sexp 1)
+		      (let ((end (point)))
+			(save-excursion
+			  (goto-char beg)
+			  (not (re-search-forward "[;{}]" end t)))))))
+	(re-search-backward "[;}]")
+	(forward-char 1))
+    (error
+     (let ((beg (point)))
+       (backward-up-list -1)
+       (let ((end (point)))
+	 (goto-char beg)
+	 (search-forward ";" end 'move))))))
+
+(defun mark-c-function ()
+  "Put mark at end of C function, point at beginning."
+  (interactive)
+  (push-mark (point))
+  (end-of-defun)
+  (push-mark (point) nil t)
+  (beginning-of-defun)
+  (backward-paragraph))
+
+;; Idea of ENDPOS is, indent each line, stopping when
+;; ENDPOS is encountered.  But it's too much of a pain to make that work.
+(defun indent-c-exp (&optional endpos)
+  "Indent each line of the C grouping following point."
+  (interactive)
+  (let* ((indent-stack (list nil))
+	 (opoint (point))  ;; May be altered below.
+	 (contain-stack
+	  (list (if endpos
+		    (let (funbeg)
+		      ;; Find previous fcn-start.
+		      (save-excursion (forward-char 1)
+				      (beginning-of-defun)
+				      (setq funbeg (point)))
+		      (setq opoint funbeg)
+		      ;; Try to find containing open,
+		      ;; but don't scan past that fcn-start.
+		      (save-restriction
+			(narrow-to-region funbeg (point))
+			(condition-case nil
+			    (save-excursion
+			      (backward-up-list 1)
+			      (point))
+			  ;; We gave up: must be between fcns.
+			  ;; Set opoint to beg of prev fcn
+			  ;; since otherwise calculate-c-indent
+			  ;; will get wrong answers.
+			  (error (setq opoint funbeg)
+				 (point)))))
+		  (point))))
+	 (case-fold-search nil)
+	 restart outer-loop-done inner-loop-done state ostate
+	 this-indent last-sexp
+	 at-else at-brace at-while
+	 last-depth this-point
+	 (next-depth 0))
+    ;; If the braces don't match, get an error right away.
+    (save-excursion
+      (forward-sexp 1))
+    ;; Realign the comment on the first line, even though we don't reindent it.
+    (save-excursion
+      (let ((beg (point)))
+	(and (re-search-forward
+	      comment-start-skip
+	      (save-excursion (end-of-line) (point)) t)
+	     ;; Make sure this isn't a comment alone on a line
+	     ;; (which should be indented like code instead).
+	     (save-excursion
+	       (goto-char (match-beginning 0))
+	       (skip-chars-backward " \t")
+	       (not (bolp)))
+	     ;; Make sure the comment starter we found
+	     ;; is not actually in a string or quoted.
+	     (let ((new-state
+		    (parse-partial-sexp beg (point)
+					nil nil state)))
+	       (and (not (nth 3 new-state)) (not (nth 5 new-state))))
+	    (progn (indent-for-comment) (beginning-of-line)))))
+    (save-excursion
+      (setq outer-loop-done nil)
+      (while (and (not (eobp))
+		  (if endpos (< (point) endpos)
+		    (not outer-loop-done)))
+	(setq last-depth next-depth)
+	;; Compute how depth changes over this line
+	;; plus enough other lines to get to one that
+	;; does not end inside a comment or string.
+	;; Meanwhile, do appropriate indentation on comment lines.
+	(setq inner-loop-done nil)
+	(while (and (not inner-loop-done)
+		    (not (and (eobp) (setq outer-loop-done t))))
+	  (setq ostate state)
+	  (setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
+					  nil nil state))
+	  (setq next-depth (car state))
+	  (if (and (car (cdr (cdr state)))
+		   (>= (car (cdr (cdr state))) 0))
+	      (setq last-sexp (car (cdr (cdr state)))))
+	  ;; If this line started within a comment, indent it as such.
+	  (if (or (nth 4 ostate) (nth 7 ostate))
+	      (c-indent-line))
+	  ;; If it ends outside of comments or strings, exit the inner loop.
+	  ;; Otherwise move on to next line.
+	  (if (or (nth 3 state) (nth 4 state) (nth 7 state))
+	      (forward-line 1)
+	    (setq inner-loop-done t)))
+	(and endpos
+	     (while (< next-depth 0)
+	       (setq indent-stack (append indent-stack (list nil)))
+	       (setq contain-stack (append contain-stack (list nil)))
+	       (setq next-depth (1+ next-depth))
+	       (setq last-depth (1+ last-depth))
+	       (setcar (nthcdr 6 state) (1+ (nth 6 state)))))
+	(setq outer-loop-done (and (not endpos) (<= next-depth 0)))
+	(if outer-loop-done
+	    nil
+	  ;; If this line had ..))) (((.. in it, pop out of the levels
+	  ;; that ended anywhere in this line, even if the final depth
+	  ;; doesn't indicate that they ended.
+	  (while (> last-depth (nth 6 state))
+	    (setq indent-stack (cdr indent-stack)
+		  contain-stack (cdr contain-stack)
+		  last-depth (1- last-depth)))
+	  (if (/= last-depth next-depth)
+	      (setq last-sexp nil))
+	  ;; Add levels for any parens that were started in this line.
+	  (while (< last-depth next-depth)
+	    (setq indent-stack (cons nil indent-stack)
+		  contain-stack (cons nil contain-stack)
+		  last-depth (1+ last-depth)))
+	  (if (null (car contain-stack))
+	      (setcar contain-stack (or (car (cdr state))
+					(save-excursion (forward-sexp -1)
+							(point)))))
+	  (forward-line 1)
+	  (skip-chars-forward " \t")
+	  ;; Don't really reindent if the line is just whitespace,
+	  ;; or if it is past the endpos.
+	  ;; (The exit test in the outer while
+	  ;; does not exit until we have passed the first line
+	  ;; past the region.)
+	  (if (or (eolp) (and endpos (>= (point) endpos)))
+	      nil
+	    ;; Is this line in a new nesting level?
+	    ;; In other words, is this the first line that
+	    ;; starts in the new level?
+	    (if (and (car indent-stack)
+		     (>= (car indent-stack) 0))
+		nil
+	      ;; Yes.
+	      ;; Compute the standard indent for this level.
+	      (let (val)
+		(if (= (char-after (car contain-stack)) ?{)
+		    (save-excursion
+		      (goto-char (car contain-stack))
+		      (setq val (calculate-c-indent-after-brace)))
+		  (setq val (calculate-c-indent
+			     (if (car indent-stack)
+				 (- (car indent-stack))
+			       opoint))))
+		;; t means we are in a block comment and should
+		;; calculate accordingly.
+		(if (eq val t)
+		    (setq val (calculate-c-indent-within-comment)))
+		(setcar indent-stack val)))
+	    ;; Adjust indent of this individual line
+	    ;; based on its predecessor.
+	    ;; Handle continuation lines, if, else, while, and so on.
+	    (if (/= (char-after (car contain-stack)) ?{)
+		(setq this-indent (car indent-stack))
+	      ;; Line is at statement level.
+	      ;; Is it a new statement?  Is it an else?
+	      ;; Find last non-comment character before this line
+	      (save-excursion
+		(setq this-point (point))
+		(setq at-else (and (looking-at "else\\b")
+				   (not (looking-at "else\\s_"))))
+		(setq at-brace (= (following-char) ?{))
+		(setq at-while (and (looking-at "while\\b")
+				    (not (looking-at "while\\s_"))))
+		(if (= (following-char) ?})
+		    (setq this-indent (car indent-stack))
+		  (c-backward-to-noncomment opoint)
+		  (if (not (memq (preceding-char) '(0 ?\, ?\; ?} ?: ?{)))
+		      ;; Preceding line did not end in comma or semi;
+		      ;; indent this line  c-continued-statement-offset
+		      ;; more than previous.
+		      (progn
+			(c-backward-to-start-of-continued-exp (car contain-stack))
+			(setq this-indent
+			      (+ c-continued-statement-offset (current-column)
+				 (if at-brace c-continued-brace-offset 0))))
+		    ;; Preceding line ended in comma or semi;
+		    ;; use the standard indent for this level.
+		    (cond (at-else (progn (c-backward-to-start-of-if opoint)
+					  (setq this-indent
+						(current-indentation))))
+			  ((and at-while (c-backward-to-start-of-do opoint))
+			   (setq this-indent (current-indentation)))
+			  ((eq (preceding-char) ?\,)
+			   (goto-char this-point)
+			   (setq this-indent (calculate-c-indent)))
+			  (t (setq this-indent (car indent-stack))))))))
+	    ;; Adjust line indentation according to its contents
+	    (if (or (looking-at c-switch-label-regexp)
+		    (and (looking-at "[A-Za-z]")
+			 (save-excursion
+			   (forward-sexp 1)
+			   (looking-at ":"))))
+		(setq this-indent (max 1 (+ this-indent c-label-offset))))
+	    (if (= (following-char) ?})
+		(setq this-indent (- this-indent c-indent-level)))
+	    (if (= (following-char) ?{)
+		;; Don't move an open-brace in column 0.
+		;; This is good when constructs such as
+		;; `extern "C" {' surround a function definition
+		;; that should be indented as usual.
+		;; It is also good for nested functions.
+		;; It is bad when an open-brace is indented at column 0
+		;; and you want to fix that, but we can't win 'em all.
+		(if (zerop (current-column))
+		    (setq this-indent 0)
+		  (setq this-indent (+ this-indent c-brace-offset))))
+	    ;; Don't leave indentation in empty lines.
+	    (if (eolp) (setq this-indent 0))
+	    ;; Put chosen indentation into effect.
+	    (or (= (current-column) this-indent)
+		(= (following-char) ?\#)
+		(progn
+		  (delete-region (point) (progn (beginning-of-line) (point)))
+		  (indent-to this-indent)))
+	    ;; Indent any comment following the text.
+	    (or (looking-at comment-start-skip)
+		(save-excursion
+		  (let ((beg (point)))
+		    (and (re-search-forward
+			  comment-start-skip
+			  (save-excursion (end-of-line) (point)) t)
+			 ;; Make sure the comment starter we found
+			 ;; is not actually in a string or quoted.
+			 (let ((new-state
+				(parse-partial-sexp beg (point)
+						    nil nil state)))
+			   (and (not (nth 3 new-state)) (not (nth 5 new-state))))
+			 (indent-for-comment)))))))))))
+
+;; Look at all comment-start strings in the current line after point.
+;; Return t if one of them starts a real comment.
+;; This is not used yet, because indent-for-comment
+;; isn't smart enough to handle the cases this can find.
+(defun indent-c-find-real-comment ()
+  (let (win)
+    (while (and (not win)
+		(re-search-forward comment-start-skip
+				   (save-excursion (end-of-line) (point))
+				   t))
+      ;; Make sure the comment start is not quoted.
+      (let ((state-1
+	     (parse-partial-sexp
+	      (save-excursion (beginning-of-line) (point))
+	      (point) nil nil state)))
+	(setq win (and (null (nth 3 state-1)) (null (nth 5 state-1))))))
+    win))
+
+;; Indent every line whose first char is between START and END inclusive.
+(defun c-indent-region (start end)
+  (save-excursion
+    (goto-char start)
+    ;; Advance to first nonblank line.
+    (skip-chars-forward " \t\n")
+    (beginning-of-line)
+    (let ((endmark (copy-marker end))
+	  (c-tab-always-indent t))
+      (while (and (bolp) (not (eobp)) (< (point) endmark))
+	;; Indent one line as with TAB.
+	(let ((shift-amt (c-indent-line))
+	      nextline sexpbeg sexpend)
+	  (if (save-excursion (beginning-of-line) (looking-at "[ \t]*#"))
+	      (forward-line 1)
+	    (save-excursion
+	      ;; Find beginning of following line.
+	      (save-excursion
+		(forward-line 1) (setq nextline (point)))
+	      ;; Find first beginning-of-sexp for sexp extending past this line.
+	      (beginning-of-line)
+	      (while (< (point) nextline)
+		(condition-case nil
+		    (progn
+		      (forward-sexp 1)
+		      (setq sexpend (point-marker)))
+		  (error (setq sexpend nil)
+			 (goto-char nextline)))
+		(skip-chars-forward " \t\n"))
+	      (if sexpend
+		  (progn
+		    ;; Make sure the sexp we found really starts on the
+		    ;; current line and extends past it.
+		    (goto-char sexpend)
+		    (backward-sexp 1)
+		    (setq sexpbeg (point)))))
+	    ;; If that sexp ends within the region,
+	    ;; indent it all at once, fast.
+	    (if (and sexpend (> sexpend nextline) (<= sexpend endmark)
+		     (< sexpbeg nextline))
+		(progn
+		  (indent-c-exp)
+		  (goto-char sexpend)))
+	    ;; Move to following line and try again.
+	    (and sexpend (set-marker sexpend nil))
+	    (forward-line 1))))
+      (set-marker endmark nil))))
+
+(defun set-c-style (style &optional global)
+  "Set C-mode variables to use one of several different indentation styles.
+The arguments are a string representing the desired style
+and a flag which, if non-nil, means to set the style globally.
+\(Interactively, the flag comes from the prefix argument.)
+Available styles are GNU, K&R, BSD and Whitesmith."
+  (interactive (list (let ((completion-ignore-case t))
+		       (completing-read "Use which C indentation style? "
+					c-style-alist nil t))
+		     current-prefix-arg))
+  (let ((vars (cdr (assoc style c-style-alist))))
+    (or vars
+	(error "Invalid C indentation style `%s'" style))
+    (while vars
+      (or global
+	  (make-local-variable (car (car vars))))
+      (set (car (car vars)) (cdr (car vars)))
+      (setq vars (cdr vars)))))
+
+;;; This page handles insertion and removal of backslashes for C macros.
+
+(defcustom c-backslash-column 48
+  "*Minimum column for end-of-line backslashes of macro definitions."
+  :type 'integer
+  :group 'old-c)
+
+(defun c-backslash-region (from to delete-flag)
+  "Insert, align, or delete end-of-line backslashes on the lines in the region.
+With no argument, inserts backslashes and aligns existing backslashes.
+With an argument, deletes the backslashes.
+
+This function does not modify the last line of the region if the region ends
+right at the start of the following line; it does not modify blank lines
+at the start of the region.  So you can put the region around an entire macro
+definition and conveniently use this command."
+  (interactive "r\nP")
+  (save-excursion
+    (goto-char from)
+    (let ((column c-backslash-column)
+	  (endmark (make-marker)))
+      (move-marker endmark to)
+      ;; Compute the smallest column number past the ends of all the lines.
+      (if (not delete-flag)
+	  (while (< (point) to)
+	    (end-of-line)
+	    (if (= (preceding-char) ?\\)
+		(progn (forward-char -1)
+		       (skip-chars-backward " \t")))
+	    (setq column (max column (1+ (current-column))))
+	    (forward-line 1)))
+      ;; Adjust upward to a tab column, if that doesn't push past the margin.
+      (if (> (% column tab-width) 0)
+	  (let ((adjusted (* (/ (+ column tab-width -1) tab-width) tab-width)))
+	    (if (< adjusted (window-width))
+		(setq column adjusted))))
+      ;; Don't modify blank lines at start of region.
+      (goto-char from)
+      (while (and (< (point) endmark) (eolp))
+	(forward-line 1))
+      ;; Add or remove backslashes on all the lines.
+      (while (and (< (point) endmark)
+		  ;; Don't backslashify the last line
+		  ;; if the region ends right at the start of the next line.
+		  (save-excursion
+		    (forward-line 1)
+		    (< (point) endmark)))
+	(if (not delete-flag)
+	    (c-append-backslash column)
+	  (c-delete-backslash))
+	(forward-line 1))
+      (move-marker endmark nil))))
+
+(defun c-append-backslash (column)
+  (end-of-line)
+  ;; Note that "\\\\" is needed to get one backslash.
+  (if (= (preceding-char) ?\\)
+      (progn (forward-char -1)
+	     (delete-horizontal-space)
+	     (indent-to column))
+    (indent-to column)
+    (insert "\\")))
+
+(defun c-delete-backslash ()
+  (end-of-line)
+  (or (bolp)
+      (progn
+	(forward-char -1)
+	(if (looking-at "\\\\")
+	    (delete-region (1+ (point))
+			   (progn (skip-chars-backward " \t") (point)))))))
+
+(defun c-up-conditional (count)
+  "Move back to the containing preprocessor conditional, leaving mark behind.
+A prefix argument acts as a repeat count.  With a negative argument,
+move forward to the end of the containing preprocessor conditional.
+When going backwards, `#elif' is treated like `#else' followed by `#if'.
+When going forwards, `#elif' is ignored."
+  (interactive "p")
+  (c-forward-conditional (- count) t))
+
+(defun c-backward-conditional (count &optional up-flag)
+  "Move back across a preprocessor conditional, leaving mark behind.
+A prefix argument acts as a repeat count.  With a negative argument,
+move forward across a preprocessor conditional."
+  (interactive "p")
+  (c-forward-conditional (- count) up-flag))
+
+(defun c-forward-conditional (count &optional up-flag)
+  "Move forward across a preprocessor conditional, leaving mark behind.
+A prefix argument acts as a repeat count.  With a negative argument,
+move backward across a preprocessor conditional."
+  (interactive "p")
+  (let* ((forward (> count 0))
+	 (increment (if forward -1 1))
+	 (search-function (if forward 're-search-forward 're-search-backward))
+	 (opoint (point))
+	 (new))
+    (save-excursion
+      (while (/= count 0)
+	(let ((depth (if up-flag 0 -1)) found)
+	  (save-excursion
+	    ;; Find the "next" significant line in the proper direction.
+	    (while (and (not found)
+			;; Rather than searching for a # sign that comes
+			;; at the beginning of a line aside from whitespace,
+			;; search first for a string starting with # sign.
+			;; Then verify what precedes it.
+			;; This is faster on account of the fastmap feature of
+			;; the regexp matcher.
+			(funcall search-function
+				 "#[ \t]*\\(if\\|elif\\|endif\\)"
+				 nil t))
+	      (beginning-of-line)
+	      ;; Now verify it is really a preproc line.
+	      (if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")
+		  (let ((prev depth))
+		    ;; Update depth according to what we found.
+		    (beginning-of-line)
+		    (cond ((looking-at "[ \t]*#[ \t]*endif")
+			   (setq depth (+ depth increment)))
+			  ((looking-at "[ \t]*#[ \t]*elif")
+			   (if (and forward (= depth 0))
+			       (setq found (point))))
+			  (t (setq depth (- depth increment))))
+		    ;; If we are trying to move across, and we find
+		    ;; an end before we find a beginning, get an error.
+		    (if (and (< prev 0) (< depth prev))
+			(error (if forward
+				   "No following conditional at this level"
+				 "No previous conditional at this level")))
+		    ;; When searching forward, start from next line
+		    ;; so that we don't find the same line again.
+		    (if forward (forward-line 1))
+		    ;; If this line exits a level of conditional, exit inner loop.
+		    (if (< depth 0)
+			(setq found (point))))
+		;; If the line is not really a conditional, skip past it.
+		(if forward (end-of-line)))))
+	  (or found
+	      (error "No containing preprocessor conditional"))
+	  (goto-char (setq new found)))
+	(setq count (+ count increment))))
+    (push-mark)
+    (goto-char new)))
+
+;;; begin stuff from cc-mode
+
+(defsubst c-region-is-active-p ()
+  ;; Return t when the region is active.  The determination of region
+  ;; activeness is different in both Emacs and XEmacs.
+  (cond
+   ;; XEmacs
+   ((and (fboundp 'region-active-p)
+	 (boundp 'zmacs-regions)
+	 zmacs-regions)
+    (region-active-p))
+   ;; Emacs
+   ((boundp 'mark-active) mark-active)
+   ;; fallback; shouldn't get here
+   (t (mark t))))
+
+(defun c-fn-region-is-active-p ()
+  ;; Function version of the macro for use in places that aren't
+  ;; compiled, e.g. in the menus.
+  (c-region-is-active-p))
+
+(defun c-indent-line-or-region ()
+  "When the region is active, indent it.  Otherwise indent the current line."
+  ;; Emacs has a variable called mark-active, XEmacs uses region-active-p
+  (interactive)
+  (if (c-region-is-active-p)
+      (c-indent-region (region-beginning) (region-end))
+    (indent-according-to-mode)))
+
+(defmacro c-point (position &optional point)
+  ;; Returns the value of certain commonly referenced POSITIONs
+  ;; relative to POINT.  The current point is used if POINT isn't
+  ;; specified.  POSITION can be one of the following symbols:
+  ;; 
+  ;; bol  -- beginning of line
+  ;; eol  -- end of line
+  ;; bod  -- beginning of defun
+  ;; eod  -- end of defun
+  ;; boi  -- back to indentation
+  ;; ionl -- indentation of next line
+  ;; iopl -- indentation of previous line
+  ;; bonl -- beginning of next line
+  ;; bopl -- beginning of previous line
+  ;; 
+  ;; This function does not modify point or mark.
+  `(save-excursion
+     ,(if point `(goto-char ,point))
+     ,(if (and (eq (car-safe position) 'quote)
+	       (symbolp (eval position)))
+	  (let ((position (eval position)))
+	    (cond
+	     ((eq position 'bol)  `(beginning-of-line))
+	     ((eq position 'eol)  `(end-of-line))
+	     ((eq position 'boi)  `(back-to-indentation))
+	     ((eq position 'bonl) `(forward-line 1))
+	     ((eq position 'bopl) `(forward-line -1))
+	     ((eq position 'bod)  `(c-beginning-of-defun-1))
+	     ((eq position 'eod)  `(c-end-of-defun-1))
+	     ((eq position 'iopl) `(progn
+				     (forward-line -1)
+				     (back-to-indentation)))
+	     ((eq position 'ionl) `(progn
+				     (forward-line 1)
+				     (back-to-indentation)))
+	     (t (error "unknown buffer position requested: %s" position))))
+	;;(message "c-point long expansion")
+	`(let ((position ,position))
+	   (cond
+	    ((eq position 'bol)  (beginning-of-line))
+	    ((eq position 'eol)  (end-of-line))
+	    ((eq position 'boi)  (back-to-indentation))
+	    ((eq position 'bonl) (forward-line 1))
+	    ((eq position 'bopl) (forward-line -1))
+	    ((eq position 'bod)  (c-beginning-of-defun-1))
+	    ((eq position 'eod)  (c-end-of-defun-1))
+	    ((eq position 'iopl) (progn
+				   (forward-line -1)
+				   (back-to-indentation)))
+	    ((eq position 'ionl) (progn
+				   (forward-line 1)
+				   (back-to-indentation)))
+	    (t (error "unknown buffer position requested: %s" position)))))
+     (point)))
+
+(defmacro c-safe (&rest body)
+  ;; safely execute BODY, return nil if an error occurred
+  `(condition-case nil
+       (progn ,@body)
+     (error nil)))
+
+(defmacro c-forward-sexp (&optional arg)
+  ;; like forward-sexp except
+  ;;   1. this is much stripped down from the XEmacs version
+  ;;   2. this cannot be used as a command, so we're insulated from
+  ;;      XEmacs' losing efforts to make forward-sexp more user
+  ;;      friendly
+  ;;   3. Preserves the semantics most of CC Mode is based on
+  (or arg (setq arg 1))
+  `(goto-char (or (scan-sexps (point) ,arg)
+		  ,(if (numberp arg)
+		       (if (> arg 0) `(point-max) `(point-min))
+		     `(if (> ,arg 0) (point-max) (point-min))))))
+
+(defmacro c-backward-sexp (&optional arg)
+  ;; See c-forward-sexp and reverse directions
+  (or arg (setq arg 1))
+  `(c-forward-sexp ,(if (numberp arg) (- arg) `(- ,arg))))
+
+(defun c-indent-exp (&optional shutup-p)
+  "Indent each line in the balanced expression following point syntactically.
+If optional SHUTUP-P is non-nil, no errors are signalled if no
+balanced expression is found."
+  (interactive "*P")
+  (let ((here (point-marker))
+	end)
+    (set-marker-insertion-type here t)
+    (unwind-protect
+	(let ((start (progn
+		       ;; try to be smarter about finding the range of
+		       ;; lines to indent. skip all following
+		       ;; whitespace, then try to find any
+		       ;; opening paren on the current line
+		       (skip-chars-forward " \t\n")
+		       (save-restriction
+			 (narrow-to-region (point-min) (c-point 'eol))
+			 (c-safe (1- (scan-lists (point) 1 -1)))))))
+	  ;; find balanced expression end
+	  (setq end (and (c-safe (progn (c-forward-sexp 1) t))
+			 (point)))
+	  ;; sanity check
+	  (if (not start)
+	     (unless shutup-p
+	       (error "Cannot find start of balanced expression to indent"))
+	    (if (not end)
+		(unless shutup-p
+		  (error "Cannot find end of balanced expression to indent"))
+	      (c-indent-region start end))))
+      (goto-char here)
+      (set-marker here nil))))
+
+(defun c-insert-matching-endif ()
+  "Insert a #endif expression matching the corresponding #if... statement.
+This skips across any number of intervening #if/#endif pairs to find the
+matching #if/#ifdef/#ifndef statement and inserts a #endif with a comment
+corresponding to the expression following the #if.  If the statement is
+a #ifndef, the word \"not\" appears in the comment.  If there are spaces
+between the '#' and the 'if', the same number of spaces appear in the
+#endif.  Comments following the #if statement are ignored and do not appear
+in the #endif comment."
+  (interactive)
+  (let (spaces expr notp)
+    (save-excursion
+      (c-up-conditional 1)
+      ;; we have to construct the regexps carefully to avoid running into
+      ;; problems due to the greedy operators.  XEmacs has non-greedy
+      ;; operators, which would simplify matters, but they're not present
+      ;; in GNU Emacs.
+      (or (looking-at "#\\( *\\)if\\(n?\\)[a-z]*\\(.*[^ \t\n]\\)[ \t]*/[*/].*")
+	  (looking-at "#\\( *\\)if\\(n?\\)[a-z]*\\(.*[^ \t\n]\\)")
+	  (error "Malformed #if... expression"))
+      (setq spaces (match-string 1))
+      (setq notp (> (match-end 2) (match-beginning 2)))
+      (setq expr (match-string 3)))
+    (insert "#" spaces "endif /*" (if notp " not" "") expr " */\n")))
+
+;;; end stuff from cc-mode
+
+
+
+(provide 'c-mode)
+
+;;; old-c-mode.el ends here
+;;; p4.el --- Simple Perforce-Emacs Integration
+;;
+;; $Id$
+
+;;; Commentary:
+;;
+;;    Applied the GNU G.P.L. to this file - rv 3/27/1997
+
+;;    Programs for  Emacs <-> Perforce Integration.
+;;    Copyright (C) 1996, 1997	Eric Promislow
+;;    Copyright (C) 1997-2001  Rajesh Vaidheeswarran
+;;
+;;    This program is free software; you can redistribute it and/or modify
+;;    it under the terms of the GNU General Public License as published by
+;;    the Free Software Foundation; either version 2 of the License, or
+;;    (at your option) any later version.
+;;
+;;    This program is distributed in the hope that it will be useful,
+;;    but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;    GNU General Public License for more details.
+;;
+;;    You should have received a copy of the GNU General Public License
+;;    along with this program; if not, write to the Free Software
+;;    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;
+;;    If you have any problems to report, or suggestions, please send them
+;;    to rv@dsmit.com
+
+;; LCD Archive Entry:
+;; p4|Rajesh Vaidheeswarran|rv@dsmit.com|
+;; P4 SCM Integration into Emacs/XEmacs|
+;; 2000/08/02|8.5|not_assigned_yet|
+
+;;
+;; WARNING:
+;; --------
+;;
+;;    % p4 edit foo.c
+;;    ... make changes to foo.c in emacs
+;;    % p4 submit
+;;     ... keep the writable copy of foo.c in emacs.  Start making changes
+;;     to it.  Discover that you can't save it.	 If you do M-x:p4-edit,
+;;     you'll lose your changes.  You need to do a 'p4 edit' at the
+;;     command-line.
+;;
+
+;; Original Functions:	 (Contributed by Eric Promislow)
+;; p4-exec-p4		     (not exported)
+;; p4-buffer-action	     (not exported)
+;; p4-edit
+;; p4-revert
+;; p4-diff
+
+
+;; NOTES:
+;; ------
+;;
+;; It is best if you take this file and byte compile it. To do that, you
+;; need to do the following:
+;;
+;; % emacs -batch -f batch-byte-compile /full/path/to/file/p4.el
+;;
+;; This creates a binary file p4.elc in the path. Add the path to your
+;; load-path variable in .emacs like this:
+;;
+;; (setq load-path (cons "/full/path/to/file" load-path))
+;;
+;; Then add the library like this:
+;;
+;; (load-library "p4")
+;;
+
+;;; Code:
+
+;; We need to remap C-x C-q to p4-toggle-read-only, so, make sure that we
+;; load vc first.. or else, when vc gets autoloaded, it will remap C-x C-q
+;; to vc-toggle-read-only.
+(require 'vc)
+
+(defvar p4-emacs-version "8.5" "The Current P4-Emacs Integration Revision.")
+
+;; Find out what type of emacs we are running in. We will be using this
+;; quite a few times in this program.
+(defvar p4-running-emacs nil
+  "If the current Emacs is not XEmacs, then, this is non-nil.")
+(defvar p4-running-xemacs nil
+  "If the current Emacs is XEmacs/Lucid, then, this is non-nil.")
+(if (string-match "XEmacs\\|Lucid" emacs-version)
+    (setq p4-running-xemacs t)
+  (setq p4-running-emacs t))
+
+(defvar p4-emacs-maintainer "Rajesh Vaidheeswarran <rv@dsmit.com>"
+  "The maintainer of the emacs-p4 integration. Used for bug reports.")
+
+(defvar p4-web-page "http://www.dsmit.com/p4/" "The home of p4.el.")
+
+;; For flavors of Emacs which don't define `defgroup' and `defcustom'.
+(eval-when-compile
+  (if (not (fboundp 'defgroup))
+      (defmacro defgroup (sym memb doc &rest args)
+	"Null macro for defgroup in all versions of Emacs that don't define
+defgroup"
+	t))
+  (if (not (fboundp 'defcustom))
+      (defmacro defcustom (sym val doc &rest args)
+	"Macro to alias defcustom to defvar in all versions of Emacs that
+don't define defcustom"
+	`(defvar ,sym ,val ,doc))))
+
+(defgroup p4 nil "Perforce VC System." :group 'tools)
+
+;; This can be set to wherever 'p4' lies using p4-set-p4-executable
+(defcustom p4-executable
+  (let ((lst (list "/usr/swlocal/bin/p4"
+		   "/usr/local/bin/p4"
+		   "/usr/bin/p4"
+		   "/bin/p4"))
+	(p4ex nil))
+    (while (and lst (not p4ex))
+      (if (file-executable-p (car lst))
+	  (setq p4ex (car lst)))
+      (setq lst (cdr lst)))
+    p4ex)
+  "This is the p4 executable.
+To set this, use the function  `p4-set-p4-executable' or `customize'"
+  :type 'string
+  :group 'p4)
+
+;; This is a string with default arguments to pass to "p4 diff",
+;; "p4 diff2", "p4 describe", etc.
+(defcustom p4-default-diff-options "-du"
+  "Type of p4 diff output to be displayed. \(regular or context or
+unified.\)"
+  :type 'string
+  :group 'p4)
+
+;; Set this variable to nil to turn off colorized diff buffers.
+(defcustom p4-colorized-diffs t
+  "Set this to nil to disable colorized diffs."
+  :type 'boolean
+  :group 'p4)
+
+;; Set whether P4CONFIG should be used exclusively for VC checking
+(defcustom p4-use-p4config-exclusively nil
+  "Whether P4 mode should use P4CONFIG exclusively to check whether a file
+is under P4 version control. If set to nil, `p4-check-mode' is always
+called; otherwise, it checks to see if the file named by P4CONFIG exists in
+this or a parent directory, and if so, only then runs p4-check-mode.
+
+This provides for a much faster `p4-find-file-hook'."
+  :type 'boolean
+  :group 'p4)
+
+;; Set the null device
+(defcustom p4-null-device
+  (if (memq system-type '(ms-dos windows-nt)) "NUL" "/dev/null")
+  "Filesystem null device."
+  :type 'string
+  :group 'p4)
+
+;; Auto-refresh?
+(defcustom p4-auto-refresh nil
+  "Set this to automatically refresh p4 submitted files in buffers."
+  :type 'boolean
+  :group 'p4)
+
+;; Check for empty diffs at submit time
+(defcustom p4-check-empty-diffs t
+  "Set this to check for files with empty diffs before submitting."
+  :type 'boolean
+  :group 'p4)
+
+(defcustom p4-verbose t
+  "When set, p4 will pop up the output buffer with the result of the
+command."
+  :type 'boolean
+  :group 'p4)
+
+(defcustom p4-mode-hook nil
+  "Hook run by `p4-mode'."
+  :type 'sexp
+  :group 'p4)
+
+
+(defvar p4-output-buffer-name "*P4 Output*" "P4 Output Buffer.")
+(defvar p4-global-config (getenv "P4CONFIG") "P4 Config to use.")
+(defvar p4-global-clt (if p4-global-config nil
+			(getenv "P4CLIENT")) "The P4 Client to use.")
+
+;; Set this variable in .emacs if you want p4-set-client-name to complete
+;; your client name for you.
+(defvar p4-my-clients nil
+  "This variable holds the alist of p4 clients that the function
+`p4-set-client-name' can complete on.
+
+Set this variable *only* if you don't want P4 to complete on all the clients
+in the P4 server.
+
+This is a alist, and should be set using the function
+`p4-set-my-clients'. For example, in your .emacs:
+
+\(load-library \"p4\"\)
+\(p4-set-my-clients \'(client1 client2 client3)\)")
+
+;; Set this variable in .emacs if you want to alter the completion
+;; behavior of p4-set-client-name.
+
+(defcustom p4-strict-complete t
+  "Set this variable in .emacs \(or using `customize'\) if you want to alter
+the completion behavior of `p4-set-client-name'.
+"
+  :type 'boolean
+  :group 'p4)
+
+(defvar p4-global-server-port  (if p4-global-config
+				   (progn
+				     (setenv "P4PORT" nil)
+				     nil)
+				 (getenv "P4PORT"))
+  "The P4 Server/Port in use.")
+(if (and (eq p4-global-server-port nil) (eq p4-global-config nil))
+    (progn
+      (setq p4-global-server-port "p4:1666") ;; Default P4 port.
+      (setenv "P4PORT" p4-global-server-port)))
+
+(defvar p4-old-notify-list (getenv "P4NOTIFY") "The P4 Notify List.")
+(defvar p4-notify-list (getenv "P4NOTIFY") "The P4 Notify List.")
+
+(defcustom p4-sendmail-program (if (boundp 'sendmail-program)
+				   sendmail-program
+				 nil)
+  "The sendmail program. To set this use `p4-set-sendmail-program' or
+`customize'."
+  :type 'string
+  :group 'p4)
+
+(defcustom p4-user-email (if (boundp 'user-mail-address)
+			     user-mail-address nil)
+  "The e-mail address of the current user. This is used with the
+notification system, and must be set if notification should take place. To
+set this use `p4-set-user-email' or `customize'."
+  :type 'string
+  :group 'p4)
+
+(defcustom p4-notify nil
+  "If this is t then the users in the notification list set by
+`p4-set-notify-list' will get a notification of any P4 change submitted from
+within emacs."
+  :type 'boolean
+  :group 'p4)
+
+;; This can be set with p4-toggle-vc-mode
+(defcustom p4-do-find-file t
+  "If non-nil, the `p4-find-file-hook' will run when opening files."
+  :type 'boolean
+  :group 'p4)
+
+;; Now add a hook to find-file-hooks
+(add-hook 'find-file-hooks 'p4-find-file-hook)
+;; .. and one to kill-buffer-hook
+(add-hook 'kill-buffer-hook 'p4-kill-buffer-hook)
+
+;; Tell Emacs about this new kind of minor mode
+(defvar p4-mode nil "Is this file under p4?")
+(make-variable-buffer-local 'p4-mode)
+(put 'p4-mode 'permanent-local t)
+
+(defvar p4-local-client nil "Buffer Local value of the p4 client name.")
+(make-variable-buffer-local 'p4-local-client)
+(put 'p4-local-client 'permanent-local t)
+(set-default 'p4-local-client nil)
+
+(defvar p4-local-server-port nil "Buffer Local value of the p4 server/port.")
+(make-variable-buffer-local 'p4-local-server-port)
+(put 'p4-local-server-port 'permanent-local t)
+(set-default 'p4-local-server-port nil)
+
+(if (not (assoc 'p4-mode minor-mode-alist))
+    (setq minor-mode-alist (cons '(p4-mode p4-mode)
+				 minor-mode-alist)))
+
+(defvar p4-minor-mode nil
+  "The minor mode for editing p4 asynchronous command buffers.")