Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f83fb05a
Commit
f83fb05a
authored
Oct 27, 2007
by
Dan Nicolaescu
Browse files
Reorder conditions to avoid warnings.
parent
ca54ae34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/progmodes/cc-defs.el
lisp/progmodes/cc-defs.el
+4
-4
No files found.
lisp/ChangeLog
View file @
f83fb05a
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)
...
...
lisp/progmodes/cc-defs.el
View file @
f83fb05a
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment