summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-12-06 03:59:56 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-12-06 03:59:56 +0000
commit7454326ab9058b94b956d8c2ac3d3f340281467d (patch)
tree011d6bfb18c401e71e74444efd48f5a6970b9862 /lisp/gnus
parentc67e426e957225cbd792325e31e4d4178e3c66d3 (diff)
nnir.el (nnir-request-move-article): Remove obsolete code.
shr.el (shr-find-fill-point): Don't regard apostrophe as kinsoku-bol.
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog8
-rw-r--r--lisp/gnus/nnir.el5
-rw-r--r--lisp/gnus/shr.el12
3 files changed, 15 insertions, 10 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d71d546a2c..f36598780b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index b706d150f7..750218d4a9 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -676,10 +676,7 @@ Add an entry here when adding a new search engine.")
(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 --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 0b2fa939b1..4c4f47e022 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -301,12 +301,12 @@ redirects somewhere else."
(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)))