xemacs-beta: lisp/modes/cc-mode.el comparison

comparison lisp/modes/cc-mode.el @ 4:b82b59fe008d r19-15b3

Import from CVS: tag r19-15b3

author	cvs
date	Mon, 13 Aug 2007 08:46:56 +0200
parents	ac2d302a0011
children	27bc7f280385

comparison

equal deleted inserted replaced

-:30df88044ec6
+:b82b59fe008d
 ;; Authors: 1992-1996 Barry A. Warsaw
 ;;          1987 Dave Detlefs and Stewart Clamen
 ;;          1985 Richard M. Stallman
 ;; Created: a long, long, time ago. adapted from the original c-mode.el
-;; Version:         4.315
+;; Version:         4.322
-;; Last Modified:   1996/08/20 21:08:13
+;; Last Modified:   1996/10/04 20:28:14
 ;; Keywords: c languages oop
 ;; NOTE: Read the commentary below for the right way to submit bug reports!
 ;; NOTE: See the accompanying texinfo manual for details on using this mode!
 (access-label         . -3)
 (inclass              . 6)
 (inline-open          . 0)
 ))
 )
+("linux"
+(c-basic-offset  . 8)
+(c-comment-only-line-offset . 0)
+(c-hanging-braces-alist . ((brace-list-open)
+				(substatement-open after)
+				(block-close . c-snug-do-while)))
+(c-cleanup-list . (brace-else-brace))
+(c-offsets-alist . ((statement-block-intro . +)
+			 (knr-argdecl-intro     . 0)
+			 (substatement-open     . 0)
+			 (label                 . 0)
+			 (statement-cont        . +)
+			 ))
+)
 ("java"
 (c-basic-offset . 2)
 (c-comment-only-line-offset . (0 . 0))
 (c-offsets-alist . ((statement-block-intro . +)
 			 (knr-argdecl-intro     . 5)
 ["Backward Conditional"   c-backward-conditional t]
 ["Forward Conditional"    c-forward-conditional t]
 ["Backward Statement"     c-beginning-of-statement t]
 ["Forward Statement"      c-end-of-statement t]
 )
-"XEmacs 19 menu for C/C++/ObjC modes.")
+"XEmacs 19 menu for C/C++/ObjC/Java modes.")
 ;; Sadly we need this for a macro in Emacs 19.
 (eval-when-compile
 ;; Imenu isn't used in XEmacs, so just ignore load errors.
 (condition-case ()
 	(define-key map [menu-bar c backward-stmt]
 	  '("Backward Statement" . c-beginning-of-statement))
 	(define-key map [menu-bar c forward-stmt]
 	  '("Forward Statement" . c-end-of-statement))
-	;; RMS: mouse-3 should not select this menu.  mouse-3's global
+	;; RMS says: mouse-3 should not select this menu.  mouse-3's
-	;; definition is useful in C mode and we should not interfere
+	;; global definition is useful in C mode and we should not
-	;; with that.  The menu is mainly for beginners, and for them,
+	;; interfere with that.  The menu is mainly for beginners, and
-	;; the menubar requires less memory than a special click.
+	;; for them, the menubar requires less memory than a special
+	;; click.
 	t)
 (error nil)))
 (defvar c-mode-map ()
 "Keymap used in c-mode buffers.")
 ;; conflicts with OOBR
 ;;(define-key c-mode-map "\C-c\C-v"  'c-version)
 ;;
 ;; Emacs 19 defines menus in the mode map. This call will return
 ;; t on Emacs 19, otherwise no-op and return nil.
-(if (and (not (c-mode-fsf-menu "C" c-mode-map))
+(if (and (not (c-mode-fsf-menu "CC-Mode" c-mode-map))
 	   ;; in XEmacs 19, we want the menu to popup when the 3rd
 	   ;; button is hit.  In Lucid Emacs 19.10 and beyond this is
 	   ;; done automatically if we put the menu on mode-popup-menu
 	   ;; variable, see c-common-init. Emacs 19 uses C-Mouse-3 for
 	   ;; this, and it works with no special effort.
 (define-key c++-mode-map "/"      'c-electric-slash)
 (define-key c++-mode-map "<"      'c-electric-lt-gt)
 (define-key c++-mode-map ">"      'c-electric-lt-gt)
 ;; Emacs 19 defines menus in the mode map. This call will return
 ;; t on Emacs 19, otherwise no-op and return nil.
-(c-mode-fsf-menu "C++" c++-mode-map))
+;  (c-mode-fsf-menu "C++" c++-mode-map)
+)
 (defvar objc-mode-map ()
 "Keymap used in objc-mode buffers.")
 (if objc-mode-map
 ()
 (setq objc-mode-map (nconc (make-sparse-keymap) c-mode-map)))
 ;; add bindings which are only useful for Objective-C
 (define-key objc-mode-map "/"      'c-electric-slash)
 ;; Emacs 19 defines menus in the mode map. This call will return
 ;; t on Emacs 19, otherwise no-op and return nil.
-(c-mode-fsf-menu "ObjC" objc-mode-map))
+;  (c-mode-fsf-menu "ObjC" objc-mode-map)
+)
 (defvar java-mode-map ()
 "Keymap used in java-mode buffers.")
 (if java-mode-map
 ()
 (setq java-mode-map (nconc (make-sparse-keymap) c-mode-map)))
 ;; add bindings which are only useful for Java
 (define-key java-mode-map "/"      'c-electric-slash)
 ;; Emacs 19 defines menus in the mode map. This call will return t
 ;; on Emacs 19, otherwise no-op and return nil.
-(c-mode-fsf-menu "Java" java-mode-map))
+;  (c-mode-fsf-menu "Java" java-mode-map)
+)
 (defun c-populate-syntax-table (table)
 ;; Populate the syntax TABLE
 ;; DO NOT TRY TO SET _ (UNDERSCORE) TO WORD CLASS!
 (modify-syntax-entry ?_  "_"     table)
 ;; style variables are made buffer local at tail end of this file.
 ;; cmacexp is lame because it uses no preprocessor symbols.
 ;; It isn't very extensible either -- hardcodes /lib/cpp.
 ;; [I add it here only because c-mode has it -- BAW]
-;;(autoload 'c-macro-expand "cmacexp"
+;(autoload 'c-macro-expand "cmacexp"
-;;  "Display the result of expanding all C macros occurring in the region.
+;  "Display the result of expanding all C macros occurring in the region.
-;;The expansion is entirely correct because it uses the C preprocessor."
+;The expansion is entirely correct because it uses the C preprocessor."
-;;  t)
+;  t)
 ;; constant regular expressions for looking at various constructs
 (defconst c-C++-class-key "\\(class\\|struct\\|union\\)"
 "Regexp describing a C++ class declaration, including templates.")
 (if s
 	(setcdr s (copy-alist descrip))	; replace
 (setq c-style-alist (cons (cons style descrip) c-style-alist))))
 (and set-p (c-set-style style)))
 (defun c-fill-paragraph (&optional arg)
 "Like \\[fill-paragraph] but handles C and C++ style 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.
 (c-keep-region-active))
 ;; commands to indent lines, regions, defuns, and expressions
 (defun c-indent-command (&optional whole-exp)
-"Indent current line as C++ code, or in some cases insert a tab character.
+"Indent current line as C code, and/or insert some whitespace.
 If `c-tab-always-indent' is t, always just indent the current line.
 If nil, indent the current line only if point is at the left margin or
-in the line's indentation; otherwise insert a tab.  If other than nil
+in the line's indentation; otherwise insert some whitespace[*].  If
-or t, then tab is inserted only within literals (comments and strings)
+other than nil or t, then some whitespace[*] is inserted only within
-and inside preprocessor directives, but line is always reindented.
+literals (comments and strings) and inside preprocessor directives,
+but the line is always reindented.
 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."
+of the expression are preserved.
+[*] The amount and kind of whitespace inserted is controlled by the
+variable `c-insert-tab-function', which is called to do the actual
+insertion of whitespace.  Normally the function in this variable
+just inserts a tab character, or the equivalent number of spaces,
+depending on the variable `indent-tabs-mode'."
 (interactive "P")
 (let ((bod (c-point 'bod)))
 (if whole-exp
 	;; If arg, always indent this line as C
 	;; and shift remaining lines of expression the same amount.
 (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
+This function does not modify blank lines at the start of the region.
-right at the start of the following line; it does not modify blank lines
+If the region ends at the start of a line, it always deletes the
-at the start of the region.  So you can put the region around an entire macro
+backslash (if any) at the end of the previous line.
-definition and conveniently use this command."
+You can put the region around an entire macro definition and use this
+command to conveniently insert and align the necessary backslashes."
 (interactive "r\nP")
 (save-excursion
 (goto-char from)
 (let ((column c-backslash-column)
 (endmark (make-marker)))
 ;; 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)
+(while (< (point) endmark)
-;; Don't backslashify the last line
+	(if (and (not delete-flag)
-;; if the region ends right at the start of the next line.
+		 ;; Un-backslashify the last line
-(save-excursion
+		 ;; if the region ends right at the start of the next line.
-(forward-line 1)
+		 (save-excursion
-(< (point) endmark)))
+		   (forward-line 1)
-(if (not delete-flag)
+		   (< (point) endmark)))
 (c-append-backslash column)
 (c-delete-backslash))
 (forward-line 1))
-(move-marker endmark nil))))
+(move-marker endmark nil)))
+(c-keep-region-active))
 (defun c-append-backslash (column)
 (end-of-line)
 ;; Note that "\\\\" is needed to get one backslash.
 (if (= (preceding-char) ?\\)
 			   (progn (skip-chars-backward " \t") (point)))))))
 ;; defuns for submitting bug reports
-(defconst c-version "4.315"
+(defconst c-version "4.322"
 "cc-mode version number.")
 (defconst c-mode-help-address
 "bug-gnu-emacs@prep.ai.mit.edu, cc-mode-help@python.org"
 "Address for cc-mode bug reports.")
 			   '(c-backslash-column
 			     c-basic-offset
 			     c-block-comments-indent-p
 			     c-cleanup-list
 			     c-comment-only-line-offset
-			     c-echo-syntactic-information-p
 			     c-electric-pound-behavior
 			     c-hanging-braces-alist
 			     c-hanging-colons-alist
 			     c-hanging-comment-ender-p
 			     c-offsets-alist
-			     c-strict-syntax-p
-			     c-tab-always-indent
-			     c-inhibit-startup-warnings-p
 			     )))
 ;; the default style is now GNU.  This can be overridden in
 ;; c-mode-common-hook or {c,c++,objc,java}-mode-hook.
 (c-set-style c-site-default-style)))
 (fset 'electric-c-semi       'c-electric-semi&comma)
 (fset 'electric-c-sharp-sign 'c-electric-pound)
 ;; there is no cc-mode equivalent for electric-c-terminator
 (fset 'mark-c-function       'c-mark-function)
 (fset 'indent-c-exp          'c-indent-exp)
-(fset 'set-c-style           'c-set-style)
+;;;###autoload (fset 'set-c-style           'c-set-style)
 ;; Lucid Emacs 19.9 + font-lock + cc-mode - c++-mode lossage
 (fset 'c++-beginning-of-defun 'beginning-of-defun)
 (fset 'c++-end-of-defun 'end-of-defun)
 ;; set up bc warnings for obsolete variables, but for now lets not

Mercurial > hg > xemacs-beta

comparison lisp/modes/cc-mode.el @ 4:b82b59fe008d r19-15b3