# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1225692336 0
# Node ID 4c23c7ddb156013f61250fa741286fcf9609e432
# Parent  ec72437027f8a0cd8981acc0adc061cb910c6356
Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1460

diff -r ec72437027f8 -r 4c23c7ddb156 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Nov 03 03:02:56 2008 +0000
+++ b/lisp/gnus/ChangeLog	Mon Nov 03 06:05:36 2008 +0000
@@ -1,3 +1,14 @@
+2008-10-31  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* ietf-drums.el (ietf-drums-remove-comments): Localize second
+	condition-case to only the forward-sexp call.
+
+2008-10-31  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* ietf-drums.el (ietf-drums-remove-comments): Fix bug with single
+	quotes contained.  Make it more robust regardless by an extra
+	condition-case wrapper.
+
 2008-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nnml.el (nnml-request-expire-articles): Check if the function set to
diff -r ec72437027f8 -r 4c23c7ddb156 lisp/gnus/ietf-drums.el
--- a/lisp/gnus/ietf-drums.el	Mon Nov 03 03:02:56 2008 +0000
+++ b/lisp/gnus/ietf-drums.el	Mon Nov 03 06:05:36 2008 +0000
@@ -123,9 +123,18 @@
 	(setq c (char-after))
 	(cond
 	 ((eq c ?\")
-	  (forward-sexp 1))
+	  (condition-case err
+	      (forward-sexp 1)
+	    (error (goto-char (point-max)))))
 	 ((eq c ?\()
-	  (delete-region (point) (progn (forward-sexp 1) (point))))
+	  (delete-region
+	       (point)
+	       (condition-case nil
+		   (with-syntax-table (copy-syntax-table ietf-drums-syntax-table)
+		     (modify-syntax-entry ?\" "w")
+		     (forward-sexp 1)
+		     (point))
+		 (error (point-max)))))
 	 (t
 	  (forward-char 1))))
       (buffer-string))))