# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1291607996 0
# Node ID 7e8cf0f45075d589a3796cfbff34fdfa1078f50c
# Parent  20deab1bda86dda1c884ae00fd46cf45b8d20781
nnir.el (nnir-request-move-article): Remove obsolete code.
shr.el (shr-find-fill-point): Don't regard apostrophe as kinsoku-bol.

diff -r 20deab1bda86 -r 7e8cf0f45075 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sun Dec 05 23:29:50 2010 +0000
+++ b/lisp/gnus/ChangeLog	Mon Dec 06 03:59:56 2010 +0000
@@ -1,3 +1,11 @@
+2010-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* shr.el (shr-find-fill-point): Don't regard apostrophe as kinsoku-bol.
+
+2010-12-06  Andrew Cohen  <cohen@andy.bu.edu>
+
+	* nnir.el (nnir-request-move-article): Remove obsolete code.
+
 2010-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.
diff -r 20deab1bda86 -r 7e8cf0f45075 lisp/gnus/nnir.el
--- a/lisp/gnus/nnir.el	Sun Dec 05 23:29:50 2010 +0000
+++ b/lisp/gnus/nnir.el	Mon Dec 06 03:59:56 2010 +0000
@@ -676,10 +676,7 @@
 	 (to-newsgroup (nth 1 accept-form))
 	 (to-method (gnus-find-method-for-group to-newsgroup))
 	 (from-method (gnus-find-method-for-group artfullgroup))
-	 (move-is-internal (gnus-server-equal from-method to-method))
-	 (artsubject (mail-header-subject
-		      (gnus-data-header
-		       (assoc article (gnus-data-list nil))))))
+	 (move-is-internal (gnus-server-equal from-method to-method)))
     (unless (gnus-check-backend-function
 	     'request-move-article artfullgroup)
       (error "The group %s does not support article moving" artfullgroup))
diff -r 20deab1bda86 -r 7e8cf0f45075 lisp/gnus/shr.el
--- a/lisp/gnus/shr.el	Sun Dec 05 23:29:50 2010 +0000
+++ b/lisp/gnus/shr.el	Mon Dec 06 03:59:56 2010 +0000
@@ -301,12 +301,12 @@
 		    (eq (following-char) ? )
 		    (shr-char-breakable-p (preceding-char))
 		    (shr-char-breakable-p (following-char))
-		    (and (eq (preceding-char) ?')
-			 (not (memq (char-after (- (point) 2))
-				    (list nil ?\n ? ))))
-		    ;; There're some kinsoku CJK chars that aren't breakable.
-		    (and (shr-char-kinsoku-bol-p (preceding-char))
-			 (not (shr-char-kinsoku-bol-p (following-char))))
+		    (if (eq (preceding-char) ?')
+			(not (memq (char-after (- (point) 2))
+				   (list nil ?\n ? )))
+		      ;; There're some kinsoku CJK chars that aren't breakable.
+		      (and (shr-char-kinsoku-bol-p (preceding-char))
+			   (not (shr-char-kinsoku-bol-p (following-char)))))
 		    (shr-char-kinsoku-eol-p (following-char))))
       (backward-char 1))
     (if (and (not (or failed (eolp)))