From 54f3e23135eb443a18a1670fd2eae7b0dfd4086f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 7 Dec 2003 22:16:04 +0000 Subject: [PATCH] Synch to Gnus 200312071540. --- lisp/ChangeLog | 32 ++++++++++++++++++++++++++++++++ lisp/gnus-mailcap.el | 2 +- lisp/gnus-soup.el | 14 +++++++------- lisp/gnus-uu.el | 10 +++++----- lisp/mail-source.el | 4 ++-- lisp/message.el | 17 ++++++++++------- lisp/spam.el | 8 ++++---- 7 files changed, 61 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af12f2e..855d539 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,35 @@ +2003-12-07 Simon Josefsson + + * pgg-gpg.el (pgg-gpg-recipient-arg): Add. + (pgg-gpg-encrypt-region): Use it. Tiny patch from Lloyd Zusman + . + (pgg-gpg-recipient-argument): Doc fix. Renamed fro p-g-r-a. + (pgg-gpg-encrypt-region): Update. + +2003-12-07 Jesper Harder + + * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Don't + use = or zerop to test the return value of call-process, because + it can be a string. + + * mail-source.el (mail-source-fetch-with-program): do. + + * mailcap.el (mailcap-viewer-passes-test): do. + + * gnus-uu.el (gnus-uu-treat-archive, gnus-uu-post-encode-mime) + (gnus-uu-post-encode-file): do. + + * gnus-soup.el (gnus-soup-pack, gnus-soup-unpack-packet): do. + + * message.el (message-fix-before-sending): Fix detection of + non-printables. Don't replace unencodable utf-8. + +2003-12-05 Jesper Harder + + * mm-url.el (mm-url-predefined-programs): Add user-agent for wget. + (mm-url-insert-file-contents-external): Signal an error if program + fails. + 2003-12-04 Teodor Zlatanov * spam-report.el (spam-report-gmane): iterate over articles diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index d397fc4..232b019 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -656,7 +656,7 @@ to supply to the test." test (list shell-file-name nil nil nil shell-command-switch test) status (apply 'call-process test)) - (= 0 status)))) + (eq 0 status)))) (push (list otest result) mailcap-viewer-test-cache) result))) diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el index 18af9de..2b9d305 100644 --- a/lisp/gnus-soup.el +++ b/lisp/gnus-soup.el @@ -358,9 +358,9 @@ If NOT-ALL, don't pack ticked articles." (gnus-make-directory dir) (setq gnus-soup-areas nil) (gnus-message 4 "Packing %s..." packer) - (if (zerop (call-process shell-file-name - nil nil nil shell-command-switch - (concat "cd " dir " ; " packer))) + (if (eq 0 (call-process shell-file-name + nil nil nil shell-command-switch + (concat "cd " dir " ; " packer))) (progn (call-process shell-file-name nil nil nil shell-command-switch (concat "cd " dir " ; rm " files)) @@ -497,10 +497,10 @@ Return whether the unpacking was successful." (gnus-make-directory dir) (gnus-message 4 "Unpacking: %s" (format unpacker packet)) (prog1 - (zerop (call-process - shell-file-name nil nil nil shell-command-switch - (format "cd %s ; %s" (expand-file-name dir) - (format unpacker packet)))) + (eq 0 (call-process + shell-file-name nil nil nil shell-command-switch + (format "cd %s ; %s" (expand-file-name dir) + (format unpacker packet)))) (gnus-message 4 "Unpacking...done"))) (defun gnus-soup-send-packet (packet) diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index d4c6cba..c6703be 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -1610,7 +1610,7 @@ Gnus might fail to display all of it.") (gnus-message 5 "Unpacking: %s..." (gnus-uu-command action file-path)) - (if (= 0 (call-process shell-file-name nil + (if (eq 0 (call-process shell-file-name nil (gnus-get-buffer-create gnus-uu-output-buffer-name) nil shell-command-switch command)) (message "") @@ -1904,8 +1904,8 @@ The user will be asked for a file name." ;; Encodes with base64 and adds MIME headers (defun gnus-uu-post-encode-mime (path file-name) - (when (zerop (call-process shell-file-name nil t nil shell-command-switch - (format "%s %s -o %s" "mmencode" path file-name))) + (when (eq 0 (call-process shell-file-name nil t nil shell-command-switch + (format "%s %s -o %s" "mmencode" path file-name))) (gnus-uu-post-make-mime file-name "base64") t)) @@ -1930,8 +1930,8 @@ The user will be asked for a file name." ;; Encodes a file PATH with COMMAND, leaving the result in the ;; current buffer. (defun gnus-uu-post-encode-file (command path file-name) - (= 0 (call-process shell-file-name nil t nil shell-command-switch - (format "%s %s %s" command path file-name)))) + (eq 0 (call-process shell-file-name nil t nil shell-command-switch + (format "%s %s %s" command path file-name)))) (defun gnus-uu-post-news-inews () "Posts the composed news article and encoded file. diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 5fb603f..efc11ad 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -649,8 +649,8 @@ Pass INFO on to CALLBACK." (delete-file from))) (defun mail-source-fetch-with-program (program) - (zerop (call-process shell-file-name nil nil nil - shell-command-switch program))) + (eq 0 (call-process shell-file-name nil nil nil + shell-command-switch program))) (defun mail-source-run-script (script spec &optional delay) (when script diff --git a/lisp/message.el b/lisp/message.el index afdaadc..39831a6 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -3950,17 +3950,18 @@ used to distinguish whether the invisible text is a MIME part or not." ;; a MIME charset forcibly (even if it cannot be determined properly, ;; the value of the `default-mime-charset-for-write' variable is used). ;; (message-check 'illegible-text -;; (let ((mm-7bit-chars "\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f\x1b") -;; found choice) +;; (let (found choice) ;; (message-goto-body) ;; (skip-chars-forward mm-7bit-chars) ;; (while (not (eobp)) ;; (when (let ((char (char-after))) ;; (or (< (mm-char-int char) 128) ;; (and (mm-multibyte-p) -;; (> (length (mm-find-mime-charset-region -;; (point) (point-max))) -;; 1)))) +;; (memq (char-charset char) +;; '(eight-bit-control eight-bit-graphic +;; control-1)) +;; (not (get-text-property +;; (point) 'untranslated-utf-8))))) ;; (message-overlay-put (message-make-overlay (point) (1+ (point))) ;; 'face 'highlight) ;; (setq found t)) @@ -3975,7 +3976,7 @@ used to distinguish whether the invisible text is a MIME part or not." ;; (?i "Ignore non-printable characters and send") ;; (?e "Continue editing")))) ;; (if (eq choice ?e) -;; (error "Non-printable characters")) +;; (error "Non-printable characters")) ;; (message-goto-body) ;; (skip-chars-forward mm-7bit-chars) ;; (while (not (eobp)) @@ -3987,7 +3988,9 @@ used to distinguish whether the invisible text is a MIME part or not." ;; ;; use find-coding-systems-region. ;; (memq (char-charset char) ;; '(eight-bit-control eight-bit-graphic -;; control-1))))) +;; control-1)) +;; (not (get-text-property +;; (point) 'untranslated-utf-8))))) ;; (if (eq choice ?i) ;; (message-kill-all-overlays) ;; (delete-char 1) diff --git a/lisp/spam.el b/lisp/spam.el index 57638a7..cc13931 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -1536,8 +1536,8 @@ REMOVE not nil, remove the ADDRESSES." (point-min) (point-max) spam-bogofilter-path nil temp-buffer-name nil - (if db `("-d" ,db "-v") `("-v")))) - (setq return (spam-check-bogofilter-headers score)))) + (if db `("-d" ,db "-v") `("-v"))) + (setq return (spam-check-bogofilter-headers score))))) return)) (defun spam-bogofilter-register-with-bogofilter (articles @@ -1594,7 +1594,7 @@ REMOVE not nil, remove the ADDRESSES." (if spam-spamoracle-database `("-f" ,spam-spamoracle-database "mark") '("mark"))))) - (if (zerop status) + (if (eq 0 status) (progn (set-buffer temp-buffer-name) (goto-char (point-min)) @@ -1622,7 +1622,7 @@ REMOVE not nil, remove the ADDRESSES." `("-f" ,spam-spamoracle-database "add" ,arg) `("add" ,arg))))) - (when (not (zerop status)) + (when (not (eq 0 status)) (error "Error running spamoracle" status))))))) (defun spam-spamoracle-learn-ham (articles &optional unregister) -- 1.7.10.4