summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2007-12-08 09:55:50 +0000
committerMartin Rudalics <rudalics@gmx.at>2007-12-08 09:55:50 +0000
commitdc56b2ba139f0052c032ff7628ad40c83621740a (patch)
tree5fa03a63ccaa0912999ec9cc745d06f5c912f8d1 /lisp
parente10fe1cbe2436a049fd8744e089432a58efbcf21 (diff)
downloademacs-dc56b2ba139f0052c032ff7628ad40c83621740a.tar.gz
emacs-dc56b2ba139f0052c032ff7628ad40c83621740a.tar.bz2
emacs-dc56b2ba139f0052c032ff7628ad40c83621740a.zip
(c-mask-paragraph): Avoid invalid search
bound error in block comment branch.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-cmds.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30be1ca0886..7608273c9bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-08 Martin Rudalics <rudalics@gmx.at>
+
+ * progmodes/cc-cmds.el (c-mask-paragraph): Avoid invalid search
+ bound error in block comment branch.
+
2007-12-08 David Kastrup <dak@gnu.org>
* textmodes/reftex.el (reftex-select-with-char):
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index db052c4b8f5..06c0946290b 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -3864,7 +3864,12 @@ command to conveniently insert and align the necessary backslashes."
(save-excursion
(goto-char (cdr c-lit-limits))
(beginning-of-line)
- (and (search-forward-regexp
+ ;; The following conjunct was added to avoid an
+ ;; "Invalid search bound (wrong side of point)"
+ ;; error in the subsequent re-search. Maybe
+ ;; another fix would be needed (2007-12-08).
+ (and (> (- (cdr c-lit-limits) 2) (point))
+ (search-forward-regexp
(concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
(- (cdr c-lit-limits) 2) t)
(not (search-forward-regexp