bug#9443: 24.0.50; M-x occur on the Java source file causes Lisp error

bug#9443: 24.0.50; M-x occur on the Java source file causes Lisp error

[OKAZAKI Tetsurou]

[-- Attachment #1: Type: text/plain, Size: 3381 bytes --]

Please describe exactly what actions triggered the bug, and
the precise symptoms of the bug.  If you can, give a recipe
starting from `emacs -Q':

  Get a Java source file to test:
    wget 'http://jdee.svn.sf.net/viewvc/jdee/trunk/jdee/java/src/jde/util/MultiValueMap.java?revision=200' -O MultiValueMap.java

  Invoke emacs:
    emacs -Q --eval '(setq debug-on-error t)' MultiValueMap.java

  Use `occur' for listing lines containing a match for "return".
    M-x occur
    List lines matching regexp: return

  Lisp backtrace:

Debugger entered--Lisp error: (wrong-type-argument stringp nil)
  looking-at(nil)
  c-font-lock-enclosing-decls(2270)
  font-lock-fontify-keywords-region(2250 2270 nil)
  font-lock-default-fontify-region(2250 2270 nil)
  font-lock-fontify-region(2250 2270)
  run-hook-with-args(font-lock-fontify-region 2250 2270)
  byte-code("..." [start next run-hook-with-args jit-lock-functions] 4)
  jit-lock-fontify-now(2250 2269)
  occur-engine-line(2250 2269 t)
  occur-engine("return" (#<buffer MultiValueMap.java>) #<buffer *Occur*> 0 t underline nil match t)
  occur-1("return" nil (#<buffer MultiValueMap.java>))
  occur("return" nil)
  call-interactively(occur nil nil)

  Fix:
    See the tiny patch attached.

In GNU Emacs 24.0.50.3 (i686-pc-cygwin)
 of 2011-09-03 on zeroset
configured using `configure  '--without-dbus' '--with-gconf' '--without-x''

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: ja_JP.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Debugger

Minor modes in effect:
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
ESC s o r e t u r n RET ESC x r e p o r t - e m a c 
s - b u TAB RET

Recent messages:
("./src/emacs" "--eval" "(setq debug-on-error t)" "MultiValueMap.java")
For information about GNU Emacs and the GNU system, type C-h C-a.
MultiValueMap.java has auto save data; consider M-x recover-this-file
Loading vc-bzr...done
Error during redisplay: (wrong-type-argument stringp nil)
Entering debugger...

Load-path shadows:
None found.

Features:
(shadow sort gnus-util mail-extr message format-spec rfc822 mml mml-sec
mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045
ietf-drums mm-util mail-prsvr mailabbrev mail-utils gmm-utils mailheader
emacsbug help-mode view debug vc-bzr cc-mode cc-fonts easymenu cc-guess
cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs regexp-opt
time-date japan-util ediff-hook vc-hooks lisp-float-type lisp-mode
register page menu-bar rfn-eshadow timer jit-lock font-lock syntax
facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak
czech european ethiopic indian cyrillic chinese case-table epa-hook
jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces
cus-face files text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget hashtable-print-readable backquote
make-network-process multi-tty emacs)



[-- Attachment #2: lisp-progmodes-cc-fonts.el.patch --]
[-- Type: application/octet-stream, Size: 554 bytes --]

=== modified file 'lisp/progmodes/cc-fonts.el'
--- lisp/progmodes/cc-fonts.el	2011-08-28 11:42:33 +0000
+++ lisp/progmodes/cc-fonts.el	2011-09-02 21:23:26 +0000
@@ -1559,7 +1559,8 @@
 	(setq decl-context (c-beginning-of-decl-1)
 	      in-typedef (looking-at c-typedef-key))
 	(if in-typedef (c-forward-token-2))
-	(when (looking-at c-opt-block-decls-with-vars-key)
+	(when (and c-opt-block-decls-with-vars-key
+		   (looking-at c-opt-block-decls-with-vars-key))
 	  (goto-char ps-elt)
 	  (when (c-safe (c-forward-sexp))
 	    (c-forward-syntactic-ws)

bug#9443: 24.0.50; M-x occur on the Java source file causes Lisp error

[Glenn Morris]

Version: 24.1

Thank you; applied.

BTW, you have a few "tiny changes" in Emacs now, so you might want to
consider completing a copyright assignment if you expect to contribute
more.