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

comparison lisp/cc-mode/cc-langs.el @ 171:929b76928fce r20-3b12

Import from CVS: tag r20-3b12

author	cvs
date	Mon, 13 Aug 2007 09:47:52 +0200
parents	85ec50267440
children	2d532a89d707

comparison

equal deleted inserted replaced

-:98a42ee61975
+:929b76928fce
 ;; 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.11
+;; Version:    5.12
 ;; Keywords:   c languages oop
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; 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.
-(eval-when-compile
-(load-file "./cc-styles.el"))
 ;; Regular expressions and other values which must be parameterized on
 ;; a per-language basis.
 (defun c-use-java-style ()
 "Institutes `java' indentation style.
 For use with the variable `java-mode-hook'."
 (c-set-style "java"))
+(defvar c-styles-are-initialized nil)
 (defun c-common-init ()
-;; Common initializations for c++-mode and c-mode.
+;; Common initializations for all modes.
-;;
+(if c-styles-are-initialized
+nil
+(require 'cc-styles)
+(c-initialize-builtin-style)
+(if c-style-variables-are-local-p
+	(c-make-styles-buffer-local))
+(setq c-styles-are-initialized t))
 ;; these variables should always be buffer local; they do not affect
 ;; indentation style.
 (make-local-variable 'paragraph-start)
 (make-local-variable 'paragraph-separate)
 (make-local-variable 'paragraph-ignore-fill-prefix)
 (define-key c-mode-base-map "\ee"       'c-end-of-statement)
 (define-key c-mode-base-map "\C-c\C-n"  'c-forward-conditional)
 (define-key c-mode-base-map "\C-c\C-p"  'c-backward-conditional)
 (define-key c-mode-base-map "\C-c\C-u"  'c-up-conditional)
 (define-key c-mode-base-map "\t"        'c-indent-command)
-;; In XEmacs 19 and Emacs 19, this binds both the BackSpace and
+;; Caution!  Enter here at your own risk.  We are trying to support
-;; Delete keysyms to c-electric-backspace.  In XEmacs 20 it binds
+;; several behaviors and it gets disgusting. :-(
-;; only BackSpace, so we now bind them individually
+;;
-(define-key c-mode-base-map [delete]    'c-electric-delete)
+;; In XEmacs 19, Emacs 19, and Emacs 20, we use this to bind
-(define-key c-mode-base-map [backspace] 'c-electric-backspace)
+;; backwards deletion behavior to DEL, which both Delete and
+;; Backspace get translated to.  There's no way to separate this
+;; behavior in a clean way, so deal with it!  Besides, it's been
+;; this way since the dawn of BOCM.
+(if (not (boundp 'delete-key-deletes-forward))
+(define-key c-mode-base-map "\177" 'c-electric-backspace)
+;; However, XEmacs 20 actually achieved enlightenment.  It is
+;; possible to sanely define both backward and forward deletion
+;; behavior under X separately (TTYs are forever beyond hope, but
+;; who cares?  XEmacs 20 does the right thing with these too).
+(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-c\C-q"  'c-indent-defun)
 (define-key c-mode-base-map "\C-c\C-\\" 'c-backslash-region)
 (define-key c-mode-base-map "\C-c."     'c-set-style)
 ;; conflicts with OOBR
 ;;(define-key c-mode-base-map "\C-c\C-v"  'c-version)
 )
+;; menu support for both XEmacs and Emacs.  If you don't have easymenu
+;; with your version of Emacs, you are incompatible!
+(require 'easymenu)
+(defvar c-c-menu nil)
+(defvar c-c++-menu nil)
+(defvar c-objc-menu nil)
+(defvar c-java-menu nil)
+(defun c-mode-menu (modestr)
+(let ((m
+	 '(["Comment Out Region"     comment-region (mark)]
+	   ["Macro Expand Region"    c-macro-expand (mark)]
+	   ["Backslashify"           c-backslash-region (mark)]
+	   ["Indent Expression"      c-indent-exp
+	    (memq (char-after) '(?\( ?\[ ?\{))]
+	   ["Indent Line"            c-indent-command t]
+	   ["Fill Comment Paragraph" c-fill-paragraph t]
+	   ["Up Conditional"         c-up-conditional t]
+	   ["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]
+	   )))
+(cons modestr m)))
 ;; Support for C
 (defvar c-mode-abbrev-table nil
 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"))
 ;; Support for C++
 (defvar c++-mode-abbrev-table nil
 ;; but it also bothers me that this only seems appropriate for C++
 ;; and not C.
 ;;(modify-syntax-entry ?: "_" c++-mode-syntax-table)
 )
+(easy-menu-define c-c++-menu c++-mode-map "C++ Mode Commands"
+		  (c-mode-menu "C++"))
 ;; Support for Objective-C
 (defvar objc-mode-abbrev-table nil
 (c-setup-dual-comments 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"))
 ;; Support for Java
 (defvar java-mode-abbrev-table nil
 (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"))
 (provide 'cc-langs)
 ;;; cc-langs.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/cc-mode/cc-langs.el @ 171:929b76928fce r20-3b12