(c-put-char-property-fun): Add fallback definition of 'ignore, rather

than nil.  (Bug#1353)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 163751cd8eca7ce6182354a35ab01af545487efb..76530d7150a695f9083259272010fcb3b98f714e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-17  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/cc-defs.el (c-put-char-property-fun): Add fallback
+       definition of 'ignore, rather than nil.  (Bug#1353)
+
 2008-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * window.el (window--frame-usable-p): Allow use for soft-dedication.

diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 566d202aee8fd14c18e47433c8d4766e50b1c8e9..5ce7ec5d1170b3612408c3f4e8d3919118325f2a 100644 (file)
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -932,7 +932,9 @@ MODE is either a mode symbol or a list of mode symbols."
                (or (memq property prop)
                    (put-text-property pos (1+ pos)
                                       'rear-nonsticky
-                                      (cons property prop))))))))))
+                                      (cons property prop)))))))
+         ;; This won't be used for anything.
+         (t 'ignore))))
 (cc-bytecomp-defun c-put-char-property-fun) ; Make it known below.
 
 (defmacro c-put-char-property (pos property value)