summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-defs.el4
2 files changed, 8 insertions, 1 deletions
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)