From d0c679bc851f71e011390a5f80dc52869781d771 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 11 Dec 2000 21:34:11 +0000
Subject: Moved from progmodes/c-mode.el to obsolete/c-mode.el

---
 lisp/ChangeLog           |    4 +
 lisp/obsolete/c-mode.el  | 1677 ++++++++++++++++++++++++++++++++++++++++++++++
 lisp/progmodes/c-mode.el | 1677 ----------------------------------------------
 3 files changed, 1681 insertions(+), 1677 deletions(-)
 create mode 100644 lisp/obsolete/c-mode.el
 delete mode 100644 lisp/progmodes/c-mode.el

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c979283875..e9ea44a281a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-11  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* obsolete/c-mode.el: Moved from progmodes.
+	
 2000-12-11  Carsten Dominik  <dominik@strw.leidenuniv.nl>
 
 	* progmodes/idlwave.el: Updated to IDLWAVE version 4.7.  Too many
diff --git a/lisp/obsolete/c-mode.el b/lisp/obsolete/c-mode.el
new file mode 100644
index 00000000000..2be4ea9ed18
--- /dev/null
+++ b/lisp/obsolete/c-mode.el
@@ -0,0 +1,1677 @@
+;;; c-mode.el --- C code editing commands for Emacs
+
+;; Copyright (C) 1985, 86, 87, 92, 94, 95 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
+;; 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:
+
+;; 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 "\177" 'backward-delete-char-untabify)
+(define-key c-mode-map "\t" 'c-indent-command)
+
+(define-key c-mode-map [menu-bar] (make-sparse-keymap))
+
+;; "C-mode" is not strictly the right punctuation--it should be "C
+;; mode"--but that would look like two menu items.  "C-mode" is the
+;; best alternative I can think of.
+(define-key c-mode-map [menu-bar c]
+  (cons "C-mode" (make-sparse-keymap "C-mode")))
+
+(define-key c-mode-map [menu-bar c comment-region]
+  '("Comment Out Region" . comment-region))
+(define-key c-mode-map [menu-bar c c-macro-expand]
+  '("Macro Expand Region" . c-macro-expand))
+(define-key c-mode-map [menu-bar c c-backslash-region]
+  '("Backslashify" . c-backslash-region))
+(define-key c-mode-map [menu-bar c indent-exp]
+  '("Indent Expression" . indent-c-exp))
+(define-key c-mode-map [menu-bar c indent-line]
+  '("Indent Line" . c-indent-command))
+(define-key c-mode-map [menu-bar c fill]
+  '("Fill Comment Paragraph" . c-fill-paragraph))
+(define-key c-mode-map [menu-bar c cpp-highlight-buffer]
+  '("Highlight Conditionals" . cpp-highlight-buffer))
+(define-key c-mode-map [menu-bar c up]
+  '("Up Conditional" . c-up-conditional))
+(define-key c-mode-map [menu-bar c backward]
+  '("Backward Conditional" . c-backward-conditional))
+(define-key c-mode-map [menu-bar c forward]
+  '("Forward Conditional" . c-forward-conditional))
+(define-key c-mode-map [menu-bar c backward-stmt]
+  '("Backward Statement" . c-beginning-of-statement))
+(define-key c-mode-map [menu-bar c forward-stmt]
+  '("Forward Statement" . c-end-of-statement))
+
+(put 'comment-region 'menu-enable 'mark-active)
+(put 'c-macro-expand 'menu-enable 'mark-active)
+(put 'c-backslash-region 'menu-enable 'mark-active)
+
+(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)
+
+(defvar c-mode-syntax-table nil
+  "Syntax table in use in C-mode buffers.")
+
+(if c-mode-syntax-table
+    ()
+  (setq c-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\\ "\\" c-mode-syntax-table)
+  (modify-syntax-entry ?/ ". 14" c-mode-syntax-table)
+  (modify-syntax-entry ?* ". 23" c-mode-syntax-table)
+  (modify-syntax-entry ?+ "." c-mode-syntax-table)
+  (modify-syntax-entry ?- "." c-mode-syntax-table)
+  (modify-syntax-entry ?= "." c-mode-syntax-table)
+  (modify-syntax-entry ?% "." c-mode-syntax-table)
+  (modify-syntax-entry ?< "." c-mode-syntax-table)
+  (modify-syntax-entry ?> "." c-mode-syntax-table)
+  (modify-syntax-entry ?& "." c-mode-syntax-table)
+  (modify-syntax-entry ?| "." c-mode-syntax-table)
+  (modify-syntax-entry ?\' "\"" c-mode-syntax-table))
+
+(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")
+  (setq local-abbrev-table c-mode-abbrev-table)
+  (set-syntax-table c-mode-syntax-table)
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start (concat "$\\|" page-delimiter))
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate paragraph-start)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (setq paragraph-ignore-fill-prefix t)
+  (make-local-variable 'fill-paragraph-function)
+  (setq fill-paragraph-function 'c-fill-paragraph)
+  (make-local-variable 'indent-line-function)
+  (setq indent-line-function 'c-indent-line)
+  (make-local-variable 'indent-region-function)
+  (setq indent-region-function 'c-indent-region)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-local-variable 'outline-regexp)
+  (setq outline-regexp "[^#\n\^M]")
+  (make-local-variable 'outline-level)
+  (setq outline-level 'c-outline-level)
+  (make-local-variable 'comment-start)
+  (setq comment-start "/* ")
+  (make-local-variable 'comment-end)
+  (setq comment-end " */")
+  (make-local-variable 'comment-start-skip)
+  (setq comment-start-skip "/\\*+ *")
+  (make-local-variable 'comment-indent-function)
+  (setq comment-indent-function 'c-comment-indent)
+  (make-local-variable 'comment-multi-line)
+  (setq comment-multi-line t)
+  (make-local-variable 'parse-sexp-ignore-comments)
+  (setq parse-sexp-ignore-comments t)
+  (make-local-variable 'imenu-generic-expression)
+  (setq imenu-generic-expression c-imenu-generic-expression)
+  (setq imenu-case-fold-search nil)
+  (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)))
+
+(provide 'c-mode)
+
+;;; c-mode.el ends here
diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
deleted file mode 100644
index 2be4ea9ed18..00000000000
--- a/lisp/progmodes/c-mode.el
+++ /dev/null
@@ -1,1677 +0,0 @@
-;;; c-mode.el --- C code editing commands for Emacs
-
-;; Copyright (C) 1985, 86, 87, 92, 94, 95 Free Software Foundation, Inc.
-
-;; Maintainer: FSF
-;; 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:
-
-;; 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 "\177" 'backward-delete-char-untabify)
-(define-key c-mode-map "\t" 'c-indent-command)
-
-(define-key c-mode-map [menu-bar] (make-sparse-keymap))
-
-;; "C-mode" is not strictly the right punctuation--it should be "C
-;; mode"--but that would look like two menu items.  "C-mode" is the
-;; best alternative I can think of.
-(define-key c-mode-map [menu-bar c]
-  (cons "C-mode" (make-sparse-keymap "C-mode")))
-
-(define-key c-mode-map [menu-bar c comment-region]
-  '("Comment Out Region" . comment-region))
-(define-key c-mode-map [menu-bar c c-macro-expand]
-  '("Macro Expand Region" . c-macro-expand))
-(define-key c-mode-map [menu-bar c c-backslash-region]
-  '("Backslashify" . c-backslash-region))
-(define-key c-mode-map [menu-bar c indent-exp]
-  '("Indent Expression" . indent-c-exp))
-(define-key c-mode-map [menu-bar c indent-line]
-  '("Indent Line" . c-indent-command))
-(define-key c-mode-map [menu-bar c fill]
-  '("Fill Comment Paragraph" . c-fill-paragraph))
-(define-key c-mode-map [menu-bar c cpp-highlight-buffer]
-  '("Highlight Conditionals" . cpp-highlight-buffer))
-(define-key c-mode-map [menu-bar c up]
-  '("Up Conditional" . c-up-conditional))
-(define-key c-mode-map [menu-bar c backward]
-  '("Backward Conditional" . c-backward-conditional))
-(define-key c-mode-map [menu-bar c forward]
-  '("Forward Conditional" . c-forward-conditional))
-(define-key c-mode-map [menu-bar c backward-stmt]
-  '("Backward Statement" . c-beginning-of-statement))
-(define-key c-mode-map [menu-bar c forward-stmt]
-  '("Forward Statement" . c-end-of-statement))
-
-(put 'comment-region 'menu-enable 'mark-active)
-(put 'c-macro-expand 'menu-enable 'mark-active)
-(put 'c-backslash-region 'menu-enable 'mark-active)
-
-(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)
-
-(defvar c-mode-syntax-table nil
-  "Syntax table in use in C-mode buffers.")
-
-(if c-mode-syntax-table
-    ()
-  (setq c-mode-syntax-table (make-syntax-table))
-  (modify-syntax-entry ?\\ "\\" c-mode-syntax-table)
-  (modify-syntax-entry ?/ ". 14" c-mode-syntax-table)
-  (modify-syntax-entry ?* ". 23" c-mode-syntax-table)
-  (modify-syntax-entry ?+ "." c-mode-syntax-table)
-  (modify-syntax-entry ?- "." c-mode-syntax-table)
-  (modify-syntax-entry ?= "." c-mode-syntax-table)
-  (modify-syntax-entry ?% "." c-mode-syntax-table)
-  (modify-syntax-entry ?< "." c-mode-syntax-table)
-  (modify-syntax-entry ?> "." c-mode-syntax-table)
-  (modify-syntax-entry ?& "." c-mode-syntax-table)
-  (modify-syntax-entry ?| "." c-mode-syntax-table)
-  (modify-syntax-entry ?\' "\"" c-mode-syntax-table))
-
-(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")
-  (setq local-abbrev-table c-mode-abbrev-table)
-  (set-syntax-table c-mode-syntax-table)
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat "$\\|" page-delimiter))
-  (make-local-variable 'paragraph-separate)
-  (setq paragraph-separate paragraph-start)
-  (make-local-variable 'paragraph-ignore-fill-prefix)
-  (setq paragraph-ignore-fill-prefix t)
-  (make-local-variable 'fill-paragraph-function)
-  (setq fill-paragraph-function 'c-fill-paragraph)
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'c-indent-line)
-  (make-local-variable 'indent-region-function)
-  (setq indent-region-function 'c-indent-region)
-  (make-local-variable 'require-final-newline)
-  (setq require-final-newline t)
-  (make-local-variable 'outline-regexp)
-  (setq outline-regexp "[^#\n\^M]")
-  (make-local-variable 'outline-level)
-  (setq outline-level 'c-outline-level)
-  (make-local-variable 'comment-start)
-  (setq comment-start "/* ")
-  (make-local-variable 'comment-end)
-  (setq comment-end " */")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "/\\*+ *")
-  (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'c-comment-indent)
-  (make-local-variable 'comment-multi-line)
-  (setq comment-multi-line t)
-  (make-local-variable 'parse-sexp-ignore-comments)
-  (setq parse-sexp-ignore-comments t)
-  (make-local-variable 'imenu-generic-expression)
-  (setq imenu-generic-expression c-imenu-generic-expression)
-  (setq imenu-case-fold-search nil)
-  (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)))
-
-(provide 'c-mode)
-
-;;; c-mode.el ends here
-- 
cgit v1.2.3