[Emacs-diffs] /srv/bzr/emacs/trunk r99378: Fix bug#5395: typing '#' in an empty C buffer throws "args out of range".

[Alan Mackenzie]

------------------------------------------------------------
revno: 99378
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Tue 2010-01-19 22:10:19 +0000
message:
  Fix bug#5395: typing '#' in an empty C buffer throws "args out of range".
  * progmodes/cc-defs.el: (c-set-cpp-delimiters, c-clear-cpp-delimiters):
  Check for EOB playing the role of delimiter.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-defs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-18 23:10:57 +0000
+++ b/lisp/ChangeLog    2010-01-19 22:10:19 +0000
@@ -1,3 +1,10 @@
+2010-01-19  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
+       buffer throws "args out of range".
+       (c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB
+       playing the role of delimiter.
+
 2010-01-18  Stephen Leake  <address@hidden>
 
        * lisp/progmodes/ada-mode.el: Fix bug#5400.

=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2010-01-14 18:37:23 +0000
+++ b/lisp/progmodes/cc-defs.el 2010-01-19 22:10:19 +0000
@@ -1217,12 +1217,14 @@
   ;; This macro does a hidden buffer change.
   `(progn
      (c-put-char-property ,beg 'category 'c-cpp-delimiter)
-     (c-put-char-property ,end 'category 'c-cpp-delimiter)))
+     (if (< ,end (point-max))
+        (c-put-char-property ,end 'category 'c-cpp-delimiter))))
 (defmacro c-clear-cpp-delimiters (beg end)
   ;; This macro does a hidden buffer change.
   `(progn
      (c-clear-char-property ,beg 'category)
-     (c-clear-char-property ,end 'category)))
+     (if (< ,end (point-max))
+        (c-clear-char-property ,end 'category))))
 
 (defsubst c-comment-out-cpps ()
   ;; Render all preprocessor constructs syntactically commented out.