[Nice-commit] Nice/lib/emacs nice-mode.el,1.35,1.36

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/lib/emacs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6136/lib/emacs

Modified Files:
	nice-mode.el 
Log Message:
Updated the nice mode for the Emacs editor to work with version 22

Index: nice-mode.el
===================================================================
RCS file: /cvsroot/nice/Nice/lib/emacs/nice-mode.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** nice-mode.el	2 Jul 2004 23:26:23 -0000	1.35
--- nice-mode.el	25 Nov 2007 14:58:22 -0000	1.36
***************
*** 5,22 ****
  ;;;              Based on Jazz mode (Fra...@en...)
  ;;;       Adaptation to Nice by Daniel Bonniot (d.b...@ma...)
  ;;;                                                        
  ;;;                                                        
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
- (require 'cc-vars)
- (require 'cc-engine)
  (require 'cc-mode)
! (require 'cc-cmds)
! (require 'cc-align)
! (require 'cc-styles)
! (require 'cc-defs)
! (require 'cc-menus)
! (require 'cc-defs)
! (require 'cc-langs)
  
  (require 'compile)
--- 5,23 ----
  ;;;              Based on Jazz mode (Fra...@en...)
  ;;;       Adaptation to Nice by Daniel Bonniot (d.b...@ma...)
+ ;;;
+ ;;;             Update for recent versions of Emacs based on:
+ ;;;            http://cc-mode.sourceforge.net/derived-mode-ex.el
  ;;;                                                        
  ;;;                                                        
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (require 'cc-mode)
! 
! (eval-when-compile
!   (require 'cc-langs)
!   (require 'cc-fonts))
! 
! (eval-and-compile
!   (c-add-language 'nice-mode 'java-mode))
  
  (require 'compile)
***************
*** 386,391 ****
  
    (interactive)
-   (c-initialize-cc-mode)
    (kill-all-local-variables)
    (set-syntax-table nice-mode-syntax-table)
    (setq major-mode 'nice-mode
--- 387,392 ----
  
    (interactive)
    (kill-all-local-variables)
+   (c-initialize-cc-mode t)
    (set-syntax-table nice-mode-syntax-table)
    (setq major-mode 'nice-mode
***************
*** 393,397 ****
   	local-abbrev-table java-mode-abbrev-table)
    (use-local-map nice-mode-map)
!   (c-common-init)
    (setq comment-start "// "
   	comment-end   ""
--- 394,399 ----
   	local-abbrev-table java-mode-abbrev-table)
    (use-local-map nice-mode-map)
!   (c-init-language-vars nice-mode)
!   (c-common-init 'nice-mode)
    (setq comment-start "// "
   	comment-end   ""
***************
*** 467,470 ****
--- 469,473 ----
            (nice-rename-buffer (file-name-nondirectory
                                 (substring name 0 (- (length name) (length nice-extension))))))))))
+   (run-hooks 'c-mode-common-hook)
    (run-hooks 'nice-mode-hook)
    (c-update-modeline))