font-lock / c++-mode barf

[Miles Bader]

In my latest update from CVS, I'm now getting errors from font-lock when
visiting a C++ file:  (void-variable c++-font-lock-keywords-3)

These errors happen if I turn on global-font-lock-mode _first_, and then
try to visit a C++ file (foo.cc).  If I visit the C++ file first, and
_then_ turn on global-font-lock-mode, it seems to fontify the
already-visited file properly -- however if I then visit another C++
file, I get the same error (so it doesn't seem to be some sort of
missing autoload or something)!

Here's messages buffer:

   Loading mwheel...done
   (emacs -Q)
   Loading image...done
   For information about the GNU Project and its goals, type C-h C-p.
   Loading font-lock...done
   Loading jit-lock...done
   Loading cc-mode...done
   File mode specification error: (void-variable c++-font-lock-keywords-3)


To reproduce:

   emacs -Q
   M-x global-font-lock-mode RET
   C-x C-f existing.cc RET
     => error



In GNU Emacs 22.0.50.40 (i686-pc-linux-gnu, GTK+ Version 2.6.10)
 of 2005-10-24 on catnip.gol.com
X server distributor `The X.Org Foundation', version 11.0.60802000
configured using `configure '--with-x-toolkit=gtk''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  locale-coding-system: nil
  default-enable-multibyte-characters: t

Major mode: Shell

Minor modes in effect:
  auto-image-file-mode: t
  display-time-mode: t
  minibuffer-electric-default-mode: t
  file-name-shadow-mode: t
  recentf-mode: t
  mouse-wheel-mode: t
  tooltip-mode: t
  auto-compression-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  temp-buffer-resize-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<help-echo> C-x C-v M-p <return> C-h e <escape> x s 
h e l l <return> e m a c s SPC - Q SPC & <return> C-x 
C-v . c u s SPC <return> C-s C-s C-a C-v C-v C-s f 
o n t - l o c k C-s C-s C-s C-s C-s C-s C-s C-s C-a 
C-s c + + C-s C-s C-s C-s C-s C-s C-a <escape> x s 
h <return> M-p <return> <help-echo> <down-mouse-1> 
<mouse-1> <escape> x r e p o r t - e m SPC a <backspace> 
<return>

Recent messages:
Loading server...done
Loading jit-lock...done
Loading cc-mode...done
File mode specification error: (void-variable c++-font-lock-keywords-3)
Loading vc-arch...done
Note: file is write protected
isearch-repeat: No previous search string
Mark saved where search started [2 times]
History item: 1
Loading emacsbug...done