andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder conditions to avoid warnings.

Browse source
This commit is contained in:
Dan Nicolaescu 2007-10-27 20:27:34 +00:00
parent ca54ae34f4
commit f83fb05aa1
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2007-10-27 Dan Nicolaescu <dann@ics.uci.edu>
* progmodes/cc-defs.el: Reorder conditions to avoid warnings.
2007-10-27 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-load-locked-desktop, desktop-base-lock-name)

8
lisp/progmodes/cc-defs.el
View file

@ -73,9 +73,9 @@
; (eval-after-load "font-lock" ; 2006-07-09. font-lock is now preloaded
; '
(if (and (not (featurep 'cc-fix)) ; only load the file once.
(featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS
(if (and (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS
; to make the call to f-l-c-k throw an error.
(not (featurep 'cc-fix)) ; only load the file once.
(let (font-lock-keywords)
(font-lock-compile-keywords '("\\<\\>"))
font-lock-keywords)) ; did the previous call foul this up?
@ -84,8 +84,8 @@
;; The above takes care of the delayed loading, but this is necessary
;; to ensure correct byte compilation.
(eval-when-compile
(if (and (not (featurep 'cc-fix))
(featurep 'xemacs)
(if (and (featurep 'xemacs)
(not (featurep 'cc-fix))
(progn
(require 'font-lock)
(let (font-lock-keywords)