Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 299fc20..a7238c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-10 12:17:58  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * qp.el (quoted-printable-encode-region): Bind tab-width to 1. Set
+       limit to 76.
+
 2000-05-10 09:11:48  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnslashdot.el (nnslashdot-sid-strip): New function.
@@ -6,6 +11,7 @@
        (nnslashdot-request-article): Ditto.
        (nnslashdot-threaded-retrieve-headers): Thread properly.
        (nnslashdot-request-article): Be more lenient.
+       (nnslashdot-threaded-retrieve-headers): Regexp search.
 
 2000-05-09 13:23:50  Shenghuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index c1e0ce3..013fabc 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -117,7 +117,7 @@
          (forward-line 2)
          (setq lines (count-lines
                       (point)
-                      (search-forward
+                      (re-search-forward
                        "A href=\"\\(http://slashdot.org\\)?/article" nil t)))
          (push
           (cons
@@ -220,7 +220,7 @@
                    (buffer-substring (point) (1- (search-forward "<")))))
        (forward-line 2)
        (setq lines (count-lines (point)
-                                (search-forward
+                                (re-search-forward
                                  "A href=\"\\(http://slashdot.org\\)?/article")))
        (push
         (cons

diff --git a/lisp/qp.el b/lisp/qp.el
index 93c3f7e..ea2a818 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -115,23 +115,24 @@ encode lines starting with \"From\"."
             (delete-char 1)))))
       (when (or fold mm-use-ultra-safe-encoding)
        ;; Fold long lines.
-       (goto-char (point-min))
-       (while (not (eobp))
-         ;; In ultra-safe mode, encode "From " at the beginning of a
-         ;; line.
-         (when mm-use-ultra-safe-encoding
-           (beginning-of-line)
-           (when (looking-at "From ")
-             (replace-match "From=20" nil t)))
-         (end-of-line)
-         (while (> (current-column) 72)
-           (beginning-of-line)
-           (forward-char 71);; 71 char plus an "="
-           (search-backward "=" (- (point) 2) t)
-           (insert "=\n")
-           (end-of-line))
-         (unless (eobp)
-           (forward-line)))))))
+       (let ((tab-width 1)) ;; HTAB is one character.
+         (goto-char (point-min))
+         (while (not (eobp))
+           ;; In ultra-safe mode, encode "From " at the beginning of a
+           ;; line.
+           (when mm-use-ultra-safe-encoding
+             (beginning-of-line)
+             (when (looking-at "From ")
+               (replace-match "From=20" nil t)))
+           (end-of-line)
+           (while (> (current-column) 76) ;; tab-width must be 1.
+             (beginning-of-line)
+             (forward-char 75);; 75 chars plus an "="
+             (search-backward "=" (- (point) 2) t)
+             (insert "=\n")
+             (end-of-line))
+           (unless (eobp)
+             (forward-line))))))))
 
 (defun quoted-printable-encode-string (string)
   "QP-encode STRING and return the results."