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

comparison lisp/cc-mode/cc-langs.el @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17

author	cvs
date	Mon, 13 Aug 2007 09:53:19 +0200
parents	6075d714658b
children	e121b013d1f0

comparison

equal deleted inserted replaced

-:add28d59e586
+:bfd6434d15b3
 ;; Authors:    1992-1997 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
 ;; Maintainer: cc-mode-help@python.org
 ;; Created:    22-Apr-1997 (split from cc-mode.el)
-;; Version:    5.14
+;; Version:    5.15
 ;; Keywords:   c languages oop
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; since it is considered the end of //-comments.
 "[ \t\n]*" c-symbol-key))
 ;; comment starter definitions for various languages.  language specific
-(defconst c-C-comment-start-regexp "/[*]")
 (defconst c-C++-comment-start-regexp "/[/*]")
 ;; We need to match all 3 Java style comments
 ;; 1) Traditional C block; 2) javadoc /** ...; 3) C++ style
 (defconst c-Java-comment-start-regexp "/\\(/\\|[*][*]?\\)")
-(defvar c-comment-start-regexp c-C-comment-start-regexp)
+(defvar c-comment-start-regexp c-C++-comment-start-regexp)
 (make-variable-buffer-local 'c-comment-start-regexp)
 ;; Regexp describing a switch's case or default label for all languages
 (make-local-variable 'comment-multi-line)
 (make-local-variable 'outline-regexp)
 (make-local-variable 'outline-level)
 (make-local-variable 'adaptive-fill-regexp)
 (make-local-variable 'imenu-generic-expression) ;set in the mode functions
+;; X/Emacs 20 only
+(and (boundp 'comment-line-break-function)
+(make-local-variable 'comment-line-break-function))
 ;; Emacs 19.30 and beyond only, AFAIK
 (if (boundp 'fill-paragraph-function)
 (progn
 	(make-local-variable 'fill-paragraph-function)
 	(setq fill-paragraph-function 'c-fill-paragraph)))
 	indent-region-function 'c-indent-region
 	outline-regexp "[^#\n\^M]"
 	outline-level 'c-outline-level
 	comment-column 32
 	comment-start-skip "/\\*+ *\\|// *"
+	comment-multi-line nil
+	comment-line-break-function 'c-comment-line-break-function
 	adaptive-fill-regexp nil)
 ;; we have to do something special for c-offsets-alist so that the
 ;; buffer local value has its own alist structure.
 (setq c-offsets-alist (copy-alist c-offsets-alist))
 ;; setup the comment indent variable in a Emacs version portable way
 (modify-syntax-entry ?%  "."     table)
 (modify-syntax-entry ?<  "."     table)
 (modify-syntax-entry ?>  "."     table)
 (modify-syntax-entry ?&  "."     table)
 (modify-syntax-entry ?|  "."     table)
-(modify-syntax-entry ?\' "\""    table))
+(modify-syntax-entry ?\' "\""    table)
+;; Set up block and line oriented comments.  The new C standard
-(defun c-setup-dual-comments (table)
+;; mandates both comment styles even in C, so since all languages
-;; Set up TABLE to handle block and line style comments
+;; now require dual comments, we make this the default.
 (cond
 ;; XEmacs 19 & 20
 ((memq '8-bit c-emacs-features)
 (modify-syntax-entry ?/  ". 1456" table)
-(modify-syntax-entry ?*  ". 23"   table)
+(modify-syntax-entry ?*  ". 23"   table))
-(modify-syntax-entry ?\n "> b"    table)
+;; Emacs 19 & 20
-;; Give CR the same syntax as newline, for selective-display
-(modify-syntax-entry ?\^m "> b"    table))
-;; Emacs 19
 ((memq '1-bit c-emacs-features)
 (modify-syntax-entry ?/  ". 124b" table)
-(modify-syntax-entry ?*  ". 23"   table)
+(modify-syntax-entry ?*  ". 23"   table))
-(modify-syntax-entry ?\n "> b"    table)
-;; Give CR the same syntax as newline, for selective-display
-(modify-syntax-entry ?\^m "> b"   table))
 ;; incompatible
 (t (error "CC Mode is incompatible with this version of Emacs"))
-))
+)
+(modify-syntax-entry ?\n "> b"  table)
+;; Give CR the same syntax as newline, for selective-display
+(modify-syntax-entry ?\^m "> b" table))
 (defvar c-mode-base-map ()
 "Keymap shared by all CC Mode related modes.")
 (if c-mode-base-map
 (define-key c-mode-base-map [delete]    'c-electric-delete)
 (define-key c-mode-base-map [backspace] 'c-electric-backspace))
 ;; these are new keybindings, with no counterpart to BOCM
 (define-key c-mode-base-map ","         'c-electric-semi&comma)
 (define-key c-mode-base-map "*"         'c-electric-star)
+(define-key c-mode-base-map "/"         'c-electric-slash)
 (define-key c-mode-base-map "\C-c\C-q"  'c-indent-defun)
 (define-key c-mode-base-map "\C-c\C-\\" 'c-backslash-region)
 ;; TBD: where if anywhere, to put c-backward|forward-into-nomenclature
 (define-key c-mode-base-map "\C-c\C-a"  'c-toggle-auto-state)
 (define-key c-mode-base-map "\C-c\C-b"  'c-submit-bug-report)
 (defvar c-mode-syntax-table nil
 "Syntax table used in c-mode buffers.")
 (if c-mode-syntax-table
 ()
 (setq c-mode-syntax-table (make-syntax-table))
-(c-populate-syntax-table c-mode-syntax-table)
+(c-populate-syntax-table c-mode-syntax-table))
-;; add extra comment syntax
-(modify-syntax-entry ?/  ". 14"  c-mode-syntax-table)
-(modify-syntax-entry ?*  ". 23"  c-mode-syntax-table))
-(defun c-enable-//-in-c-mode ()
-"Enables // as a comment delimiter in `c-mode'.
-ANSI C currently does *not* allow this, although many C compilers
-support optional C++ style comments.  To use, call this function from
-your `.emacs' file before you visit any C files.  The changes are
-global and affect all future `c-mode' buffers."
-(c-setup-dual-comments c-mode-syntax-table)
-(setq-default c-C-comment-start-regexp c-C++-comment-start-regexp))
 (easy-menu-define c-c-menu c-mode-map "C Mode Commands"
 		  (c-mode-menu "C"))
 (if c++-mode-map
 nil
 (setq c++-mode-map (c-make-inherited-keymap))
 ;; add bindings which are only useful for C++
 (define-key c++-mode-map "\C-c:"  'c-scope-operator)
-(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))
+;;;###autoload
 (defvar c++-mode-syntax-table nil
 "Syntax table used in c++-mode buffers.")
 (if c++-mode-syntax-table
 ()
 (setq c++-mode-syntax-table (make-syntax-table))
 (c-populate-syntax-table c++-mode-syntax-table)
-;; add extra comment syntax
-(c-setup-dual-comments c++-mode-syntax-table)
 ;; TBD: does it make sense for colon to be symbol class in C++?
 ;; I'm not so sure, since c-label-key is busted on lines like:
 ;; Foo::bar( i );
 ;; maybe c-label-key should be fixed instead of commenting this out,
 ;; but it also bothers me that this only seems appropriate for C++
 nil
 (setq objc-mode-map (c-make-inherited-keymap))
 ;; add bindings which are only useful for Objective-C
 (define-key objc-mode-map "/"      'c-electric-slash))
+;;;###autoload
 (defvar objc-mode-syntax-table nil
 "Syntax table used in objc-mode buffers.")
 (if objc-mode-syntax-table
 ()
 (setq objc-mode-syntax-table (make-syntax-table))
 (c-populate-syntax-table objc-mode-syntax-table)
-;; add extra comment syntax
+;; add extra Objective-C only syntax
-(c-setup-dual-comments objc-mode-syntax-table)
+(modify-syntax-entry ?@ "_" objc-mode-syntax-table))
-;; everyone gets these
-(modify-syntax-entry ?@ "_" objc-mode-syntax-table)
-)
 (easy-menu-define c-objc-menu objc-mode-map "ObjC Mode Commands"
 		  (c-mode-menu "ObjC"))
 nil
 (setq java-mode-map (c-make-inherited-keymap))
 ;; add bindings which are only useful for Java
 (define-key java-mode-map "/"      'c-electric-slash))
+;;;###autoload
 (defvar java-mode-syntax-table nil
 "Syntax table used in java-mode buffers.")
 (if java-mode-syntax-table
 ()
 (setq java-mode-syntax-table (make-syntax-table))
-(c-populate-syntax-table java-mode-syntax-table)
+(c-populate-syntax-table java-mode-syntax-table))
-;; add extra comment syntax
-(c-setup-dual-comments java-mode-syntax-table)
-;; everyone gets these
-(modify-syntax-entry ?@ "_" java-mode-syntax-table)
-)
 (easy-menu-define c-java-menu java-mode-map "Java Mode Commands"
 		  (c-mode-menu "Java"))
 nil
 (setq idl-mode-map (c-make-inherited-keymap))
 ;; additional bindings
 (define-key idl-mode-map "/" 'c-electric-slash))
+;;;###autoload
 (defvar idl-mode-syntax-table nil
 "Syntax table used in idl-mode buffers.")
 (if idl-mode-syntax-table
 nil
 (setq idl-mode-syntax-table (make-syntax-table))
-(c-populate-syntax-table idl-mode-syntax-table)
+(c-populate-syntax-table idl-mode-syntax-table))
-;; add extra comment syntax
-(c-setup-dual-comments idl-mode-syntax-table)
-)
 (easy-menu-define c-idl-menu idl-mode-map "IDL Mode Commands"
 		  (c-mode-menu "IDL"))

Mercurial > hg > xemacs-beta

comparison lisp/cc-mode/cc-langs.el @ 181:bfd6434d15b3 r20-3b17