From: yamaoka Date: Wed, 20 Jan 1999 01:58:46 +0000 (+0000) Subject: ;; Sync up with Pterodactyl Gnus v0.72. X-Git-Tag: pgnus-ichikawa-199901201900~6 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8944908a9e5aa4e0e29843510245e84337a2a8a5;p=elisp%2Fgnus.git- ;; Sync up with Pterodactyl Gnus v0.72. * gnus.el (gnus-version-number): Update to 6.10.055. * gnus.el: Cleaned up trailing whitespace. * gnus-score.el (gnus-score-find-bnews): Match regexp on the nnheader-translate-file-chars'd group name. * message.el (message-encode-message-body): Fold case. * gnus-xmas.el (gnus-xmas-modeline-glyph): Backquote. * gnus-art.el (article-goto-body-goes-to-point-min-p): New variable. (article-goto-body): Use it. (gnus-treat-article): Ditto. * gnus-agent.el (gnus-agent-get-undownloaded-list): Remove the downloaded articles from the downloadeble list. * message.el (message-encode-message-body): Bind mail-parse-charset. * gnus-art.el (gnus-treatment-function-alist): Use gnus-article-display-picons. (gnus-treat-display-xface): Only do if we have xface feature. (gnus-part-display-hook): New function. (gnus-treat-article): Use it. (gnus-treat-article): Use gnus-visual. * gnus-msg.el (gnus-setup-posting-charset): Check elem. * gnus-art.el (gnus-mm-display-part): Fix the MIME button after displaying. * gnus-score.el (gnus-score-find-bnews): Protect against invalid regexp file names. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b73d3f..92ab5a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,67 @@ +Wed Jan 20 00:50:53 1999 Lars Magne Ingebrigtsen + + * gnus.el: Pterodactyl Gnus v0.72 is released. + +1999-01-20 01:39:48 Lars Magne Ingebrigtsen + + * gnus.el: Cleaned up trailing whitespace. + + * mm-util.el (mm-read-charset): Work. + +1999-01-17 Matt Armstrong + + * gnus-score.el (gnus-score-find-bnews): Match regexp on the + nnheader-translate-file-chars'd group name. + +1999-01-20 01:30:30 Lars Magne Ingebrigtsen + + * message.el (message-encode-message-body): Fold case. + +1999-01-20 01:28:16 Alexei V. Barantsev + + * gnus-xmas.el (gnus-xmas-modeline-glyph): Backquote. + +1999-01-20 00:46:15 Lars Magne Ingebrigtsen + + * mailcap.el (mailcap-add): New function. + +1999-01-18 09:40:37 Lars Magne Ingebrigtsen + + * gnus-art.el (article-goto-body-goes-to-point-min-p): New variable. + (article-goto-body): Use it. + (gnus-treat-article): Ditto. + + * gnus-agent.el (gnus-agent-get-undownloaded-list): Remove the + downloaded articles from the downloadeble list. + +1999-01-16 17:31:08 Lars Magne Ingebrigtsen + + * message.el (message-encode-message-body): Bind + mail-parse-charset. + + * mm-util.el (mm-charset-synonym-alist): New variable. + (mm-charset-to-coding-system): Use it. + (mm-charset-coding-system-alist): Removed. + (mm-charset-to-coding-system): Don't use it. + (mm-find-charset-region): Use mail-parse-charset. + + * gnus-art.el (gnus-treatment-function-alist): Use + gnus-article-display-picons. + (gnus-treat-display-xface): Only do if we have xface feature. + (gnus-part-display-hook): New function. + (gnus-treat-article): Use it. + (gnus-treat-article): Use gnus-visual. + + * gnus-msg.el (gnus-setup-posting-charset): Check elem. + + * gnus-art.el (gnus-mm-display-part): Fix the MIME button after + displaying. + + * mm-decode.el (mm-insert-part): Use insert-buffer-substring. + + * gnus-score.el (gnus-score-find-bnews): Protect against invalid + regexp file names. + Sat Jan 16 03:15:57 1999 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.71 is released. @@ -15,7 +79,7 @@ Sat Jan 16 03:15:57 1999 Lars Magne Ingebrigtsen * gnus-start.el (gnus-ignored-newsgroups-has-to-p): Removed. * gnus-msg.el (gnus-setup-posting-charset): Allow variables and - functions. + functions. * message.el (message-posting-charset): New variable. (message-send-mail): Use it. @@ -71,7 +135,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen * mm-view.el (mm-inline-text): Ditto. * gnus-move.el (gnus-move-group-to-server): Protect against nil - ranges. + ranges. * mm-decode.el (mm-display-external): Save the buffer. (mm-remove-part): Kill it. @@ -86,7 +150,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen coding-system-for-read. * gnus-sum.el (gnus-summary-exit): Do adaptive scoring before - prepare-exit-hook. + prepare-exit-hook. * mm-view.el (mm-setup-w3): Require w3. @@ -100,7 +164,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen * mm-encode.el: Ditto. * mm-bodies.el (mm-decode-content-transfer-encoding): Message the - error. + error. * mailcap.el (mailcap-mime-data): SAFER ps. @@ -165,7 +229,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen 1999-01-12 07:20:31 Lars Magne Ingebrigtsen - * gnus-picon.el (gnus-picons-setup-buffer): Don't set major mode. + * gnus-picon.el (gnus-picons-setup-buffer): Don't set major mode. (gnus-picons-setup-p): New variable. 1999-01-11 02:13:12 Lars Magne Ingebrigtsen @@ -174,7 +238,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen 1999-01-04 12:58:13 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-exit-no-update): Don't use run-hooks. + * gnus-sum.el (gnus-summary-exit-no-update): Don't use run-hooks. (gnus-summary-exit-no-update): Use mapcar. 1999-01-02 14:36:32 Simon Josefsson @@ -183,7 +247,7 @@ Fri Jan 15 20:50:38 1999 Lars Magne Ingebrigtsen 1998-09-26 19:39:31 Simon Josefsson - * gnus-sum.el (gnus-update-read-articles): + * gnus-sum.el (gnus-update-read-articles): (gnus-update-marks): Request backend update of mark. 1999-01-03 15:29:52 Lars Magne Ingebrigtsen @@ -203,7 +267,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen * gnus-picon.el (gnus-picons-setup-buffer): Run the hook. * gnus-agent.el (gnus-agent-remove-group): New command and - keystroke. + keystroke. * rfc2047.el (rfc2047-decode-region): Check for us-ascii. @@ -222,7 +286,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen 1998-12-23 Matt Pharr * message.el (message-cite-original-without-signature): Use - message-signature-separator when searching for signature in + message-signature-separator when searching for signature in message-cite-original-without-signature. 1998-12-24 16:25:38 Simon Josefsson @@ -238,7 +302,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-configure-posting-styles): Also do nil values. - + * nnheader.el (nnheader-temp-directory): New variable. (nnheader-temp-directory): Removed. @@ -249,7 +313,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen 1998-12-24 03:02:15 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-article-maybe-hide-headers): Check whether the + * gnus-art.el (gnus-article-maybe-hide-headers): Check whether the summary buffer exists. 1998-12-22 Aaron M. Ucko @@ -268,7 +332,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen 1998-12-21 21:34:22 Lars Magne Ingebrigtsen - * mm-view.el (mm-inline-text): Bind url-current-object. + * mm-view.el (mm-inline-text): Bind url-current-object. 1998-12-06 03:05:41 Simon Josefsson @@ -296,13 +360,13 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen 1998-12-19 23:02:26 Lars Magne Ingebrigtsen - * nnmail.el (nnmail-split-header-length-limit): New variable. + * nnmail.el (nnmail-split-header-length-limit): New variable. * mm-decode.el (mm-dissect-buffer): Check syntax. * rfc2231.el (rfc2231-parse-string): Remove check for syntax. - * rfc2047.el (rfc2047-encodable-p): Use mm-find-charset-region. + * rfc2047.el (rfc2047-encodable-p): Use mm-find-charset-region. (rfc2047-dissect-region): Ditto. 1998-12-17 18:36:43 Lars Magne Ingebrigtsen @@ -312,7 +376,7 @@ Sun Jan 3 13:32:02 1999 Lars Magne Ingebrigtsen 1998-12-16 16:01:22 Lars Magne Ingebrigtsen * rfc2231.el (rfc2231-parse-string): Ignore syntactically invalid - CT headers. + CT headers. Wed Dec 16 01:44:40 1998 Shenghuo ZHU @@ -354,14 +418,14 @@ Sat Dec 5 16:50:49 1998 Shenghuo ZHU 1998-12-13 10:04:39 Lloyd Zusman - * gnus-xmas.el (gnus-xmas-summary-recenter): Allow numbers. + * gnus-xmas.el (gnus-xmas-summary-recenter): Allow numbers. 1998-12-13 09:32:38 Lars Magne Ingebrigtsen * mml.el (mml-insert-mime-headers): Encode description. * nnfolder.el (nnfolder-request-expire-articles): Go to the date - line. + line. * gnus-sum.el (gnus-default-charset): Doc fix. @@ -379,9 +443,9 @@ Wed Dec 9 13:30:29 1998 Shenghuo ZHU 1998-12-13 08:52:45 Lars Magne Ingebrigtsen * gnus-picon.el (gnus-picons-network-display-internal): Don't set - buffer. + buffer. - * message.el (message-insert-headers): New command and keystroke. + * message.el (message-insert-headers): New command and keystroke. 1998-12-07 23:42:14 Lars Magne Ingebrigtsen @@ -401,7 +465,7 @@ Sun Dec 6 21:58:31 1998 Shenghuo ZHU * mm-view.el (mm-view-message): New function. - * mm-encode.el (mm-content-transfer-encoding-defaults): Changed to + * mm-encode.el (mm-content-transfer-encoding-defaults): Changed to qp. 1998-12-07 Karl Kleinpaste @@ -436,7 +500,7 @@ Sun Dec 6 19:36:53 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-prepare-display): Don't init w3. - * mm-view.el (mm-inline-text): Bind url-standalone-mode here. + * mm-view.el (mm-inline-text): Bind url-standalone-mode here. Sat Dec 5 18:35:42 1998 Lars Magne Ingebrigtsen @@ -462,14 +526,14 @@ Sat Dec 5 18:35:42 1998 Lars Magne Ingebrigtsen 1998-12-05 18:33:27 Lars Magne Ingebrigtsen * gnus-picon.el (gnus-picons-setup-buffer): Run picons hook. - (gnus-picons-setup-hook): New hook. + (gnus-picons-setup-hook): New hook. 1998-12-05 Per Abrahamsen * mailcap.el (mailcap-mime-data): Remove "*" from documentation - string. + string. (mailcap-mime-extensions): Ditto. Made first sentense fit a - line. + line. 1998-12-05 17:11:04 Lars Magne Ingebrigtsen @@ -495,7 +559,7 @@ Fri Dec 4 12:13:12 1998 Shenghuo ZHU 1998-12-04 15:29:02 Lars Magne Ingebrigtsen - * gnus-msg.el (gnus-message-insert-stylings): Don't insert twice. + * gnus-msg.el (gnus-message-insert-stylings): Don't insert twice. Fri Dec 4 04:09:15 1998 Lars Magne Ingebrigtsen @@ -543,7 +607,7 @@ Fri Dec 4 04:09:15 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-display-mime): Set window point. * mm-decode.el (mm-display-external): Only decode when not - saving. + saving. (mm-alternative-precedence): Prefer multiparts. (mm-inline-media-tests): Inline multiparts. @@ -561,7 +625,7 @@ Thu Dec 3 12:53:58 1998 Lars Magne Ingebrigtsen 1998-12-03 13:38:36 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-mime-view-all-parts): Work with multiparts. + * gnus-art.el (gnus-mime-view-all-parts): Work with multiparts. 1998-12-03 Hrvoje Niksic @@ -583,7 +647,7 @@ Thu Dec 3 12:53:58 1998 Lars Magne Ingebrigtsen 1998-12-03 13:03:37 Felix Lee - * nntp.el (nntp-after-change-function): Fix. + * nntp.el (nntp-after-change-function): Fix. 1998-12-03 12:44:30 Mike McEwan @@ -596,7 +660,7 @@ Thu Dec 3 12:53:58 1998 Lars Magne Ingebrigtsen 1998-12-02 22:22:03 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-show-article): Destroy parts when - prefixed. + prefixed. * mm-encode.el (mm-content-transfer-encoding-defaults): Default application/emacs-lisp to 8bit. @@ -655,13 +719,13 @@ Tue Dec 1 23:04:25 1998 Shenghuo ZHU (gnus-article-display-picons): Replace From line. (gnus-group-display-picons): Replace Newsgroups line. (gnus-picons-display-glyph): Set baseline. - (gnus-group-display-picons): Piconize the entire Newsgroups line. + (gnus-group-display-picons): Piconize the entire Newsgroups line. (gnus-picons-xbm-face): Revert to old, standard colors. * message.el (message-fetch-field): Remove text props. * gnus-art.el (gnus-article-normalized-header-length): New - variable. + variable. (article-normalize-headers): New command and keystroke. * gnus-picon.el (gnus-picons-xbm-face): Changed colors. @@ -689,18 +753,18 @@ Wed Dec 2 01:43:48 1998 Lars Magne Ingebrigtsen (gnus-mime-internalize-part): New command and keystroke. * mm-decode.el (mm-user-automatic-external-display): New - variable. + variable. (mm-automatic-external-display-p): New function. * gnus-picon.el (gnus-picons-xbm-face): Default to sensible - colors. + colors. 1998-12-01 23:52:05 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-repair-multipart): Reselect article. + * gnus-sum.el (gnus-summary-repair-multipart): Reselect article. * gnus-art.el (gnus-with-article): Work in the original article - buffer. + buffer. (gnus-with-article): Work in read-only groups. Tue Dec 1 00:15:36 1998 Shenghuo ZHU @@ -742,7 +806,7 @@ Tue Dec 1 00:46:20 1998 Lars Magne Ingebrigtsen * mm-view.el (mm-setup-w3): Protect url-misc. * message.el (message-ignored-resent-headers): Remove - Gnus-Warning. + Gnus-Warning. * mml.el (mml-insert-mime-headers): Use encoding. (mml-parameter-string): Ditto. @@ -788,15 +852,15 @@ Mon Nov 30 21:57:00 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-with-article): Don't encode. (gnus-insert-mime-button): Fall back on filename from C-D. (gnus-mime-display-single): Have dots right on text/plain - attachments. + attachments. - * mm-decode.el (mm-dissect-buffer): Respect Content-Disposition in + * mm-decode.el (mm-dissect-buffer): Respect Content-Disposition in broken parts. * gnus-art.el (gnus-with-article): Flush cache and backlog. * mm-bodies.el (mm-decode-content-transfer-encoding): Also do - binhex. + binhex. * gnus-sum.el (gnus-summary-reparent-thread): Use new macro. (gnus-summary-repair-multipart): New command and keystroke. @@ -823,7 +887,7 @@ Sun Nov 29 23:51:57 1998 Shenghuo ZHU 1998-11-29 23:44:44 Lars Magne Ingebrigtsen * gnus-art.el (gnus-mime-display-mixed): Rewrite. - (gnus-mime-display-single): Don't insert lines between parts. + (gnus-mime-display-single): Don't insert lines between parts. Sun Nov 29 04:55:40 1998 Shenghuo ZHU @@ -895,7 +959,7 @@ Fri Nov 27 12:26:10 1998 Lars Magne Ingebrigtsen * message.el (message-buffer-name): Check for unique first. * gnus-art.el (gnus-unbuttonized-mime-type-p): use - gnus-inhibit-mime-unbuttonizing. + gnus-inhibit-mime-unbuttonizing. * gnus-sum.el (t): Bind M-t. (gnus-inhibit-unbuttonizing): New variable. @@ -907,7 +971,7 @@ Fri Nov 27 12:26:10 1998 Lars Magne Ingebrigtsen * nneething.el (nneething-include-files): New variable. (nneething-create-mapping): Use it. - * nntp.el (nntp-possibly-change-group): Use nntp-send-command. + * nntp.el (nntp-possibly-change-group): Use nntp-send-command. * nnvirtual.el (nnvirtual-request-update-mark): Only yodate ayto-expirable marks. @@ -917,7 +981,7 @@ Fri Nov 27 12:26:10 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-mime-view-all-parts): Set buffer. * gnus-sum.el (gnus-summary-display-buttonized): Don't pass on - ARG. + ARG. * gnus-art.el (gnus-article-mode-line-format): Doc fix. @@ -933,7 +997,7 @@ Tue Nov 24 10:43:06 1998 Lars Magne Ingebrigtsen 1998-11-24 11:21:32 Katsumi Yamaoka - * gnus-sum.el (gnus-newsgroup-default-charset-alist): Note fj. + * gnus-sum.el (gnus-newsgroup-default-charset-alist): Note fj. 1998-11-24 11:14:54 Lars Magne Ingebrigtsen @@ -941,7 +1005,7 @@ Tue Nov 24 10:43:06 1998 Lars Magne Ingebrigtsen 1998-11-24 11:14:39 Matt Armstrong - * mm-decode.el (mm-save-part): Bind coding system for write. + * mm-decode.el (mm-save-part): Bind coding system for write. 1998-11-24 10:42:30 Lars Magne Ingebrigtsen @@ -949,7 +1013,7 @@ Tue Nov 24 10:43:06 1998 Lars Magne Ingebrigtsen (gnus-article-mime-part-status): New function. * message.el (message-send-news): Check the body syntax before - encoding. + encoding. * gnus-art.el (gnus-unbuttonized-mime-type): New function. (gnus-mime-display-single): Use it. @@ -960,7 +1024,7 @@ Tue Nov 24 10:43:06 1998 Lars Magne Ingebrigtsen 1998-11-22 08:12:25 Lars Magne Ingebrigtsen * mm-decode.el (mm-preferred-alternative): Default to first - alternative. + alternative. (mm-preferred-alternative): No, we dont. Tue Nov 24 03:01:48 1998 Shenghuo ZHU @@ -978,8 +1042,8 @@ Mon Nov 23 01:51:57 1998 Shenghuo ZHU Mon Nov 23 01:26:40 1998 Shenghuo ZHU - * gnus-sum.el (gnus-newsgroup-default-charset): Rename - coding-system -> default-charset. + * gnus-sum.el (gnus-newsgroup-default-charset): Rename + coding-system -> default-charset. (gnus-newsgroup-default-charset-alist): Ditto. (gnus-summary-local-variables): Ditto. (gnus-set-global-variables): Ditto. @@ -1004,7 +1068,7 @@ Mon Nov 23 00:54:33 1998 Shenghuo ZHU * gnus-art.el (article-decode-charset): Overlay rfc2047-default-charset. * message.el (message-draft-coding-system): New variable. - (message-set-auto-save-file-name): Use message-draft-coding-system. + (message-set-auto-save-file-name): Use message-draft-coding-system. * nndraft.el (nndraft-request-article): Ditto. * gnus-start.el (gnus-start-draft-setup): Set charset nil. * gnus-agent.el (gnus-agent-queue-setup): Ditto. @@ -1033,11 +1097,11 @@ Sat Nov 21 09:57:01 1998 Lars Magne Ingebrigtsen 1998-11-20 10:34:04 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-mime-display-single): Insert blank line before + * gnus-art.el (gnus-mime-display-single): Insert blank line before buttons. * gnus-sum.el (gnus-summary-display-buttonized): New command and - keystroke. + keystroke. * gnus-art.el (gnus-mime-display-single): Don't insert a blank line between parts. @@ -1055,11 +1119,11 @@ Fri Nov 20 03:50:30 1998 Shenghuo ZHU Fri Nov 20 03:37:53 1998 Shenghuo ZHU - * mm-bodies.el (mm-decode-body): Remove buffer-file-coding-system. + * mm-bodies.el (mm-decode-body): Remove buffer-file-coding-system. Fri Nov 20 01:20:38 1998 Shenghuo ZHU - * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Use + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Use gnus-newsgroup-coding-system. (gnus-get-newsgroup-headers): Ditto. (gnus-get-newsgroup-headers-xover): Ditto. @@ -1073,7 +1137,7 @@ Fri Nov 20 01:20:38 1998 Shenghuo ZHU (gnus-mm-display-part): Ditto. (gnus-mime-display-alternative): Ditto. (gnus-mime-display-single): Ditto. - * mm-view.el (mm-inline-text): Use default coding system. + * mm-view.el (mm-inline-text): Use default coding system. Fri Nov 20 00:54:37 1998 Shenghuo ZHU @@ -1089,7 +1153,7 @@ Fri Nov 20 00:54:37 1998 Shenghuo ZHU (mm-charset-to-coding-system): Use mm-charset-iso-8859-1-forced. * gnus-cus.el (gnus-group-parameters): Customizable iso-8859-1-forced. - + Fri Nov 20 05:30:26 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.52 is released. @@ -1097,13 +1161,13 @@ Fri Nov 20 05:30:26 1998 Lars Magne Ingebrigtsen 1998-11-20 04:32:23 Lars Magne Ingebrigtsen * rfc2047.el (rfc2047-encode-message-header): Encode the default - encoding. + encoding. * gnus-art.el (gnus-mime-display-single): Insert buttons for undisplayed text types. * mm-decode.el (mm-automatic-display-p): Only prefer inlinable - types. + types. 1998-11-19 Felix Lee @@ -1134,15 +1198,15 @@ Fri Nov 20 05:30:26 1998 Lars Magne Ingebrigtsen (gnus-article-read-summary-keys): Use it. * mm-decode.el (mm-user-automatic-display): Display all inline - images. + images. * gnus-art.el (gnus-mime-display-single): Don't buttonize so - much. + much. (gnus-unbuttonized-mime-types): New variable. 1998-11-19 06:29:03 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-inhibit-user-auto-expire): Changed to t. + * gnus-sum.el (gnus-inhibit-user-auto-expire): Changed to t. * mm-decode.el (mm-quote-arg): Quote semicolons. @@ -1150,7 +1214,7 @@ Fri Nov 20 05:30:26 1998 Lars Magne Ingebrigtsen attachments. (gnus-mime-externalize-part): New command and keystroke. - * mm-decode.el (mm-dissect-buffer): Pass on the description info. + * mm-decode.el (mm-dissect-buffer): Pass on the description info. (mm-alternative-precedence): Changed order. 1998-11-07 17:41:47 Simon Josefsson @@ -1170,7 +1234,7 @@ Thu Nov 19 04:48:42 1998 Lars Magne Ingebrigtsen * gnus.el: Applied patches from 5.6.45. * gnus-score.el (gnus-score-find-trace): Print complete file - paths. + paths. (gnus-score-find-trace): Truncate lines. * gnus.el (gnus-message-archive-group): Allow function. @@ -1180,7 +1244,7 @@ Thu Nov 19 04:48:42 1998 Lars Magne Ingebrigtsen * gnus-cus.el (gnus-group-customize): Optional topic. - * gnus-sum.el (gnus-summary-customize-parameters): New command and + * gnus-sum.el (gnus-summary-customize-parameters): New command and keystroke. Wed Nov 18 13:46:08 1998 Shenghuo ZHU @@ -1209,7 +1273,7 @@ Wed Nov 18 05:06:44 1998 Lars Magne Ingebrigtsen 1998-11-18 04:42:01 Lars Magne Ingebrigtsen * mm-decode.el (mm-inline-media-tests): Check that device-type is - fbound. + fbound. * gnus-sum.el (gnus-summary-sort): Didn't do reverse. @@ -1251,10 +1315,10 @@ Wed Nov 18 05:06:44 1998 Lars Magne Ingebrigtsen 1998-11-18 02:36:37 Lars Magne Ingebrigtsen * mml.el (mml-generate-mime-1): Do right boundaries when several - multiparts. + multiparts. * mm-decode.el (mm-user-automatic-display): Default to inline - jpeg. + jpeg. * mml.el (mml-generate-mime-1): Encode non-text parts. @@ -1277,17 +1341,17 @@ Wed Nov 18 02:22:23 1998 Lars Magne Ingebrigtsen (mml-generate-mime-1): Use unibyte for binaries. * gnus-art.el (gnus-display-mime): Call - gnus-article-mime-part-function. + gnus-article-mime-part-function. (gnus-mime-part-function): New function. (gnus-article-mime-part-function): New function. - * mml.el (mml-generate-mime-1): Don't insert so many newlines. + * mml.el (mml-generate-mime-1): Don't insert so many newlines. 1998-11-16 06:44:19 Lars Magne Ingebrigtsen * mml.el (mml-generate-mime-1): Do it in unibyte buffers. - * message.el (message-font-lock-keywords): Highlight MML. + * message.el (message-font-lock-keywords): Highlight MML. (message-mml-face): New font. Mon Nov 16 23:34:12 1998 Shenghuo ZHU @@ -1310,7 +1374,7 @@ Mon Nov 16 02:00:05 1998 Lars Magne Ingebrigtsen * mm-util.el (mm-find-charset-region): Bogus change for non-Mule. - * message.el (message-cite-original-without-signature): Ditto. + * message.el (message-cite-original-without-signature): Ditto. (message-cite-original): Quote parts. Sun Nov 15 22:01:55 1998 Lars Magne Ingebrigtsen @@ -1319,12 +1383,12 @@ Sun Nov 15 22:01:55 1998 Lars Magne Ingebrigtsen 1998-11-15 20:11:33 Lars Magne Ingebrigtsen - * message.el (message-encode-message-body): Insert MIME warning. + * message.el (message-encode-message-body): Insert MIME warning. * mml.el (mml-read-tag): Look for #tag. * mm-util.el (mm-find-charset-region): Check whether - enable-multibyte-characters is bound. + enable-multibyte-characters is bound. Sun Nov 15 02:01:31 1998 Lars Magne Ingebrigtsen @@ -1382,10 +1446,10 @@ Sat Nov 14 05:47:57 1998 Lars Magne Ingebrigtsen (message-insert-mime-part): New command. * mm-encode.el (mm-encode-content-transfer-encoding): New - function. + function. * mm-util.el (mm-content-transfer-encoding-defaults): New - variable. + variable. (mm-mime-file-types): Taken from TM. Sat Nov 14 01:51:06 1998 Lars Magne Ingebrigtsen @@ -1408,14 +1472,14 @@ Sat Nov 14 01:51:06 1998 Lars Magne Ingebrigtsen 1998-11-13 20:30:40 Lars Magne Ingebrigtsen * message.el (message-resend): Bind message-required-mail-headers - to nil. + to nil. - * mm-view.el (mm-inline-text): Bind w3-strict-width. + * mm-view.el (mm-inline-text): Bind w3-strict-width. * nngateway.el (require): Require cl. * gnus-art.el (gnus-button-alist): Exclude more chars from news: - things. + things. Wed Nov 11 02:15:06 1998 Shenghuo ZHU @@ -1437,7 +1501,7 @@ Wed Nov 11 02:15:06 1998 Shenghuo ZHU (gnus-make-sort-function-1): Ditto. * gnus-art.el (gnus-mm-display-part): Switch to mm in right - window. + window. 1998-11-12 22:31:58 Lars Magne Ingebrigtsen @@ -1486,7 +1550,7 @@ Sun Nov 8 01:00:16 1998 Lars Magne Ingebrigtsen 1998-11-07 Mike McEwan - * gnus-agent.el (gnus-agent-save-group-info): Cater for group info + * gnus-agent.el (gnus-agent-save-group-info): Cater for group info lines where `group' is the last thing on the line. 1998-11-08 00:35:09 Lars Magne Ingebrigtsen @@ -1499,7 +1563,7 @@ Sun Nov 8 01:00:16 1998 Lars Magne Ingebrigtsen * mm-decode.el (mm-dissect-multipart): Quote regexp. * nnmail.el (nnmail-expired-article-p): Protect against bogus - dates. + dates. * gnus-cus.el (gnus-topic): Required. @@ -1518,7 +1582,7 @@ Sun Nov 8 01:00:16 1998 Lars Magne Ingebrigtsen 1998-10-29 12:09:20 Karl Kleinpaste * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Add - indicators. + indicators. 1998-10-29 11:31:11 Lars Magne Ingebrigtsen @@ -1565,7 +1629,7 @@ Wed Oct 28 02:19:16 1998 Shenghuo ZHU Tue Oct 27 11:59:31 1998 Shenghuo ZHU * mm-view.el (mm-inline-text): Postion of html portion. - + 1998-10-29 10:26:54 Lars Magne Ingebrigtsen * nntp.el (nntp-list-active-group): Waited for short strings. @@ -1584,7 +1648,7 @@ Tue Oct 27 11:59:31 1998 Shenghuo ZHU 1998-10-26 23:03:48 Lars Magne Ingebrigtsen * gnus-art.el (gnus-button-push): Don't go to - gnus-article-buffer. + gnus-article-buffer. * mm-view.el (mm-inline-image): Add a newline. @@ -1617,7 +1681,7 @@ Tue Oct 27 11:59:31 1998 Shenghuo ZHU * nnheader.el (nnheader-insert-nov): Work when not Xref. * gnus-sum.el (gnus-ignored-from-addresses): Default to - user-mail-address. + user-mail-address. (gnus-nov-parse-extra): Didn't return right thing. 1998-10-25 23:25:27 Lars Magne Ingebrigtsen @@ -1636,7 +1700,7 @@ Sun Oct 25 23:11:44 1998 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-mark-forward): Show thread. - * gnus-start.el (gnus-check-first-time-used): Ignore dribble. + * gnus-start.el (gnus-check-first-time-used): Ignore dribble. * gnus-agent.el (gnus-agent-fetch-group-1): Bind name. @@ -1649,7 +1713,7 @@ Sun Oct 25 23:11:44 1998 Lars Magne Ingebrigtsen 1998-10-25 19:26:11 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-set-mode-line): Check that the spec has been - set up. + set up. 1998-10-25 19:22:03 Joerg Lenneis @@ -1658,9 +1722,9 @@ Sun Oct 25 23:11:44 1998 Lars Magne Ingebrigtsen 1998-10-25 17:56:23 Lars Magne Ingebrigtsen * gnus-art.el (gnus-treatment-function-alist): Fix. - (gnus-summary-save-in-rmail): Use gnus-output-to-rmail. + (gnus-summary-save-in-rmail): Use gnus-output-to-rmail. - * nndoc.el (nndoc-dissect-mime-parts-sub): Recognize first part. + * nndoc.el (nndoc-dissect-mime-parts-sub): Recognize first part. Sun Oct 25 06:23:13 1998 Lars Magne Ingebrigtsen @@ -1681,13 +1745,13 @@ Sun Oct 25 06:23:13 1998 Lars Magne Ingebrigtsen * gnus.el: autoload gnus-uu-post-news. * mailcap.el (mailcap-mailcap-entry-passes-test): Also check - needsterm/DISPLAY. + needsterm/DISPLAY. * mm-decode.el (mm-display-part): Default to inline text/.* - parts. + parts. * mm-bodies.el (mm-decode-content-transfer-encoding): Default to - 8bit. + 8bit. * gnus-art.el (gnus-mime-copy-part): Use normal-mode. (gnus-mime-display-single): Inline all text parts. @@ -1698,14 +1762,14 @@ Sun Oct 25 06:23:13 1998 Lars Magne Ingebrigtsen * nnml.el (nnml-possibly-create-directory): Rewrite. (nnml-request-create-group): Change to right server. - * gnus-xmas.el (gnus-xmas-define): Use byte-code-function-p. + * gnus-xmas.el (gnus-xmas-define): Use byte-code-function-p. - * gnus-sum.el (gnus-set-mode-line): Use truncate-string-to-width. + * gnus-sum.el (gnus-set-mode-line): Use truncate-string-to-width. * gnus.el: rmail-output-to-rmail-file autoload. * gnus-util.el (gnus-output-to-rmail): Didn't work if not in - Gnus. + Gnus. * nnheader.el (nnheader-parse-head): Checked wrong variable. @@ -1719,7 +1783,7 @@ Tue Oct 20 23:37:43 1998 Shenghuo ZHU Tue Oct 20 23:36:43 1998 Shenghuo ZHU * gnus-sum.el (gnus-summary-exit): Use mm-destroy-parts. - + * gnus-sum.el (gnus-summary-exit-no-update): Ditto. Tue Oct 20 16:22:51 1998 Shenghuo ZHU @@ -1729,10 +1793,10 @@ Tue Oct 20 16:22:51 1998 Shenghuo ZHU 1998-10-24 20:51:53 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-valid-move-group-p): Make sure group has a - value. + value. * gnus-art.el (gnus-article-hidden-text-p): Return nil when not - hidden. + hidden. * gnus-spec.el (gnus-update-format-specifications): Use the article mode line spec. @@ -1755,21 +1819,21 @@ Sat Oct 24 20:31:55 1998 Lars Magne Ingebrigtsen 1998-10-24 07:54:58 Lars Magne Ingebrigtsen * gnus-art.el (article-mime-decode-quoted-printable-buffer): - Removed. + Removed. (article-de-quoted-unreadable): Narrow to default. * qp.el (quoted-printable-encode-region): Encode before QP-ing. * gnus-art.el (article-decode-charset): Decode even when broken - MIME. + MIME. * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Return - name. + name. * gnus-msg.el (gnus-copy-article-buffer): Delete headers. * gnus-cache.el (gnus-cache-possibly-enter-article): Use - nnheader. + nnheader. * nnmail.el (nnmail-extra-headers): New variable. @@ -1801,7 +1865,7 @@ Sat Oct 24 07:41:42 1998 Lars Magne Ingebrigtsen * mm-bodies.el (mm-decode-body): Check for multibyticity. * mm-util.el (mm-enable-multibyte): Don't always switch multibyte - on. + on. 1998-10-22 Didier Verna @@ -1815,7 +1879,7 @@ Sat Oct 24 07:41:42 1998 Lars Magne Ingebrigtsen 1998-10-22 04:05:55 Lars Magne Ingebrigtsen - * mm-decode.el (mm-display-external): Protect more and message. + * mm-decode.el (mm-display-external): Protect more and message. Wed Oct 21 03:26:30 1998 Shenghuo ZHU @@ -1830,7 +1894,7 @@ Tue Oct 20 23:37:43 1998 Shenghuo ZHU Tue Oct 20 23:36:43 1998 Shenghuo ZHU * gnus-sum.el (gnus-summary-exit): Use mm-destroy-parts. - + * gnus-sum.el (gnus-summary-exit-no-update): Ditto. Tue Oct 20 16:22:51 1998 Shenghuo ZHU @@ -1861,12 +1925,12 @@ Tue Oct 20 20:25:03 1998 Lars Magne Ingebrigtsen 1998-10-20 18:13:08 Lars Magne Ingebrigtsen - * gnus-art.el (article-translate-strings): + * gnus-art.el (article-translate-strings): (gnus-article-dumbquotes-map): Don't dot. * pop3.el (pop3-open-server): Set point right. - * mm-decode.el (mm-dissect-multipart): Dissect hierarchically. + * mm-decode.el (mm-dissect-multipart): Dissect hierarchically. (mm-dissect-buffer): Ditto. (mm-destroy-part): Ignore non-handles. (mm-remove-part): Ditto. @@ -1878,9 +1942,9 @@ Tue Oct 20 20:25:03 1998 Lars Magne Ingebrigtsen Tue Oct 20 02:16:36 1998 Shenghuo ZHU * mm-uu.el : New file. - + * gnus-art.el (gnus-display-mime): Dissect uu stuffs. - + * mm-bodies.el (mm-decode-content-transfer-encoding): Encoding as a function. @@ -1890,21 +1954,21 @@ Tue Oct 20 02:16:36 1998 Shenghuo ZHU Sat Sep 26 02:03:00 1998 Shenghuo ZHU - * gnus-sum.el (gnus-multi-decode-encoded-word-string): Rewrite. - + * gnus-sum.el (gnus-multi-decode-encoded-word-string): Rewrite. + * gnus-sum.el (gnus-decode-encoded-word-methods): New variable. - + * gnus-sum.el (gnus-decode-encoded-word-methods-cache): New variable. - + * gnus-sum.el (gnus-encoded-word-method-alist): Deleted. - + * gnus-art.el (gnus-decode-header-methods): New variable. * gnus-art.el (gnus-decode-header-methods-cache): New variable. * gnus-art.el (gnus-multi-decode-header): New function. - + Tue Oct 20 00:24:16 1998 Lars Magne Ingebrigtsen * gnus.el: Pterodactyl Gnus v0.35 is released. @@ -1912,7 +1976,7 @@ Tue Oct 20 00:24:16 1998 Lars Magne Ingebrigtsen 1998-10-20 00:00:36 Lars Magne Ingebrigtsen * uudecode.el (uudecode-decode-region-external): Insert - literally. + literally. * gnus-xmas.el (gnus-xmas-mime-button-menu): Moved here. @@ -1936,7 +2000,7 @@ Tue Oct 20 00:24:16 1998 Lars Magne Ingebrigtsen 1998-09-26 19:39:31 Simon Josefsson - * gnus-sum.el (gnus-update-read-articles): + * gnus-sum.el (gnus-update-read-articles): (gnus-update-marks): Request backend update of mark. 1998-09-26 19:33:58 Simon Josefsson @@ -1976,7 +2040,7 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson 1998-10-19 23:35:08 Joerg Lenneis - * nnheader.el (nnheader-article-p): Recognize lower-case headers. + * nnheader.el (nnheader-article-p): Recognize lower-case headers. 1998-10-19 Hrvoje Niksic @@ -2024,7 +2088,7 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson 1998-10-19 00:50:22 Lars Magne Ingebrigtsen * mm-bodies.el (mm-decode-content-transfer-encoding): Use - uudecode. + uudecode. 1998-10-18 18:20:34 Lars Magne Ingebrigtsen @@ -2036,7 +2100,7 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson 1998-10-18 00:17:02 Lars Magne Ingebrigtsen - * gnus-art.el (article-translate-strings): + * gnus-art.el (article-translate-strings): 1998-10-17 22:51:31 Lars Magne Ingebrigtsen @@ -2065,7 +2129,7 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson * gnus-art.el (gnus-article-setup-buffer): Set params. * mm-decode.el (mm-user-display-methods): Inline - "message/delivery-status". + "message/delivery-status". 1998-10-11 07:06:38 Lars Magne Ingebrigtsen @@ -2073,14 +2137,14 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson (message-mode): Dof fix. * gnus-art.el (gnus-summary-save-in-pipe): Default to "cat". - (gnus-summary-save-in-pipe): No, check gnus-last-shell-command. + (gnus-summary-save-in-pipe): No, check gnus-last-shell-command. * nndoc.el (nndoc-mime-parts-type-p): Be a bit more forgiving. * message.el (message-make-date): Avoid locale. * gnus-art.el (gnus-article-edit-done): Allow update before doing - cache. + cache. * mm-decode.el (mm-display-inline): Goto point-min. @@ -2092,7 +2156,7 @@ Sun Oct 18 13:59:07 1998 Kurt Swanson 1998-10-10 -SL Baur - * message.el (message-check): Move message-check macro above where + * message.el (message-check): Move message-check macro above where it is first used. * gnus-art.el (article-hide-pgp): Hide the PGP 5/GNUPG Hash: line. @@ -2120,24 +2184,24 @@ Sun Oct 11 02:28:40 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-edit-exit): Don't do updates. (article-update-date-lapsed): Record the buffer. (article-update-date-lapsed): Do all windows that display article - buffers. + buffers. * nnml.el (nnml-generate-nov-databases-1): Ditto. - * gnus-score.el (gnus-score-score-files-1): Ignore dotted files. + * gnus-score.el (gnus-score-score-files-1): Ignore dotted files. * gnus-art.el (gnus-insert-mime-button): Mark buttons as - annoations. + annoations. * gnus-msg.el (gnus-summary-mail-forward): Decode properly. 1998-10-10 22:07:03 Lars Magne Ingebrigtsen * gnus-agent.el (gnus-category-add): Change default category to - 'false. + 'false. * nnvirtual.el (nnvirtual-update-read-and-marked): Don't nix out - scores. + scores. * gnus-draft.el (gnus-draft-send): Check server more. @@ -2146,7 +2210,7 @@ Sun Oct 11 02:28:40 1998 Lars Magne Ingebrigtsen * mm-view.el (mm-inline-text): Insert richtext properly. - * gnus-art.el (gnus-insert-mime-button): Store handle in alist. + * gnus-art.el (gnus-insert-mime-button): Store handle in alist. 1998-10-03 15:04:27 Lars Magne Ingebrigtsen @@ -2160,7 +2224,7 @@ Sun Oct 11 02:28:40 1998 Lars Magne Ingebrigtsen 1998-10-01 07:33:35 Lars Magne Ingebrigtsen * uudecode.el (uu-decode-region-external): Use - insert-file-contents-literally. + insert-file-contents-literally. * gnus-cache.el (gnus-cache-generate-active): Translate _ to :. @@ -2169,7 +2233,7 @@ Sun Oct 11 02:28:40 1998 Lars Magne Ingebrigtsen * uudecode.el: New file. * mm-bodies.el (mm-decode-content-transfer-encoding): Do - x-uuencode. + x-uuencode. 1998-10-01 05:19:35 Lars Magne Ingebrigtsen @@ -2213,13 +2277,13 @@ Sat Sep 26 03:04:18 1998 Shenghuo ZHU 1998-09-29 11:35:09 Lars Magne Ingebrigtsen * gnus-art.el (gnus-mime-view-all-parts): New command and - keystroke. + keystroke. * mm-decode.el (mm-display-external): Translate slashes. * nnmail.el (nnmail-find-file): Restrict auto-mode-alist. - * nndraft.el (nndraft-retrieve-headers): Don't copy so much. + * nndraft.el (nndraft-retrieve-headers): Don't copy so much. * mm-decode.el (mm-quote-arg): Quote spaces. (mm-display-external): Quote args. @@ -2240,7 +2304,7 @@ Thu Sep 24 20:28:31 1998 Lars Magne Ingebrigtsen * gnus-art.el (gnus-insert-mime-button): Get buffer size. - * mm-decode.el (mm-display-external): Don't switch for externals. + * mm-decode.el (mm-display-external): Don't switch for externals. (mm-dissect-multipart): Don't include end-sep. * mm-util.el (mm-get-coding-system-list): New function. @@ -2289,7 +2353,7 @@ Thu Sep 24 02:29:57 1998 Lars Magne Ingebrigtsen * gnus-art.el: Protect against broken headers. * mm-decode.el (mm-display-external): Respect needsterm. - (mm-display-external): Create buffer for external commands. + (mm-display-external): Create buffer for external commands. 1998-09-23 22:04:05 Lars Magne Ingebrigtsen @@ -2307,7 +2371,7 @@ Thu Sep 24 02:29:57 1998 Lars Magne Ingebrigtsen * gnus-util.el (gnus-output-to-rmail): Reinstated function. * gnus-sum.el (gnus-select-newsgroup): Set global variables before - headers. + headers. * gnus-art.el (article-decode-charset): Fold case. @@ -2338,7 +2402,7 @@ Sun Sep 20 00:27:55 1998 ZHU Shenghuo 1998-09-23 19:30:52 Matt Armstrong * gnus-art.el (article-decode-charset): Narrow to the correct - region. + region. * mm-bodies.el: Fix autoload. @@ -2348,7 +2412,7 @@ Sun Sep 20 00:27:55 1998 ZHU Shenghuo 1998-09-22 14:53:35 Lars Magne Ingebrigtsen - * rfc2047.el (rfc2047-decode): Use rfc2047-default-charset. + * rfc2047.el (rfc2047-decode): Use rfc2047-default-charset. 1998-09-19 13:58:35 Lars Magne Ingebrigtsen @@ -2357,7 +2421,7 @@ Sun Sep 20 00:27:55 1998 ZHU Shenghuo * gnus-sum.el (gnus-summary-insert-pseudos): Use mm. - * gnus-art.el (gnus-article-prepare-display): Make article mode. + * gnus-art.el (gnus-article-prepare-display): Make article mode. (gnus-article-prepare-display): Bind url-standalone-mode. * mm-decode.el (mm-remove-part): Also delete directory. @@ -2372,7 +2436,7 @@ Sun Sep 20 00:27:55 1998 ZHU Shenghuo (nnmbox-possibly-change-newsgroup): Enable multibyte. * message.el (message-encode-message-body): Don't stomp MIME - headers. + headers. * gnus-sum.el (gnus-summary-edit-article-done): Don't encode unless useful. @@ -2386,11 +2450,11 @@ Sun Sep 20 00:27:55 1998 ZHU Shenghuo * mm-decode.el (mm-display-external): Use no-conv. - * rfc2047.el (rfc2047-q-encode-region): Bound properly. + * rfc2047.el (rfc2047-q-encode-region): Bound properly. (rfc2047-charset-encoding-alist): Use B encoding for koi8-r. * gnus-art.el (gnus-article-mode-map): Bind button2 to - mouse-click. + mouse-click. 1998-09-15 14:38:02 Lars Magne Ingebrigtsen diff --git a/lisp/base64.el b/lisp/base64.el index d0bb0c2..a100641 100644 --- a/lisp/base64.el +++ b/lisp/base64.el @@ -137,7 +137,7 @@ base64-encoder-program.") ((> (skip-chars-forward base64-alphabet end) 0) (setq lim (point)) (while (< inputpos lim) - (setq bits (+ bits + (setq bits (+ bits (aref base64-alphabet-decoding-vector (char-int (char-after inputpos))))) (setq counter (1+ counter) @@ -266,7 +266,7 @@ base64-encoder-program.") (delete-region (point-max) (point)) (prog1 (buffer-string) - (kill-buffer (current-buffer))))) + (kill-buffer (current-buffer))))) (fset 'base64-decode-string 'base64-decode) diff --git a/lisp/binhex.el b/lisp/binhex.el index 5effade..73510aa 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -3,10 +3,10 @@ ;; Author: Shenghuo Zhu ;; Create Date: Oct 1, 1998 -;; $Revision: 1.1.2.5 $ +;; $Revision: 1.1.2.6 $ ;; Time-stamp: ;; Keywords: binhex - + ;; This file is not part of GNU Emacs, but the same permissions ;; apply. @@ -77,44 +77,44 @@ input and write the converted data to its standard output.") (insert-char char count))))) (defvar binhex-crc-table - [0 4129 8258 12387 16516 20645 24774 28903 - 33032 37161 41290 45419 49548 53677 57806 61935 - 4657 528 12915 8786 21173 17044 29431 25302 - 37689 33560 45947 41818 54205 50076 62463 58334 - 9314 13379 1056 5121 25830 29895 17572 21637 - 42346 46411 34088 38153 58862 62927 50604 54669 - 13907 9842 5649 1584 30423 26358 22165 18100 - 46939 42874 38681 34616 63455 59390 55197 51132 - 18628 22757 26758 30887 2112 6241 10242 14371 - 51660 55789 59790 63919 35144 39273 43274 47403 - 23285 19156 31415 27286 6769 2640 14899 10770 - 56317 52188 64447 60318 39801 35672 47931 43802 - 27814 31879 19684 23749 11298 15363 3168 7233 - 60846 64911 52716 56781 44330 48395 36200 40265 - 32407 28342 24277 20212 15891 11826 7761 3696 - 65439 61374 57309 53244 48923 44858 40793 36728 - 37256 33193 45514 41451 53516 49453 61774 57711 - 4224 161 12482 8419 20484 16421 28742 24679 - 33721 37784 41979 46042 49981 54044 58239 62302 - 689 4752 8947 13010 16949 21012 25207 29270 - 46570 42443 38312 34185 62830 58703 54572 50445 - 13538 9411 5280 1153 29798 25671 21540 17413 - 42971 47098 34713 38840 59231 63358 50973 55100 - 9939 14066 1681 5808 26199 30326 17941 22068 - 55628 51565 63758 59695 39368 35305 47498 43435 - 22596 18533 30726 26663 6336 2273 14466 10403 - 52093 56156 60223 64286 35833 39896 43963 48026 - 19061 23124 27191 31254 2801 6864 10931 14994 - 64814 60687 56684 52557 48554 44427 40424 36297 - 31782 27655 23652 19525 15522 11395 7392 3265 - 61215 65342 53085 57212 44955 49082 36825 40952 + [0 4129 8258 12387 16516 20645 24774 28903 + 33032 37161 41290 45419 49548 53677 57806 61935 + 4657 528 12915 8786 21173 17044 29431 25302 + 37689 33560 45947 41818 54205 50076 62463 58334 + 9314 13379 1056 5121 25830 29895 17572 21637 + 42346 46411 34088 38153 58862 62927 50604 54669 + 13907 9842 5649 1584 30423 26358 22165 18100 + 46939 42874 38681 34616 63455 59390 55197 51132 + 18628 22757 26758 30887 2112 6241 10242 14371 + 51660 55789 59790 63919 35144 39273 43274 47403 + 23285 19156 31415 27286 6769 2640 14899 10770 + 56317 52188 64447 60318 39801 35672 47931 43802 + 27814 31879 19684 23749 11298 15363 3168 7233 + 60846 64911 52716 56781 44330 48395 36200 40265 + 32407 28342 24277 20212 15891 11826 7761 3696 + 65439 61374 57309 53244 48923 44858 40793 36728 + 37256 33193 45514 41451 53516 49453 61774 57711 + 4224 161 12482 8419 20484 16421 28742 24679 + 33721 37784 41979 46042 49981 54044 58239 62302 + 689 4752 8947 13010 16949 21012 25207 29270 + 46570 42443 38312 34185 62830 58703 54572 50445 + 13538 9411 5280 1153 29798 25671 21540 17413 + 42971 47098 34713 38840 59231 63358 50973 55100 + 9939 14066 1681 5808 26199 30326 17941 22068 + 55628 51565 63758 59695 39368 35305 47498 43435 + 22596 18533 30726 26663 6336 2273 14466 10403 + 52093 56156 60223 64286 35833 39896 43963 48026 + 19061 23124 27191 31254 2801 6864 10931 14994 + 64814 60687 56684 52557 48554 44427 40424 36297 + 31782 27655 23652 19525 15522 11395 7392 3265 + 61215 65342 53085 57212 44955 49082 36825 40952 28183 32310 20053 24180 11923 16050 3793 7920]) (defun binhex-update-crc (crc char &optional count) (if (null count) (setq count 1)) (while (> count 0) - (setq crc (logxor (logand (lsh crc 8) 65280) - (aref binhex-crc-table + (setq crc (logxor (logand (lsh crc 8) 65280) + (aref binhex-crc-table (logxor (logand (lsh crc -8) 255) char))) count (1- count))) @@ -148,7 +148,7 @@ input and write the converted data to its standard output.") (defun binhex-header (buffer) (with-current-buffer buffer (let ((pos (point-min)) len) - (vector + (vector (prog1 (setq len (char-int (char-after pos))) (setq pos (1+ pos))) @@ -158,23 +158,23 @@ input and write the converted data to its standard output.") (setq pos (1+ pos))) (buffer-substring pos (setq pos (+ pos 4))) (buffer-substring pos (setq pos (+ pos 4))) - (binhex-string-big-endian + (binhex-string-big-endian (buffer-substring pos (setq pos (+ pos 2)))) - (binhex-string-big-endian + (binhex-string-big-endian (buffer-substring pos (setq pos (+ pos 4)))) - (binhex-string-big-endian + (binhex-string-big-endian (buffer-substring pos (setq pos (+ pos 4)))))))) (defvar binhex-last-char) (defvar binhex-repeat) (defun binhex-push-char (char &optional count ignored buffer) - (cond - (binhex-repeat + (cond + (binhex-repeat (if (eq char 0) - (binhex-insert-char (setq binhex-last-char 144) 1 + (binhex-insert-char (setq binhex-last-char 144) 1 ignored buffer) - (binhex-insert-char binhex-last-char (- char 1) + (binhex-insert-char binhex-last-char (- char 1) ignored buffer) (setq binhex-last-char nil)) (setq binhex-repeat nil)) @@ -190,7 +190,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (let ((work-buffer nil) (counter 0) (bits 0) (tmp t) - (lim 0) inputpos + (lim 0) inputpos (non-data-chars " \t\n\r:") file-name-length data-fork-start header @@ -200,10 +200,10 @@ If HEADER-ONLY is non-nil only decode header and return filename." (goto-char start) (when (re-search-forward binhex-begin-line end t) (if (boundp 'enable-multibyte-characters) - (let ((multibyte + (let ((multibyte (default-value 'enable-multibyte-characters))) (setq-default enable-multibyte-characters nil) - (setq work-buffer + (setq work-buffer (generate-new-buffer " *binhex-work*")) (setq-default enable-multibyte-characters multibyte)) (setq work-buffer (generate-new-buffer " *binhex-work*"))) @@ -233,31 +233,31 @@ If HEADER-ONLY is non-nil only decode header and return filename." (setq file-name-length (char-after (point-min)) data-fork-start (+ (point-min) file-name-length 22)))) - (if (and (null header) + (if (and (null header) (with-current-buffer work-buffer (>= (buffer-size) data-fork-start))) (progn - (binhex-verify-crc work-buffer + (binhex-verify-crc work-buffer 1 data-fork-start) (setq header (binhex-header work-buffer)) (if header-only (setq tmp nil counter 0)))) (setq tmp (and tmp (not (eq inputpos end))))) (cond ((= counter 3) - (binhex-push-char (logand (lsh bits -16) 255) 1 nil + (binhex-push-char (logand (lsh bits -16) 255) 1 nil work-buffer) (binhex-push-char (logand (lsh bits -8) 255) 1 nil work-buffer)) ((= counter 2) - (binhex-push-char (logand (lsh bits -10) 255) 1 nil + (binhex-push-char (logand (lsh bits -10) 255) 1 nil work-buffer)))) (if header-only nil (binhex-verify-crc work-buffer - data-fork-start + data-fork-start (+ data-fork-start (aref header 6) 2)) (or (markerp end) (setq end (set-marker (make-marker) end))) (goto-char start) - (insert-buffer-substring work-buffer + (insert-buffer-substring work-buffer data-fork-start (+ data-fork-start (aref header 6))) (delete-region (point) end))) @@ -268,7 +268,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." "Binhex decode region between START and END using external decoder" (interactive "r") (let ((cbuf (current-buffer)) firstline work-buffer status - (file-name (concat binhex-temporary-file-directory + (file-name (concat binhex-temporary-file-directory (binhex-decode-region start end t) ".data"))) (save-excursion @@ -277,7 +277,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (let ((cdir default-directory) default-process-coding-system) (unwind-protect (progn - (set-buffer (setq work-buffer + (set-buffer (setq work-buffer (generate-new-buffer " *binhex-work*"))) (buffer-disable-undo work-buffer) (insert-buffer-substring cbuf firstline end) @@ -285,7 +285,7 @@ If HEADER-ONLY is non-nil only decode header and return filename." (apply 'call-process-region (point-min) (point-max) - binhex-decoder-program + binhex-decoder-program nil nil nil @@ -307,5 +307,3 @@ If HEADER-ONLY is non-nil only decode header and return filename." (provide 'binhex) ;;; binhex.el ends here - - diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 506b657..40377bc 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -96,11 +96,8 @@ If nil, only read articles will be expired." (defvar gnus-agent-file-coding-system 'binary) (defconst gnus-agent-scoreable-headers - (list - "subject" "from" "date" "message-id" - "references" "chars" "lines" "xref") - "Headers that are considered when scoring articles -for download via the Agent.") + '("subject" "from" "date" "message-id" "references" "chars" "lines" "xref") + "Headers that are considered when scoring articles for download via the Agent.") ;; Dynamic variables (defvar gnus-headers) @@ -320,7 +317,7 @@ agent minor mode in all Gnus buffers." (interactive) (gnus-open-agent) (add-hook 'gnus-setup-news-hook 'gnus-agent-queue-setup) - (unless gnus-agent-send-mail-function + (unless gnus-agent-send-mail-function (setq gnus-agent-send-mail-function message-send-mail-function message-send-mail-function 'gnus-agent-send-mail)) (unless gnus-agent-covered-methods @@ -513,12 +510,21 @@ the actual number of articles toggled is returned." (when (and (not gnus-plugged) (gnus-agent-method-p gnus-command-method)) (gnus-agent-load-alist gnus-newsgroup-name) + ;; First mark all undownloaded articles as undownloaded. (let ((articles gnus-newsgroup-unreads) article) (while (setq article (pop articles)) (unless (or (cdr (assq article gnus-agent-article-alist)) (memq article gnus-newsgroup-downloadable)) - (push article gnus-newsgroup-undownloaded))))))) + (push article gnus-newsgroup-undownloaded)))) + ;; Then mark downloaded downloadable as not-downloadable, + ;; if you get my drift. + (let ((articles gnus-newsgroup-downloadable) + article) + (while (setq article (pop articles)) + (when (cdr (assq article gnus-agent-article-alist)) + (setq gnus-newsgroup-downloadable + (delq article gnus-newsgroup-downloadable)))))))) (defun gnus-agent-catchup () "Mark all undownloaded articles as read." @@ -784,7 +790,7 @@ the actual number of articles toggled is returned." (cdr (gnus-active group))))) (gnus-list-of-unread-articles group))) (gnus-decode-encoded-word-function 'identity) - (file (gnus-agent-article-name ".overview" group))) + (file (gnus-agent-article-name ".overview" group))) ;; Fetch them. (gnus-make-directory (nnheader-translate-file-chars (file-name-directory file))) @@ -925,7 +931,7 @@ the actual number of articles toggled is returned." ;; Parse them and see which articles we want to fetch. (setq gnus-newsgroup-dependencies (make-vector (length articles) 0)) - ;; No need to call `gnus-get-newsgroup-headers-xover' with + ;; No need to call `gnus-get-newsgroup-headers-xover' with ;; the entire .overview for group as we still have the just ;; downloaded headers in `gnus-agent-overview-buffer'. (let ((nntp-server-buffer gnus-agent-overview-buffer)) @@ -933,21 +939,21 @@ the actual number of articles toggled is returned." (gnus-get-newsgroup-headers-xover articles nil nil group))) (setq category (gnus-group-category group)) (setq predicate - (gnus-get-predicate + (gnus-get-predicate (or (gnus-group-get-parameter group 'agent-predicate t) (cadr category)))) ;; Do we want to download everything, or nothing? (if (or (eq (caaddr predicate) 'gnus-agent-true) (eq (caaddr predicate) 'gnus-agent-false)) ;; Yes. - (setq arts (symbol-value - (cadr (assoc (caaddr predicate) + (setq arts (symbol-value + (cadr (assoc (caaddr predicate) '((gnus-agent-true articles) (gnus-agent-false nil)))))) ;; No, we need to decide what we want. (setq score-param (let ((score-method - (or + (or (gnus-group-get-parameter group 'agent-score t) (caddr category)))) (when score-method @@ -965,7 +971,7 @@ the actual number of articles toggled is returned." gnus-agent-scoreable-headers) (push (car list) score-file)) (setq list (cdr list))) - (setq score-param + (setq score-param (append score-param (list (nreverse score-file))) score-file nil entries (cdr entries))) (list score-param)) @@ -1151,7 +1157,7 @@ The following commands are available: (or (gnus-agent-read-file (nnheader-concat gnus-agent-directory "lib/categories")) (list (list 'default 'short nil nil))))) - + (defun gnus-category-write () "Write the category alist." (setq gnus-category-predicate-cache nil @@ -1170,7 +1176,7 @@ The following commands are available: (setf (cadr (assq ',category gnus-category-alist)) predicate) (gnus-category-write) (gnus-category-list))))) - + (defun gnus-category-edit-score (category) "Edit the score expression for CATEGORY." (interactive (list (gnus-category-name))) @@ -1285,7 +1291,7 @@ The following commands are available: (defun gnus-agent-false () "Return nil." nil) - + (defun gnus-category-make-function-1 (cat) "Make a function from category CAT." (cond diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 3e2d86b..6545081 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -593,7 +593,7 @@ displayed by the first non-nil matching CONTENT face." ("\224" "''") ("\225" "*") ("\226" "-") - ("\227" "-") + ("\227" "-") ("\231" "(TM)") ("\233" ">") ("\234" "oe") @@ -621,6 +621,9 @@ displayed by the first non-nil matching CONTENT face." ;;; The treatment variables ;;; +(defvar gnus-part-display-hook nil + "Hook called on parts that are to receive treatment.") + (defvar gnus-article-treat-custom '(choice (const :tag "Off" nil) (const :tag "On" t) @@ -750,7 +753,8 @@ displayed by the first non-nil matching CONTENT face." :group 'gnus-article-treat :type gnus-article-treat-custom) -(defcustom gnus-treat-display-xface (if gnus-xemacs 'head nil) +(defcustom gnus-treat-display-xface (if (and gnus-xemacs (featurep 'xface)) + 'head nil) "Display X-Face headers." :group 'gnus-article-treat :type gnus-article-treat-custom) @@ -762,11 +766,13 @@ displayed by the first non-nil matching CONTENT face." (defcustom gnus-treat-display-picons (if gnus-xemacs 'head nil) "Display picons." - :group 'gnus-article + :group 'gnus-article-treat :type gnus-article-treat-custom) ;;; Internal variables +(defvar article-goto-body-goes-to-point-min-p nil) + (defvar gnus-article-mime-handle-alist-1 nil) (defvar gnus-treatment-function-alist '((gnus-treat-highlight-signature gnus-article-highlight-signature) @@ -797,7 +803,8 @@ displayed by the first non-nil matching CONTENT face." (gnus-treat-strip-blank-lines gnus-article-strip-blank-lines) (gnus-treat-overstrike gnus-article-treat-overstrike) (gnus-treat-display-xface gnus-article-display-x-face) - (gnus-treat-display-smileys gnus-smiley-display))) + (gnus-treat-display-smileys gnus-smiley-display) + (gnus-treat-display-picons gnus-article-display-picons))) (defvar gnus-article-mime-handle-alist nil) (defvar article-lapsed-timer nil) @@ -1434,12 +1441,16 @@ always hide." (gnus-delete-line)))))) (defun article-goto-body () - "Place point at the start of the body." + "Place point at the start of the body." (goto-char (point-min)) - (if (search-forward "\n\n" nil t) - t + (cond + (article-goto-body-goes-to-point-min-p + t) + ((search-forward "\n\n" nil t) + t) + (t (goto-char (point-max)) - nil)) + nil))) (defun article-strip-multiple-blank-lines () "Replace consecutive blank lines with one empty line." @@ -2628,8 +2639,8 @@ If ALL-HEADERS is non-nil, no headers are hidden." (set-buffer (window-buffer (posn-window pos))) (goto-char (posn-point pos)) (gnus-article-check-buffer) - (let ((response (x-popup-menu - t `("MIME Part" + (let ((response (x-popup-menu + t `("MIME Part" ("" ,@(mapcar (lambda (c) (cons (caddr c) (car c))) gnus-mime-button-commands)))))) @@ -2703,7 +2714,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (mm-remove-part data) (setq contents (mm-get-part data)) (forward-line 2) - (when charset + (when charset (unless (symbolp charset) (setq charset (mm-read-coding-system "Charset: "))) (setq contents (mm-decode-coding-string contents charset))) @@ -2746,17 +2757,17 @@ If ALL-HEADERS is non-nil, no headers are hidden." "Pipe MIME part N, which is the numerical prefix." (interactive "p") (gnus-article-part-wrapper n 'mm-pipe-part)) - + (defun gnus-article-save-part (n) "Save MIME part N, which is the numerical prefix." (interactive "p") (gnus-article-part-wrapper n 'mm-save-part)) - + (defun gnus-article-interactively-view-part (n) "Pipe MIME part N, which is the numerical prefix." (interactive "p") (gnus-article-part-wrapper n 'mm-interactively-view-part)) - + (defun gnus-article-copy-part (n) "Pipe MIME part N, which is the numerical prefix." (interactive "p") @@ -2766,7 +2777,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." "Pipe MIME part N, which is the numerical prefix." (interactive "p") (gnus-article-part-wrapper n 'gnus-mime-externalize-part)) - + (defun gnus-article-view-part (n) "View MIME part N, which is the numerical prefix." (interactive "p") @@ -2786,9 +2797,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (let ((id (get-text-property (point) 'gnus-part)) (point (point)) buffer-read-only) - (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point))) - (gnus-insert-mime-button - handle id (list (not (mm-handle-displayed-p handle)))) + (forward-line 1) (prog1 (let ((window (selected-window)) (mail-parse-charset gnus-newsgroup-charset)) @@ -2801,6 +2810,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (goto-char point) (forward-line) (if (mm-handle-displayed-p handle) + ;; This will remove the part. (mm-display-part handle) (save-restriction (narrow-to-region (point) (1+ (point))) @@ -2810,6 +2820,10 @@ If ALL-HEADERS is non-nil, no headers are hidden." (1- (length gnus-article-mime-handles)) (car (mm-handle-type handle)))))) (select-window window)))) + (goto-char point) + (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point))) + (gnus-insert-mime-button + handle id (list (mm-handle-displayed-p handle))) (goto-char point)))) (defun gnus-article-goto-part (n) @@ -4382,13 +4396,16 @@ For example: (defun gnus-treat-article (condition &optional part-number total-parts type) (let ((length (- (point-max) (point-min))) (alist gnus-treatment-function-alist) + (article-goto-body-goes-to-point-min-p t) val elem) - (when (or (not type) - (catch 'found - (let ((list gnus-article-treat-types)) - (while list - (when (string-match (pop list) type) - (throw 'found t)))))) + (when (and (gnus-visual-p 'article-highlight 'highlight) + (or (not type) + (catch 'found + (let ((list gnus-article-treat-types)) + (while list + (when (string-match (pop list) type) + (throw 'found t))))))) + (gnus-run-hooks 'gnus-part-display-hook) (while (setq elem (pop alist)) (setq val (symbol-value (car elem))) (when (cond diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 712d022..4a63495 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -200,7 +200,7 @@ DOC is a documentation string for the parameter.") (make-local-variable 'gnus-custom-topic) (setq gnus-custom-topic topic) (widget-insert "Customize the ") - (if group + (if group (widget-create 'info-link :help-echo "Push me to learn more." :tag "group parameters" @@ -220,7 +220,7 @@ DOC is a documentation string for the parameter.") (make-local-variable 'gnus-custom-params) (setq gnus-custom-params (widget-create 'group - :value (if group + :value (if group (gnus-info-params info) (gnus-topic-parameters topic)) `(set :inline t @@ -274,7 +274,7 @@ form, but who cares?" "Apply changes and bury the buffer." (interactive) (if gnus-custom-topic - (gnus-topic-set-parameters gnus-custom-topic + (gnus-topic-set-parameters gnus-custom-topic (widget-value gnus-custom-params)) (gnus-group-edit-group-done 'params gnus-custom-group (widget-value gnus-custom-params)) diff --git a/lisp/gnus-gl.el b/lisp/gnus-gl.el index 52a9df7..3263e60 100644 --- a/lisp/gnus-gl.el +++ b/lisp/gnus-gl.el @@ -766,7 +766,7 @@ If prefix argument ALL is non-nil, all articles are marked as read." (defun gnus-gl-get-trace () "Insert the contents of the BBBD trace buffer." (when grouplens-bbb-buffer - (insert-buffer grouplens-bbb-buffer))) + (insert-buffer-substring grouplens-bbb-buffer))) ;; ;; GroupLens minor mode diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index d086c13..8f97890 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -598,6 +598,19 @@ If FORCE, re-parse even if already parsed." (t (setcdr old-major (cons (cons minor info) (cdr old-major))))))))) +(defun mailcap-add (type viewer &optional test) + "Add VIEWER as a handler for TYPE. +If TEST is not given, it defaults to t." + (let ((tl (split-string type "/"))) + (when (or (not (car tl)) + (not (cadr tl))) + (error "%s is not a valid MIME type" type)) + (mailcap-add-mailcap-entry + (car tl) (cadr tl) + `((viewer . ,viewer) + (test . ,(if test test t)) + (type . ,type))))) + ;;; ;;; The main whabbo ;;; diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 7bce9b8..c3753cc 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -111,9 +111,10 @@ the second with the current group name.") (name . user-full-name)) "*Mapping from style parameters to variables.") -(defcustom gnus-group-posting-charset-alist +(defcustom gnus-group-posting-charset-alist '(("^no\\." iso-8859-1) (".*" iso-8859-1) + (message-this-is-news iso-8859-1) (message-this-is-mail nil) ) "Alist of regexps (to match group names) and default charsets to be unencoded when posting." @@ -240,13 +241,13 @@ Thank you for your help in stamping out bugs. elem) (catch 'found (while (setq elem (pop alist)) - (when (or (and (stringp (car alist)) - (string-match (car alist) group)) - (and (gnus-functionp (car alist)) - (funcall (car alist) group)) - (and (symbolp (car alist)) - (symbol-value (car alist)))) - (throw 'found (cadr alist))))))) + (when (or (and (stringp (car elem)) + (string-match (car elem) group)) + (and (gnus-functionp (car elem)) + (funcall (car elem) group)) + (and (symbolp (car elem)) + (symbol-value (car elem)))) + (throw 'found (cadr elem))))))) (defun gnus-inews-add-send-actions (winconf buffer article) (make-local-hook 'message-sent-hook) diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el index 89780a6..2705795 100644 --- a/lisp/gnus-range.el +++ b/lisp/gnus-range.el @@ -233,7 +233,7 @@ RANGE1. The returned range is always a list." (setq range1 (if (listp (cdr range1)) range1 (list range1)) range2 (if (listp (cdr range2)) range2 (list range2)) r1 (car range1) - r2 (car range2) + r2 (car range2) r1_min (if (consp r1) (car r1) r1) r1_max (if (consp r1) (cdr r1) r1) r2_min (if (consp r2) (car r2) r2) diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index a091834..af6d285 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -173,7 +173,7 @@ article number, then stay on current line." (if (not pos) (gnus-error 2 "No such line: %s" arg) (goto-char pos)))) - + (defun gnus-pick-article (&optional arg) "Pick the article on the current line. If ARG, pick the article on that line instead." @@ -192,7 +192,7 @@ If ARG, pick the article/thread on that line instead." (if gnus-thread-hide-subtree (gnus-uu-mark-thread) (gnus-summary-mark-as-processable 1))) - + (defun gnus-pick-unmark-article-or-thread (&optional arg) "If gnus-thread-hide-subtree is t, then unmark the thread on current line. Otherwise unmark the article on current line. @@ -203,7 +203,7 @@ If ARG, unmark thread/article on that line instead." (if gnus-thread-hide-subtree (gnus-uu-unmark-thread) (gnus-summary-unmark-as-processable 1))) - + (defun gnus-pick-mouse-pick (e) (interactive "e") (mouse-set-point e) @@ -483,7 +483,7 @@ Two predefined functions are available: (interactive "P") (let ((buf (current-buffer)) win) - (set-buffer gnus-article-buffer) + (set-buffer gnus-article-buffer) (gnus-article-read-summary-keys arg nil t) (when (setq win (get-buffer-window buf)) (select-window win) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 829bdd7..90de3ec 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -387,7 +387,7 @@ If nil, the user will be asked for a duration." (defcustom gnus-score-thread-simplify nil "If non-nil, subjects will simplified as in threading." :group 'gnus-score-various - :type 'boolean) + :type 'boolean) @@ -672,7 +672,7 @@ used as score." current-score-file) (t (gnus-score-file-name "all")))))) - + (gnus-summary-score-entry (nth 1 entry) ; Header match ; Match @@ -682,7 +682,7 @@ used as score." nil temporary) (not (nth 3 entry)) ; Prompt - nil ; not silent + nil ; not silent extra) ; non-standard overview. (when (eq symp 'a) @@ -1029,7 +1029,7 @@ EXTRA is the possible non-standard header." (let ((buffer-read-only nil)) ;; Set score. (gnus-summary-update-mark - (if (= n (or gnus-summary-default-score 0)) ? + (if (= n (or gnus-summary-default-score 0)) ? ;Whitespace (if (< n (or gnus-summary-default-score 0)) gnus-score-below-mark gnus-score-over-mark)) 'score)) @@ -2299,7 +2299,7 @@ EXTRA is the possible non-standard header." (let ((ignored (append gnus-ignored-adaptive-words (if gnus-adaptive-word-no-group-words (message-tokenize-header - (gnus-group-real-name + (gnus-group-real-name gnus-newsgroup-name) ".")) gnus-default-ignored-adaptive-words))) @@ -2553,6 +2553,7 @@ GROUP using BNews sys file syntax." (klen (length kill-dir)) (score-regexp (gnus-score-file-regexp)) (trans (cdr (assq ?: nnheader-file-name-translation-alist))) + (group-trans (nnheader-translate-file-chars group t)) ofiles not-match regexp) (save-excursion (set-buffer (gnus-get-buffer-create "*gnus score files*")) @@ -2599,16 +2600,18 @@ GROUP using BNews sys file syntax." (if (looking-at "not.") (progn (setq not-match t) - (setq regexp (concat "^" (buffer-substring 5 (point-max)) "$"))) + (setq regexp + (concat "^" (buffer-substring 5 (point-max)) "$"))) (setq regexp (concat "^" (buffer-substring 1 (point-max)) "$")) (setq not-match nil)) ;; Finally - if this resulting regexp matches the group name, ;; we add this score file to the list of score files ;; applicable to this group. (when (or (and not-match - (not (string-match regexp group))) - (and (not not-match) - (string-match regexp group))) + (ignore-errors + (not (string-match regexp group-trans)))) + (and (not not-match) + (ignore-errors (string-match regexp group-trans)))) (push (car sfiles) ofiles))) (setq sfiles (cdr sfiles))) (kill-buffer (current-buffer)) @@ -2902,7 +2905,7 @@ If ADAPT, return the home adaptive file instead." n times) (while (natnump (decf n)) (setq score (funcall gnus-decay-score-function score))) - (setcdr kill (cons score + (setcdr kill (cons score (cdr (cdr kill))))))))) ;; Return whether this score file needs to be saved. By Je-haysuss! updated)) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index 8ff13ff..ca97b05 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -253,7 +253,7 @@ by `gnus-xmas-redefine'." (` (, val)))) (defun gnus-balloon-face-function (form type) - `(gnus-put-text-property + `(gnus-put-text-property (point) (progn ,@form (point)) 'balloon-help ,(intern (format "gnus-balloon-face-%d" type)))) @@ -329,7 +329,7 @@ by `gnus-xmas-redefine'." (if (or (= delim ?\() (= delim ?\{) (= delim ?\<)) - (replace-match (concat "\"(" + (replace-match (concat "\"(" (cond ((= delim ?\() "mouse") ((= delim ?\{) "face") (t "balloon")) @@ -562,7 +562,7 @@ If PROPS, insert the result." (symbol-value (intern (format "gnus-%s-line-format" type))) (symbol-value (intern (format "gnus-%s-line-format-alist" type))) insertable))) - + (provide 'gnus-spec) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 7eb4982..34c8e98 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -654,7 +654,7 @@ buffer. (error "Couldn't enter %s" group)) (unless (gnus-group-read-group nil no-article group) (error "Couldn't enter %s" group))))) - + (defun gnus-browse-select-group () "Select the current group." (interactive) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index dc2f3ed..6ef943a 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1251,7 +1251,7 @@ for new groups, and subscribe the new groups as zombies." (if active (- (1+ (cdr active)) (car active)) t)) ;; Shorten the select method if possible, if we need to ;; store it at all (native groups). - (let ((method (gnus-method-simplify + (let ((method (gnus-method-simplify (or gnus-override-subscribe-method (gnus-group-method group))))) (if method @@ -1810,7 +1810,7 @@ newsgroup." ;; Let the Gnus agent save the active file. (when (and gnus-agent real-active) (gnus-agent-save-groups method)) - + (goto-char (point-min)) ;; We split this into to separate loops, one with the prefix ;; and one without to speed the reading up somewhat. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index ee75685..36be196 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -265,8 +265,8 @@ If this variable is `best', select the highest-scored unread article in the group. If t, select the first unread article. This variable can also be a function to place point on a likely -subject line. Useful values include `gnus-summary-first-unread-subject', -`gnus-summary-first-unread-article' and +subject line. Useful values include `gnus-summary-first-unread-subject', +`gnus-summary-first-unread-article' and `gnus-summary-best-unread-article'. If you want to prevent automatic selection of the first unread article @@ -361,7 +361,7 @@ It uses the same syntax as the `gnus-split-methods' variable." (cons :value ("" "") regexp (repeat string)) (sexp :value nil)))) -(defcustom gnus-unread-mark ? +(defcustom gnus-unread-mark ? ;Whitespace "*Mark used for unread articles." :group 'gnus-summary-marks :type 'character) @@ -476,7 +476,7 @@ It uses the same syntax as the `gnus-split-methods' variable." :group 'gnus-summary-marks :type 'character) -(defcustom gnus-empty-thread-mark ? +(defcustom gnus-empty-thread-mark ? ;Whitespace "*There is no thread under the article." :group 'gnus-summary-marks :type 'character) @@ -810,7 +810,7 @@ which it may alter in any way.") :group 'gnus-summary :type 'regexp) -(defcustom gnus-group-charset-alist +(defcustom gnus-group-charset-alist '(("^hk\\>\\|^tw\\>\\|\\" cn-big5) ("^cn\\>\\|\\" cn-gb-2312) ("^fj\\>\\|^japan\\>" iso-2022-jp-2) @@ -1286,7 +1286,7 @@ increase the score of each group you read." "L" gnus-summary-lower-score "\M-i" gnus-symbolic-argument "h" gnus-summary-select-article-buffer - + "V" gnus-summary-score-map "X" gnus-uu-extract-map "S" gnus-summary-send-map) @@ -2488,7 +2488,7 @@ marks of articles." (if (or (null gnus-summary-default-score) (<= (abs (- gnus-tmp-score gnus-summary-default-score)) gnus-summary-zcore-fuzz)) - ? + ? ;Whitespace (if (< gnus-tmp-score gnus-summary-default-score) gnus-score-below-mark gnus-score-over-mark))) (gnus-tmp-replied @@ -2553,7 +2553,7 @@ marks of articles." (if (or (null gnus-summary-default-score) (<= (abs (- score gnus-summary-default-score)) gnus-summary-zcore-fuzz)) - ? + ? ;Whitespace (if (< score gnus-summary-default-score) gnus-score-below-mark gnus-score-over-mark)) 'score)) @@ -3853,7 +3853,7 @@ or a straight list of headers." (if (or (null gnus-summary-default-score) (<= (abs (- gnus-tmp-score gnus-summary-default-score)) gnus-summary-zcore-fuzz)) - ? + ? ;Whitespace (if (< gnus-tmp-score gnus-summary-default-score) gnus-score-below-mark gnus-score-over-mark)) gnus-tmp-replied @@ -4243,7 +4243,7 @@ If SELECT-ARTICLES, only select those articles from GROUP." (setq arts (cdr arts))) (setq list (cdr all)))) - (when (gnus-check-backend-function 'request-set-mark + (when (gnus-check-backend-function 'request-set-mark gnus-newsgroup-name) ;; score & bookmark are not proper flags (they are cons cells) ;; cache is a internal gnus flag @@ -4255,7 +4255,7 @@ If SELECT-ARTICLES, only select those articles from GROUP." (push (list add 'add (list (cdr type))) delta-marks)) (if del (push (list del 'del (list (cdr type))) delta-marks))))) - + (push (cons (cdr type) (if (memq (cdr type) uncompressed) list (gnus-compress-sequence @@ -5290,7 +5290,7 @@ gnus-exit-group-hook is called with no arguments if that value is non-nil." (gnus-y-or-n-p "Discard changes to this group and exit? ")) (gnus-async-halt-prefetch) (mapcar 'funcall - (delq 'gnus-summary-expire-articles + (delq 'gnus-summary-expire-articles (copy-list gnus-summary-prepare-exit-hook))) ;; If we have several article buffers, we kill them at exit. (unless gnus-single-article-buffer @@ -7507,7 +7507,7 @@ groups." ;; Replace the article. (let ((buf (current-buffer))) (with-temp-buffer - (insert-buffer buf) + (insert-buffer-substring buf) (if (and (not read-only) (not (gnus-request-replace-article (cdr gnus-article-current) (car gnus-article-current) @@ -9181,7 +9181,7 @@ save those articles instead." (setq gnus-newsgroup-charset (or (and gnus-newsgroup-name (or (gnus-group-find-parameter gnus-newsgroup-name 'charset) - (let ((alist gnus-group-charset-alist) + (let ((alist gnus-group-charset-alist) elem (charset nil)) (while (setq elem (pop alist)) (when (and name @@ -9190,13 +9190,13 @@ save those articles instead." charset (cadr elem)))) charset))) gnus-default-charset)))) - + ;;; ;;; Mime Commands ;;; (defun gnus-summary-display-buttonized (&optional show-all-parts) - "Display the current article buffer fully MIME-buttonized. + "Display the current article buffer fully MIME-buttonized. If SHOW-ALL-PARTS (the prefix) is non-nil, all multipart/* parts are treated as multipart/mixed." (interactive "P") @@ -9234,7 +9234,7 @@ treated as multipart/mixed." (let ((gnus-unbuttonized-mime-types nil)) (gnus-summary-show-article)) (gnus-summary-show-article))) - + (gnus-ems-redefine) (provide 'gnus-sum) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index be296df..692b896 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -416,7 +416,7 @@ articles in the topic and its subtopics." (entries (gnus-topic-find-groups (car type) list-level (or all - (cdr (assq 'visible + (cdr (assq 'visible (gnus-topic-hierarchical-parameters (car type))))) lowest)) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index f8ed901..a02cbda 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -601,7 +601,7 @@ Bind `print-quoted' and `print-readably' to t while printing." (gnus-put-text-property b (setq b (next-single-property-change b 'gnus-face nil end)) prop val))))) - + ;;; Protected and atomic operations. dmoore@ucsd.edu 21.11.1996 ;;; The primary idea here is to try to protect internal datastructures ;;; from becoming corrupted when the user hits C-g, or if a hook or @@ -814,7 +814,7 @@ ARG is passed to the first function." (unwind-protect (apply 'run-hooks funcs) (set-buffer buf)))) - + ;;; ;;; .netrc and .authinforc parsing ;;; @@ -958,7 +958,7 @@ ARG is passed to the first function." (defun gnus-annotation-in-region-p (b e) (if (= b e) - (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) + (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) (text-property-any b e 'gnus-undeletable t))) (provide 'gnus-util) diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index ad81f01..b73fbb8 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -469,7 +469,7 @@ call it with the value of the `gnus-data' text property." (fset 'gnus-region-active-p 'region-active-p) (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p) (fset 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu) - + (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add) (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add) (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add) @@ -807,24 +807,25 @@ XEmacs compatibility workaround." "Display any XFace headers in the current article." (save-excursion (let ((xface-glyph - (cond ((featurep 'xface) - (make-glyph (vector 'xface :data - (concat "X-Face: " - (buffer-substring beg end))))) - ((featurep 'xpm) - (let ((cur (current-buffer))) - (save-excursion - (gnus-set-work-buffer) - (insert (format "%s" (buffer-substring beg end cur))) - (gnus-xmas-call-region "uncompface") - (goto-char (point-min)) - (insert "/* Width=48, Height=48 */\n") - (gnus-xmas-call-region "icontopbm") - (gnus-xmas-call-region "ppmtoxpm") - (make-glyph - (vector 'xpm :data (buffer-string)))))) - (t - (make-glyph [nothing])))) + (cond + ((featurep 'xface) + (make-glyph (vector 'xface :data + (concat "X-Face: " + (buffer-substring beg end))))) + ((featurep 'xpm) + (let ((cur (current-buffer))) + (save-excursion + (gnus-set-work-buffer) + (insert (format "%s" (buffer-substring beg end cur))) + (gnus-xmas-call-region "uncompface") + (goto-char (point-min)) + (insert "/* Width=48, Height=48 */\n") + (gnus-xmas-call-region "icontopbm") + (gnus-xmas-call-region "ppmtoxpm") + (make-glyph + (vector 'xpm :data (buffer-string)))))) + (t + (make-glyph [nothing])))) (ext (make-extent (progn (goto-char (point-min)) (re-search-forward "^From:" nil t) @@ -834,26 +835,12 @@ XEmacs compatibility workaround." (set-extent-begin-glyph ext xface-glyph) (set-extent-property ext 'duplicable t)))) -;;(defvar gnus-xmas-pointer-glyph -;; (progn -;; (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory -;; "gnus")) -;; (let ((file-xpm (expand-file-name "gnus-pointer.xpm" -;; gnus-xmas-glyph-directory)) -;; (file-xbm (expand-file-name "gnus-pointer.xbm" -;; gnus-xmas-glyph-directory))) -;; (make-pointer-glyph -;; (list (vector 'xpm ':file file-xpm) -;; (vector 'xbm ':file file-xbm)))))) - (defvar gnus-xmas-modeline-left-extent (let ((ext (copy-extent modeline-buffer-id-left-extent))) -; (set-extent-property ext 'pointer gnus-xmas-pointer-glyph) ext)) (defvar gnus-xmas-modeline-right-extent (let ((ext (copy-extent modeline-buffer-id-right-extent))) -; (set-extent-property ext 'pointer gnus-xmas-pointer-glyph) ext)) (defvar gnus-xmas-modeline-glyph @@ -870,7 +857,7 @@ XEmacs compatibility workaround." `[xpm :file ,file-xpm]) ((featurep 'xbm) ;; Then a not-so-nifty XBM - [xbm :file ,file-xbm]) + `[xbm :file ,file-xbm]) ;; Then the simple string (t [string :data "Gnus:"]))))) (set-glyph-face glyph 'modeline-buffer-id) @@ -902,7 +889,7 @@ XEmacs compatibility workaround." (defun gnus-xmas-annotation-in-region-p (b e) (or (map-extents (lambda (e u) t) nil b e nil nil 'mm t) (if (= b e) - (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) + (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) (text-property-any b e 'gnus-undeletable t)))) (defun gnus-xmas-mime-button-menu (event) diff --git a/lisp/gnus.el b/lisp/gnus.el index 4e4cca9..44d4b43 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -264,10 +264,10 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "T-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.10.054" +(defconst gnus-version-number "6.10.055" "Version number for this version of gnus.") -(defconst gnus-original-version-number "0.71" +(defconst gnus-original-version-number "0.72" "Version number for this version of Gnus.") (defconst gnus-original-product-name "Pterodactyl Gnus" @@ -1783,6 +1783,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") ("gnus-picon" :interactive t gnus-article-display-picons gnus-group-display-picons gnus-picons-article-display-x-face gnus-picons-display-x-face) + ("gnus-picon" gnus-picons-buffer-name) ("gnus-gl" bbb-login bbb-logout bbb-grouplens-group-p gnus-grouplens-mode) ("smiley" :interactive t gnus-smiley-display) @@ -2532,7 +2533,7 @@ You should probably use `gnus-find-method-for-group' instead." (let ((methods gnus-secondary-select-methods) (gmethod (gnus-server-get-method nil method))) (while (and methods - (not (gnus-method-equal + (not (gnus-method-equal (gnus-server-get-method nil (car methods)) gmethod))) (setq methods (cdr methods))) diff --git a/lisp/lpath.el b/lisp/lpath.el index ee0a6cc..d63ab4b 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -31,7 +31,7 @@ run-with-idle-timer mouse-minibuffer-check window-edges event-click-count track-mouse read-event mouse-movement-p event-end mouse-scroll-subr overlay-lists delete-overlay - set-face-stipple mail-abbrevs-setup + set-face-stipple mail-abbrevs-setup make-char-table set-char-table-range font-create-object x-color-values widget-make-intangible error-message-string w3-form-encode-xwfu gnus-mule-get-coding-system @@ -44,6 +44,7 @@ coding-system-get w3-region rmail-summary-exists rmail-select-summary rmail-update-summary url-retrieve + temp-directory )) (maybe-bind '(global-face-data mark-active transient-mark-mode mouse-selection-click-count @@ -74,7 +75,7 @@ widget-make-intangible glyphp make-glyph set-glyph-image set-glyph-property event-glyph glyph-property event-point device-on-window-system-p make-gui-button Info-goto-node - pp-to-string color-name + pp-to-string color-name gnus-mule-get-coding-system decode-coding-string mail-aliases-setup url-view-url w3-prepare-buffer diff --git a/lisp/md5.el b/lisp/md5.el index 3fabf29..91a3041 100644 --- a/lisp/md5.el +++ b/lisp/md5.el @@ -11,7 +11,7 @@ ;; This is a direct translation into Emacs LISP of the reference C ;; implementation of the MD5 Message-Digest Algorithm written by RSA ;; Data Security, Inc. -;; +;; ;; The algorithm takes a message (that is, a string of bytes) and ;; computes a 16-byte checksum or "digest" for the message. This digest ;; is supposed to be cryptographically strong in the sense that if you @@ -20,7 +20,7 @@ ;; space of messages. However, the robustness of the algorithm has not ;; been proven, and a similar algorithm (MD4) was shown to be unsound, ;; so treat with caution! -;; +;; ;; The C algorithm uses 32-bit integers; because GNU Emacs ;; implementations provide 28-bit integers (with 24-bit integers on ;; versions prior to 19.29), the code represents a 32-bit integer as the @@ -33,12 +33,12 @@ ;; To compute the MD5 Message Digest for a message M (represented as a ;; string or as a vector of bytes), call -;; +;; ;; (md5-encode M) -;; +;; ;; which returns the message digest as a vector of 16 bytes. If you ;; need to supply the message in pieces M1, M2, ... Mn, then call -;; +;; ;; (md5-init) ;; (md5-update M1) ;; (md5-update M2) @@ -50,17 +50,17 @@ ;; Copyright (C) 1995 by Gareth Rees ;; Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm -;; +;; ;; md5.el is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation; either version 2, or (at your option) any ;; later version. -;; +;; ;; md5.el is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. -;; +;; ;; The original copyright notice is given below, as required by the ;; licence for the original code. This code is distributed under *both* ;; RSA's original licence and the GNU General Public Licence. (There @@ -155,9 +155,9 @@ Returns a vector of 16 bytes containing the message digest." ;; for rounds 1, 2, 3 and 4 respectively. Each function follows this ;; pattern of computation (where ROTATE(x,y) means rotate 32-bit value x ;; by y bits to the left): -;; +;; ;; FF(a,b,c,d,x,s,ac) = ROTATE(a + F(b,c,d) + x + ac,s) + b -;; +;; ;; so we use the macro `md5-make-step' to construct each one. The ;; helper functions F, G, H and I operate on 16-bit numbers; the full ;; operation splits its inputs, operates on the halves separately and diff --git a/lisp/message.el b/lisp/message.el index 08564c9..e254289 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -389,7 +389,7 @@ If t, use `message-user-organization-file'." :group 'message-forwarding :type 'regexp) -(defcustom message-make-forward-subject-function +(defcustom message-make-forward-subject-function 'message-forward-subject-author-subject "*A list of functions that are called to generate a subject header for forwarded messages. The subject generated by the previous function is passed into each @@ -809,6 +809,9 @@ Valid valued are `unique' and `unsent'." :type '(choice (const :tag "unique" unique) (const :tag "unsent" unsent))) +(defcustom message-default-charset nil + "Default charset used in non-MULE XEmacsen.") + ;;; Internal variables. ;;; Well, not really internal. @@ -1032,8 +1035,8 @@ The cdr of ech entry is a function for applying the face to a region.") (const :tag "always" t) (const :tag "ask" ask))) -(defvar message-draft-coding-system - (cond +(defvar message-draft-coding-system + (cond ((not (fboundp 'find-coding-system)) nil) ((find-coding-system 'emacs-mule) 'emacs-mule) ((find-coding-system 'escape-quoted) 'escape-quoted) @@ -1568,8 +1571,8 @@ C-c C-r message-caesar-buffer-body (rot13 the message body)." (interactive) (kill-all-local-variables) (set (make-local-variable 'message-reply-buffer) nil) - (make-local-variable 'message-send-actions) - (make-local-variable 'message-exit-actions) + (make-local-variable 'message-send-actions) + (make-local-variable 'message-exit-actions) (make-local-variable 'message-kill-actions) (make-local-variable 'message-postpone-actions) (make-local-variable 'message-draft-article) @@ -3932,7 +3935,7 @@ You should normally obey the Mail-Copies-To: header. sends a copy of your response to the author."))) (setq mct (or mrt from))) ((and (eq message-use-mail-copies-to 'ask) - (not + (not (message-y-or-n-p (concat "Obey Mail-Copies-To: " mct " ? ") t "\ You should normally obey the Mail-Copies-To: header. @@ -4095,7 +4098,7 @@ You should normally obey the Mail-Copies-To: header. sends a copy of your response to the author."))) (setq mct (or mrt from))) ((and (eq message-use-mail-copies-to 'ask) - (not + (not (message-y-or-n-p (concat "Obey Mail-Copies-To: " mct " ? ") t "\ You should normally obey the Mail-Copies-To: header. @@ -4330,7 +4333,7 @@ header line with the old Message-ID." (replace-match "")) (buffer-string))) - + ;;; Forwarding messages. (defun message-forward-subject-author-subject (subject) @@ -4848,7 +4851,9 @@ TYPE is the MIME type to use." type (prin1-to-string file)))) (defun message-encode-message-body () - (let (lines multipart-p content-type-p) + (let ((mail-parse-charset message-default-charset) + (case-fold-search t) + lines multipart-p content-type-p) (message-goto-body) (save-restriction (narrow-to-region (point) (point-max)) diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index a67b60b..0403bb6 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -69,7 +69,7 @@ If no encoding was done, nil is returned." charsets) ;; We encode. (t - (let ((mime-charset + (let ((mime-charset (mm-mime-charset (car charsets) (point-min) (point-max))) start) (when (or t @@ -160,7 +160,7 @@ The characters in CHARSET should then be decoded." (let (mule-charset) (when (and charset (setq mule-charset (mm-charset-to-coding-system charset)) - ;; buffer-file-coding-system + ;; buffer-file-coding-system ;Article buffer is nil coding system ;in XEmacs enable-multibyte-characters diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 6265e3a..a034058 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -100,7 +100,7 @@ ("message/delivery-status" . inline))) (defvar mm-user-automatic-display - '("text/plain" "text/enriched" "text/richtext" "text/html" + '("text/plain" "text/enriched" "text/richtext" "text/html" "image/.*" "message/delivery-status" "multipart/.*")) (defvar mm-user-automatic-external-display nil @@ -195,8 +195,8 @@ (goto-char (point-min)) (let* ((boundary (concat "\n--" (mail-content-type-get ctl 'boundary))) (close-delimiter (concat (regexp-quote boundary) "--[ \t]*$")) - start parts - (end (save-excursion + start parts + (end (save-excursion (goto-char (point-max)) (if (re-search-backward close-delimiter nil t) (match-beginning 0) @@ -290,7 +290,8 @@ external if displayed external." (if method (funcall method) (mm-save-part handle)) - (unless non-viewer + (when (and (not non-viewer) + method) (mm-handle-set-undisplayer handle mm))))) ;; The function is a string to be executed. (mm-insert-part handle) @@ -454,7 +455,7 @@ This overrides entries in the mailcap file." (defun mm-handle-displayed-p (handle) "Say whether HANDLE is displayed or not." (mm-handle-undisplayer handle)) - + (defun mm-quote-arg (arg) "Return a version of ARG that is safe to evaluate in a shell." (let ((pos 0) new-pos accum) @@ -489,7 +490,7 @@ This overrides entries in the mailcap file." (car (mm-handle-type handle))) (let ((temp (current-buffer))) (set-buffer cur) - (insert-buffer temp)))))) + (insert-buffer-substring temp)))))) (defvar mm-default-directory nil) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index aa22040..7f99bd2 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -26,17 +26,17 @@ (defvar mm-running-xemacs (string-match "XEmacs" emacs-version)) -(defvar mm-running-ntemacs - (and (not mm-running-xemacs) +(defvar mm-running-ntemacs + (and (not mm-running-xemacs) (string-match "nt" system-configuration))) -(defvar mm-binary-coding-system +(defvar mm-binary-coding-system (if mm-running-xemacs 'binary 'no-conversion) - "100% binary coding system.") + "100% binary coding system.") -(defvar mm-text-coding-system - (cond +(defvar mm-text-coding-system + (cond ((not (fboundp 'coding-system-p)) nil) (mm-running-xemacs ;; XEmacs (and (coding-system-p 'no-conversion) 'no-conversion)) @@ -118,20 +118,12 @@ (or mm-coding-system-list (setq mm-coding-system-list (mm-coding-system-list)))) -(defvar mm-charset-coding-system-alist - (let ((rest - '((gb2312 . cn-gb-2312) - (iso-2022-jp-2 . iso-2022-7bit-ss2) - (x-ctext . ctext))) - (systems (mm-get-coding-system-list)) - dest) - (while rest - (let ((pair (car rest))) - (unless (memq (car pair) systems) - (setq dest (cons pair dest)))) - (setq rest (cdr rest))) - dest) - "Charset/coding system alist.") +(defvar mm-charset-synonym-alist + '((big5 . cn-big5) + (gb2312 . cn-gb-2312) + (iso-2022-jp-2 . iso-2022-7bit-ss2) + (x-ctext . ctext)) + "A mapping from invalid charset names to the real charset names.") ;;; Internal variables: @@ -156,7 +148,7 @@ used as the line break code type of the coding system." (when (stringp charset) (setq charset (intern (downcase charset)))) (setq charset - (or (cdr (assq charset mm-charset-coding-system-alist)) + (or (cdr (assq charset mm-charset-synonym-alist)) charset)) (when lbt (setq charset (intern (format "%s-%s" charset lbt)))) @@ -253,8 +245,7 @@ See also `with-temp-file' and `with-output-to-string'." (skip-chars-forward "\0-\177") (if (eobp) '(ascii) - ;;;!!!bogus - (list 'ascii 'latin-iso8859-1))))) + (delq nil (list 'ascii mail-parse-charset)))))) (t ;; We are in a unibyte buffer, so we futz around a bit. (save-excursion @@ -270,7 +261,11 @@ See also `with-temp-file' and `with-output-to-string'." (defun mm-read-charset (prompt) "Return a charset." - (completing-read prompt mm-mime-mule-charset-alist nil t)) + (completing-read + prompt + (mapcar (lambda (e) (list (symbol-name (car e)))) + mm-mime-mule-charset-alist) + nil t)) (provide 'mm-util) diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index 601254f..edc6361 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -2,9 +2,9 @@ ;; Copyright (c) 1998 by Shenghuo Zhu ;; Author: Shenghuo Zhu -;; $Revision: 1.1.2.8 $ +;; $Revision: 1.1.2.9 $ ;; Keywords: news postscript uudecode binhex shar - + ;; This file is not part of GNU Emacs, but the same permissions ;; apply. ;; @@ -61,7 +61,7 @@ (defconst mm-uu-shar-begin-line "^#! */bin/sh") (defconst mm-uu-shar-end-line "^exit 0") -(defvar mm-uu-begin-line +(defvar mm-uu-begin-line (concat mm-uu-postscript-begin-line "\\|" mm-uu-uu-begin-line "\\|" mm-uu-binhex-begin-line "\\|" @@ -78,7 +78,7 @@ This can be either \"inline\" or \"attachment\".") (defun mm-uu-dissect () "Dissect the current buffer and return a list of uu handles." - (let (ct ctl cte charset text-start start-char end-char + (let (ct ctl cte charset text-start start-char end-char type file-name end-line result text-plain-type) (save-excursion (save-restriction @@ -89,79 +89,79 @@ This can be either \"inline\" or \"attachment\".") ctl (condition-case () (mail-header-parse-content-type ct) (error nil)) charset (and ctl (mail-content-type-get ctl 'charset))) - (if (stringp cte) + (if (stringp cte) (setq cte (intern (downcase (mail-header-remove-whitespace (mail-header-remove-comments cte))))))) (goto-char (point-max))) (forward-line) (setq text-start (point) - text-plain-type (cons "text/plain" - (if charset + text-plain-type (cons "text/plain" + (if charset (list (cons 'charset charset))))) (while (re-search-forward mm-uu-begin-line nil t) (beginning-of-line) (setq start-char (point)) (forward-line) ;; in case of failure - (setq type (cdr (assq (aref (match-string 0) 0) + (setq type (cdr (assq (aref (match-string 0) 0) mm-uu-identifier-alist))) - (setq file-name + (setq file-name (if (eq type 'uu) (and (match-string 1) (let ((nnheader-file-name-translation-alist '((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_)))) (nnheader-translate-file-chars (match-string 1)))))) - (setq end-line (symbol-value - (intern (concat "mm-uu-" (symbol-name type) + (setq end-line (symbol-value + (intern (concat "mm-uu-" (symbol-name type) "-end-line")))) (when (re-search-forward end-line nil t) (forward-line) (setq end-char (point)) (when (or (not (eq type 'binhex)) - (setq file-name + (setq file-name (condition-case nil (binhex-decode-region start-char end-char t) (error nil)))) (if (> start-char text-start) (push - (mm-make-handle (mm-uu-copy-to-buffer text-start start-char) - text-plain-type cte) + (mm-make-handle (mm-uu-copy-to-buffer text-start start-char) + text-plain-type cte) result)) - (push + (push (cond ((eq type 'postscript) - (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) + (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) '("application/postscript"))) ((eq type 'uu) - (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) + (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) (list (or (and file-name - (string-match "\\.[^\\.]+$" file-name) - (mailcap-extension-to-mime + (string-match "\\.[^\\.]+$" file-name) + (mailcap-extension-to-mime (match-string 0 file-name))) "application/octet-stream")) - 'x-uuencode nil + 'x-uuencode nil (if (and file-name (not (equal file-name ""))) (list mm-dissect-disposition (cons 'filename file-name))))) ((eq type 'binhex) - (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) + (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) (list (or (and file-name - (string-match "\\.[^\\.]+$" file-name) - (mailcap-extension-to-mime + (string-match "\\.[^\\.]+$" file-name) + (mailcap-extension-to-mime (match-string 0 file-name))) "application/octet-stream")) - 'x-binhex nil + 'x-binhex nil (if (and file-name (not (equal file-name ""))) (list mm-dissect-disposition (cons 'filename file-name))))) ((eq type 'shar) - (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) - '("application/x-shar")))) + (mm-make-handle (mm-uu-copy-to-buffer start-char end-char) + '("application/x-shar")))) result) (setq text-start end-char)))) (when result (if (> (point-max) (1+ text-start)) (push - (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max)) - text-plain-type cte) + (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max)) + text-plain-type cte) result)) (setq result (cons "multipart/mixed" (nreverse result)))) result))) @@ -176,11 +176,11 @@ This can be either \"inline\" or \"attachment\".") (forward-line) (let (type end-line result) (while (and (not result) (re-search-forward mm-uu-begin-line nil t)) - (forward-line) - (setq type (cdr (assq (aref (match-string 0) 0) + (forward-line) + (setq type (cdr (assq (aref (match-string 0) 0) mm-uu-identifier-alist))) - (setq end-line (symbol-value - (intern (concat "mm-uu-" (symbol-name type) + (setq end-line (symbol-value + (intern (concat "mm-uu-" (symbol-name type) "-end-line")))) (if (re-search-forward end-line nil t) (setq result t))) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index cde7ba6..c7cc4dc 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -112,7 +112,7 @@ (let (buffer-read-only) (delete-region ,(set-marker (make-marker) b) ,(set-marker (make-marker) (point)))))))) - + (defun mm-inline-audio (handle) (message "Not implemented")) diff --git a/lisp/mml.el b/lisp/mml.el index 100a40d..8bb6a85 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -52,7 +52,7 @@ (set-syntax-table mml-syntax-table) (mml-parse-1)) (set-syntax-table table)))) - + (defun mml-parse-1 () "Parse the current buffer as an MML document." (let (struct tag point contents charsets warn) @@ -346,7 +346,7 @@ value type) (while (setq type (pop types)) (when (setq value (cdr (assq type cont))) - ;; Strip directory component from the filename parameter. + ;; Strip directory component from the filename parameter. (when (eq type 'filename) (setq value (file-name-nondirectory value))) (setq string (concat string ";\n " diff --git a/lisp/nndb.el b/lisp/nndb.el index 9cbf7be..8b71f5d 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -83,7 +83,7 @@ "If t, the expiry date for a given article will be set to the time it was marked as expireable; otherwise the date will be the time the article was posted to nndb") - + ;; Variables copied from nntp (defvoo nndb-server-opened-hook '(nntp-send-authinfo-from-file) @@ -133,7 +133,7 @@ article was posted to nndb") (push art rest))) rest)) - + ;; (deffoo nndb-request-type (group &optional article) nndb-article-type) @@ -181,12 +181,12 @@ article was posted to nndb") (setq num-delete (1+ num-delete))) (push art rest)))) (if (> (length delete-list) 0) - (progn + (progn (nnheader-message 5 "Deleting %s article(s) from %s" (int-to-string num-delete) group) (nntp-send-command "^[23].*\n" "X-DELETE" delete-list)) ) - + (nnheader-message 5 "") (nconc rest articles))) @@ -208,7 +208,7 @@ article was posted to nndb") "Let the nndb backend expire articles" (let (days art-string delete-list (num-delete 0)) (nntp-possibly-change-group group server) - + ;; first calculate the wait period in days (setq days (or (and nnmail-expiry-wait-function (funcall nnmail-expiry-wait-function group)) @@ -221,12 +221,12 @@ article was posted to nndb") (setq days -1)) ((eq days 'immediate) (setq days 0))) - + ;; build article string (setq art-string (concat days " " (nndb-build-article-string articles))) (nntp-send-command "^\.\r?\n\\|^[345].*\n" "X-EXPIRE" art-string) - + (setq delete-list (nndb-get-remote-expire-response)) (setq num-delete (length delete-list)) (if (> num-delete 0) @@ -253,7 +253,7 @@ Optional LAST is ignored." ;; which it will be for nndb, which is all that matters anyway (let ((new-group (nth 1 accept-form)) result) (nntp-possibly-change-group group server) - + ;; use the move command for nndb-to-nndb moves (if (string-match "^nndb" new-group) (let ((new-group-name (gnus-group-real-name new-group))) @@ -275,7 +275,7 @@ Optional LAST is ignored." t)) result) ))) - + (deffoo nndb-request-accept-article (group server &optional last) "The article in the current buffer is put into GROUP." (nntp-possibly-change-group group server) @@ -283,7 +283,7 @@ Optional LAST is ignored." (when (nntp-send-command "^[23].*\r?\n" "ACCEPT" group) (nnheader-insert "") (nntp-send-buffer "^[23].*\n")) - + (set-buffer nntp-server-buffer) (setq msg (buffer-substring (point-min) (point-max))) (or (string-match "^\\([0-9]+\\)" msg) @@ -293,7 +293,7 @@ Optional LAST is ignored." (list art))) (deffoo nndb-request-replace-article (article group buffer) - "ARTICLE is the number of the article in GROUP to be replaced + "ARTICLE is the number of the article in GROUP to be replaced with the contents of the BUFFER." (set-buffer buffer) (when (nntp-send-command "^[23].*\r?\n" "X-REPLACE" (int-to-string article)) @@ -320,6 +320,3 @@ with the contents of the BUFFER." (nntp)) (provide 'nndb) - - - diff --git a/lisp/nndoc.el b/lisp/nndoc.el index cc3383e..907edca 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -47,7 +47,7 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (defvoo nndoc-open-document-hook 'nnheader-ms-strip-cr "Hook run after opening a document. The default function removes all trailing carriage returns -from the document.") +from the document.") (defvar nndoc-type-alist `((mmdf diff --git a/lisp/nndraft.el b/lisp/nndraft.el index 6d267dd..33e0a66 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -151,7 +151,7 @@ (buf (current-buffer)) article file) (with-temp-buffer - (insert-buffer buf) + (insert-buffer-substring buf) (setq article (nndraft-request-accept-article group (nnoo-current-server 'nndraft) t 'noinsert) file (nndraft-article-filename article))) @@ -233,7 +233,7 @@ nnmh-retrieve-headers nnmh-request-group nnmh-close-group - nnmh-request-list + nnmh-request-list nnmh-request-newsgroups nnmh-request-move-article nnmh-request-replace-article)) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index 94ebe1a..d562c39 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -686,8 +686,8 @@ deleted. Point is left where the deleted region was." (defun nnfolder-read-folder (group) (let* ((file (nnfolder-group-pathname group)) - (buffer (set-buffer - (let ((nnmail-file-coding-system + (buffer (set-buffer + (let ((nnmail-file-coding-system nnfolder-file-coding-system)) (nnheader-find-file-noselect file))))) (if (equal (cadr (assoc group nnfolder-scantime-alist)) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 7484de9..0172cae 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -269,7 +269,7 @@ on your system, you could say something like: (goto-char p) (and (search-forward "\nxref: " nil t) (nnheader-header-value))) - + ;; Extra. (when nnmail-extra-headers (let ((extra nnmail-extra-headers) diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el index 856eb87..e6d7ff0 100644 --- a/lisp/nnkiboze.el +++ b/lisp/nnkiboze.el @@ -209,7 +209,7 @@ Finds out what articles are to be part of the nnkiboze groups." (defun nnkiboze-generate-group (group) (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb))) - (newsrc-file (concat nnkiboze-directory + (newsrc-file (concat nnkiboze-directory (nnheader-translate-file-chars (concat group ".newsrc")))) (nov-file (concat nnkiboze-directory @@ -287,7 +287,7 @@ Finds out what articles are to be part of the nnkiboze groups." (car ginfo))) 0)) (progn - (ignore-errors + (ignore-errors (gnus-group-select-group nil)) (eq major-mode 'gnus-summary-mode))) ;; We are now in the group where we want to be. diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el index 8fa8c75..e450dec 100644 --- a/lisp/nnlistserv.el +++ b/lisp/nnlistserv.el @@ -141,7 +141,7 @@ (defun nnlistserv-kk-search (search) (url-insert-file-contents - (concat (format (nnweb-definition 'address) search) + (concat (format (nnweb-definition 'address) search) (nnweb-definition 'index))) t) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index b403252..e402773 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -501,7 +501,7 @@ parameter. It should return nil, `warn' or `delete'." (defvar nnmail-file-coding-system 'binary "Coding system used in nnmail.") -(defvar nnmail-file-coding-system-1 +(defvar nnmail-file-coding-system-1 (if (string-match "nt" system-configuration) 'raw-text-dos 'binary) "Another coding system used in nnmail.") diff --git a/lisp/nnml.el b/lisp/nnml.el index 1867b96..5304865 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -185,8 +185,8 @@ all. This may very well take some time.") (nnheader-report 'nnml "No such file: %s" path)) ((file-directory-p path) (nnheader-report 'nnml "File is a directory: %s" path)) - ((not (save-excursion (let ((nnmail-file-coding-system - nnml-file-coding-system)) + ((not (save-excursion (let ((nnmail-file-coding-system + nnml-file-coding-system)) (nnmail-find-file path)))) (nnheader-report 'nnml "Couldn't read file: %s" path)) (t @@ -254,7 +254,7 @@ all. This may very well take some time.") (deffoo nnml-request-list (&optional server) (save-excursion (let ((nnmail-file-coding-system nnmail-active-file-coding-system) - (pathname-coding-system 'binary)) + (pathname-coding-system 'binary)) (nnmail-find-file nnml-active-file)) (setq nnml-group-alist (nnmail-get-active)) t)) diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index 875134f..031c0ac 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -73,8 +73,8 @@ The SOUP packet file name will be inserted at the %s.") "*Regular expression matching SOUP packets in `nnsoup-packet-directory'.") (defvoo nnsoup-always-save t - "If non nil commit the reply buffer on each message send. -This is necessary if using message mode outside Gnus with nnsoup as a + "If non nil commit the reply buffer on each message send. +This is necessary if using message mode outside Gnus with nnsoup as a backend for the messages.") diff --git a/lisp/nntp.el b/lisp/nntp.el index 0f358f8..e41f8ed 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -587,7 +587,7 @@ noticing asynchronous data.") (and (numberp nntp-large-newsgroup) (> number nntp-large-newsgroup) (nnheader-message 6 "NNTP: Receiving articles...done")) - + ;; Now we have all the responses. We go through the results, ;; wash it and copy it over to the server buffer. (set-buffer nntp-server-buffer) @@ -696,7 +696,7 @@ noticing asynchronous data.") ;; Ok, this is evil, but when using telnet and stuff ;; as the connection method, it's important that the ;; QUIT command actually is sent out before we kill - ;; the process. + ;; the process. (sleep-for 1)))) (when (buffer-name (process-buffer process)) (kill-buffer (process-buffer process))) @@ -713,7 +713,7 @@ noticing asynchronous data.") ;; Ok, this is evil, but when using telnet and stuff ;; as the connection method, it's important that the ;; QUIT command actually is sent out before we kill - ;; the process. + ;; the process. (sleep-for 1)))) (when (buffer-name (process-buffer process)) (kill-buffer (process-buffer process)))))) @@ -859,8 +859,8 @@ password contained in '~/.nntp-authinfo'." "Open a connection to PORT on ADDRESS delivering output to BUFFER." (run-hooks 'nntp-prepare-server-hook) (let* ((pbuffer (nntp-make-process-buffer buffer)) - (timer - (and nntp-connection-timeout + (timer + (and nntp-connection-timeout (nnheader-run-at-time nntp-connection-timeout nil `(lambda () @@ -871,7 +871,7 @@ password contained in '~/.nntp-authinfo'." (funcall nntp-open-connection-function pbuffer) (error nil) (quit nil)))) - (when timer + (when timer (nnheader-cancel-timer timer)) (when (and (buffer-name pbuffer) process) diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el index 07fc33a..07b2cf2 100644 --- a/lisp/rfc1843.el +++ b/lisp/rfc1843.el @@ -2,10 +2,10 @@ ;; Copyright (c) 1998 by Shenghuo Zhu ;; Author: Shenghuo Zhu -;; $Revision: 1.1.2.5 $ -;; Keywords: news HZ +;; $Revision: 1.1.2.6 $ +;; Keywords: news HZ ;; Time-stamp: - + ;; This file is not part of GNU Emacs, but the same permissions ;; apply. @@ -37,13 +37,13 @@ (require 'mm-util) -(defvar rfc1843-word-regexp +(defvar rfc1843-word-regexp "~\\({\\([\041-\167][\041-\176]\\| \\)+\\(~}\\|$\\)") (defvar rfc1843-word-regexp-strictly "~\\({\\([\041-\167][\041-\176]\\)+\\(~}\\|$\\)") -(defvar rfc1843-hzp-word-regexp +(defvar rfc1843-hzp-word-regexp "~\\({\\([\041-\167][\041-\176]\\| \\)+\\|\ [<>]\\([\041-\175][\041-\176]\\| \\)+\\)\\(~}\\|$\\)") @@ -53,7 +53,7 @@ (defcustom rfc1843-decode-loosely nil "Loosely check HZ encoding if non-nil. -When it is set non-nil, only buffers or strings with strictly +When it is set non-nil, only buffers or strings with strictly HZ-encoded are decoded." :type 'boolean :group 'gnus) @@ -62,7 +62,7 @@ HZ-encoded are decoded." "HZ+ decoding support if non-nil. HZ+ specification (also known as HZP) is to provide a standardized 7-bit representation of mixed Big5, GB, and ASCII text for convenient -e-mail transmission, news posting, etc. +e-mail transmission, news posting, etc. The document of HZ+ 0.78 specification can be found at ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc" :type 'boolean @@ -79,27 +79,27 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc" (let (str firstc) (save-excursion (goto-char from) - (if (or rfc1843-decode-loosely - (re-search-forward (if rfc1843-decode-hzp - rfc1843-hzp-word-regexp-strictly + (if (or rfc1843-decode-loosely + (re-search-forward (if rfc1843-decode-hzp + rfc1843-hzp-word-regexp-strictly rfc1843-word-regexp-strictly) to t)) - (save-restriction + (save-restriction (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward (if rfc1843-decode-hzp rfc1843-hzp-word-regexp - rfc1843-word-regexp) (point-max) t) + rfc1843-word-regexp) (point-max) t) (setq str (match-string 1)) - (setq firstc (aref str 0)) - (insert (mm-decode-coding-string + (setq firstc (aref str 0)) + (insert (mm-decode-coding-string (rfc1843-decode - (prog1 + (prog1 (substring str 1) (delete-region (match-beginning 0) (match-end 0))) firstc) (if (eq firstc ?{) 'cn-gb-2312 'cn-big5)))) (goto-char (point-min)) - (while (search-forward "~" (point-max) t) + (while (search-forward "~" (point-max) t) (cond ((eq (char-after) ?\n) (delete-char -1) (delete-char 1)) @@ -138,7 +138,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc" gnus-newsgroup-name) (save-excursion (save-restriction - (message-narrow-to-head) + (message-narrow-to-head) (goto-char (point-max)) (widen) (rfc1843-decode-region (point) (point-max)))))) @@ -153,19 +153,19 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc" (require 'gnus-art) (require 'gnus-sum) (add-hook 'gnus-article-decode-hook 'rfc1843-decode-article-body t) - (setq gnus-decode-encoded-word-function + (setq gnus-decode-encoded-word-function 'gnus-multi-decode-encoded-word-string - gnus-decode-header-function + gnus-decode-header-function 'gnus-multi-decode-header - gnus-decode-encoded-word-methods - (nconc gnus-decode-encoded-word-methods - (list - (cons (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>") + gnus-decode-encoded-word-methods + (nconc gnus-decode-encoded-word-methods + (list + (cons (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>") 'rfc1843-decode-string))) - gnus-decode-header-methods - (nconc gnus-decode-header-methods - (list - (cons (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>") + gnus-decode-header-methods + (nconc gnus-decode-header-methods + (list + (cons (concat "\\<\\(" rfc1843-newsgroups-regexp "\\)\\>") 'rfc1843-decode-region))))) (provide 'rfc1843) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index ceb45c4..b68146a 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -284,7 +284,7 @@ Should be called narrowed to the head of the message." (inline (rfc2047-decode-region (point-min) (point-max))) (buffer-string)))) - + (defun rfc2047-parse-and-decode (word) "Decode WORD and return it if it is an encoded word. Return WORD if not." diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el index 6212cc0..bbe19a5 100644 --- a/lisp/rfc2231.el +++ b/lisp/rfc2231.el @@ -197,7 +197,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." (t (goto-char (point-min)) (insert param "="))) - (buffer-string)))) + (buffer-string)))) (provide 'rfc2231) diff --git a/lisp/smiley.el b/lisp/smiley.el index 78a4397..385d688 100644 --- a/lisp/smiley.el +++ b/lisp/smiley.el @@ -162,7 +162,7 @@ above them." (defun smiley-popup-menu (e) (interactive "e") (popup-menu - `("Smilies" + `("Smilies" ["Toggle This Smiley" (smiley-toggle-extent ,e) t] ["Toggle All Smilies" (smiley-toggle-extents ,e) t]))) diff --git a/lisp/time-date.el b/lisp/time-date.el index 0a55481..c40ddbe 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -79,7 +79,7 @@ (defun date-to-day (date) "Return the number of days between year 1 and DATE." (time-to-days (date-to-time date))) - + (defun days-between (date1 date2) "Return the number of days between DATE1 and DATE2." (- (date-to-day date1) (date-to-day date2))) diff --git a/lisp/uudecode.el b/lisp/uudecode.el index b661ae4..06252d0 100644 --- a/lisp/uudecode.el +++ b/lisp/uudecode.el @@ -63,7 +63,7 @@ input and write the converted data to its standard output.") If FILE-NAME is non-nil, save the result to FILE-NAME." (interactive "r\nP") - (let ((cbuf (current-buffer)) tempfile firstline work-buffer status) + (let ((cbuf (current-buffer)) tempfile firstline work-buffer status) (save-excursion (goto-char start) (when (re-search-forward uudecode-begin-line nil t) @@ -71,9 +71,9 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (setq firstline (point)) (cond ((null file-name)) ((stringp file-name)) - (t - (setq file-name (read-file-name "File to Name:" - nil nil nil + (t + (setq file-name (read-file-name "File to Name:" + nil nil nil (match-string 1))))) (setq tempfile (expand-file-name (or file-name (concat uudecode-temporary-file-directory @@ -81,7 +81,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (let ((cdir default-directory) default-process-coding-system) (unwind-protect (progn - (set-buffer (setq work-buffer + (set-buffer (setq work-buffer (generate-new-buffer " *uudecode-work*"))) (buffer-disable-undo work-buffer) (insert "begin 600 " (file-name-nondirectory tempfile) "\n") @@ -90,7 +90,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (apply 'call-process-region (point-min) (point-max) - uudecode-decoder-program + uudecode-decoder-program nil nil nil @@ -136,10 +136,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (when (re-search-forward uudecode-begin-line nil t) (cond ((null file-name)) ((stringp file-name)) - (t - (setq file-name (expand-file-name - (read-file-name "File to Name:" - nil nil nil + (t + (setq file-name (expand-file-name + (read-file-name "File to Name:" + nil nil nil (match-string 1)))))) (setq work-buffer (generate-new-buffer " *uudecode-work*")) (buffer-disable-undo work-buffer) @@ -151,22 +151,22 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (cond ((> (skip-chars-forward uudecode-alphabet end) 0) (setq lim (point)) - (setq remain + (setq remain (logand (- (char-int (char-after inputpos)) 32) 63)) (setq inputpos (1+ inputpos)) (if (= remain 0) (setq done t)) (while (and (< inputpos lim) (> remain 0)) - (setq bits (+ bits - (logand - (- + (setq bits (+ bits + (logand + (- (char-int (char-after inputpos)) 32) 63))) (if (/= counter 0) (setq remain (1- remain))) (setq counter (1+ counter) inputpos (1+ inputpos)) (cond ((= counter 4) - (uudecode-insert-char + (uudecode-insert-char (lsh bits -16) 1 nil work-buffer) - (uudecode-insert-char + (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil work-buffer) (uudecode-insert-char (logand bits 255) 1 nil work-buffer) @@ -181,12 +181,12 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." ;(error "uucode ends unexpectly") (setq done t)) ((= counter 3) - (uudecode-insert-char (logand (lsh bits -16) 255) 1 nil + (uudecode-insert-char (logand (lsh bits -16) 255) 1 nil work-buffer) (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil work-buffer)) ((= counter 2) - (uudecode-insert-char (logand (lsh bits -10) 255) 1 nil + (uudecode-insert-char (logand (lsh bits -10) 255) 1 nil work-buffer))) (skip-chars-forward non-data-chars end)) (if file-name