Update of /cvsroot/nice/Nice/lib/emacs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12394/lib/emacs
Modified Files:
nice-mode.el
Log Message:
Debian version 0.9.13-2.
Index: nice-mode.el
===================================================================
RCS file: /cvsroot/nice/Nice/lib/emacs/nice-mode.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** nice-mode.el 25 Nov 2007 14:58:22 -0000 1.36
--- nice-mode.el 16 Dec 2007 11:42:58 -0000 1.37
***************
*** 16,23 ****
(eval-when-compile
(require 'cc-langs)
! (require 'cc-fonts))
(eval-and-compile
! (c-add-language 'nice-mode 'java-mode))
(require 'compile)
--- 16,24 ----
(eval-when-compile
(require 'cc-langs)
! (require 'cc-fonts nil t))
(eval-and-compile
! (if (fboundp 'c-add-language)
! (c-add-language 'nice-mode 'java-mode)))
(require 'compile)
***************
*** 387,392 ****
(interactive)
(kill-all-local-variables)
! (c-initialize-cc-mode t)
(set-syntax-table nice-mode-syntax-table)
(setq major-mode 'nice-mode
--- 388,396 ----
(interactive)
+ (if (not (fboundp 'c-init-language-vars))
+ (c-initialize-cc-mode))
(kill-all-local-variables)
! (if (fboundp 'c-init-language-vars)
! (c-initialize-cc-mode t))
(set-syntax-table nice-mode-syntax-table)
(setq major-mode 'nice-mode
***************
*** 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 ""
--- 398,406 ----
local-abbrev-table java-mode-abbrev-table)
(use-local-map nice-mode-map)
! (if (fboundp 'c-init-language-vars)
! (progn
! (c-init-language-vars nice-mode)
! (c-common-init 'nice-mode))
! (c-common-init))
(setq comment-start "// "
comment-end ""
|
