From: Glenn Morris <rgm@gnu.org>
Date: Mon, 17 Nov 2008 08:41:14 +0000 (+0000)
Subject: (c-put-char-property-fun): Add fallback definition of 'ignore, rather
X-Git-Tag: emacs-pretest-23.0.90~1747
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79f0fbcfd4e2f8f611a9e45742ea3849a329483a;p=emacs.git

(c-put-char-property-fun): Add fallback definition of 'ignore, rather
than nil.  (Bug#1353)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 163751cd8ec..76530d7150a 100644
--- 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 566d202aee8..5ce7ec5d117 100644
--- 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)