From 28190cffc1aeaf7e29de90c3b611e6c423afd175 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 23 Feb 2006 23:04:43 +0000 Subject: [PATCH] Synch to No Gnus 200602232138. --- lisp/ChangeLog | 38 +++++++++++++++++++++++++++++++++----- lisp/gnus-group.el | 32 ++++++++++++++++---------------- lisp/gnus-sum.el | 8 ++++---- lisp/message.el | 14 ++++++-------- lisp/mm-util.el | 4 ++-- lisp/mm-view.el | 1 + lisp/qp.el | 2 +- lisp/utf7.el | 2 +- 8 files changed, 64 insertions(+), 37 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8397857..9390b5a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,32 @@ +2006-02-23 Reiner Steib + + * gnus-group.el (gnus-group-tool-bar-gnome): Fix + gnus-agent-toggle-plugged. Re-order icons. + (gnus-group-tool-bar-gnome): Add + gnus-group-{prev,next}-unread-group. + (gnus-group-tool-bar-gnome): Re-order icons. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Move + gnus-summary-insert-new-articles. + + * message.el (message-tool-bar-gnome, message-tool-bar-retro): Fix + comments. + + * utf7.el (utf7-utf-16-coding-system): Fix comment. utf-16-be is + also available in Emacs 21.3. + + * message.el (message-fix-before-sending): Change "Emacs 23" to + "Emacs 23 (unicode)" in comment. + + * qp.el (quoted-printable-encode-region): Change "Emacs 22" to + "Emacs 23 (unicode)" in comment. + + * mm-util.el: Change "Emacs 22" to "Emacs 23 (unicode)" in + comment. + (mm-coding-system-p): Add comment about no-MULE XEmacs. + + * mm-view.el (mm-fill-flowed): Add :version. + 2006-02-23 Katsumi Yamaoka * gmm-utils.el (gmm-image-load-path): Don't modify image-load-path @@ -1980,7 +2009,7 @@ * gnus-topic.el (gnus-topic-mode): Ditto. -2005-07-08 Ralf Angeli (tiny change) +2005-07-08 Ralf Angeli * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1) (gnus-article-prev-page): Take scroll-margin into consideration. @@ -6764,11 +6793,10 @@ * rfc2047.el (rfc2047-pad-base64): Deal with more cases of invalid padding. -2004-01-27 Simon Josefsson +2004-01-27 Ralf Angeli - * mm-view.el (mm-fill-flowed): Add. - (mm-inline-text): Use it. Tiny patch from Ralf Angeli - . + * mm-view.el (mm-fill-flowed): New variable. + (mm-inline-text): Use it. 2004-01-27 Teodor Zlatanov diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index a98f8a1..f702052 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1041,7 +1041,20 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and (defcustom gnus-group-tool-bar-gnome '((gnus-group-post-news "mail/compose") - (gnus-group-get-new-news "mail/inbox") ;; Add... nil :visible gnus-plugged ? + ;; Some useful agent icons? I don't use the agent so agent users should + ;; suggest useful commands: + (gnus-agent-toggle-plugged "connect" t + :visible (and gnus-agent (not gnus-plugged))) + (gnus-agent-toggle-plugged "disconnect" t + :visible (and gnus-agent gnus-plugged)) + ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar) + ;; should have a better help text. + (gnus-group-send-queue "mail/outbox" t + :visible (and gnus-agent gnus-plugged) + :help "Send articles from the queue group") + (gnus-group-get-new-news "mail/inbox" nil + :visible (or (not gnus-agent) + gnus-plugged)) ;; FIXME: gnus-*-read-group should have a better help text. (gnus-topic-read-group "open" nil :visible gnus-topic-mode) (gnus-group-read-group "open" nil :visible (not gnus-topic-mode)) @@ -1049,21 +1062,8 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and (gnus-group-save-newsrc "save") (gnus-group-describe-group "describe") (gnus-group-unsubscribe-current-group "gnus/toggle-subscription") - ;; (gnus-group-subscribe "subscribe" t - ;; :help "Subscribe to the current group") - ;; (gnus-group-unsubscribe "unsubscribe" t - ;; :help "Unsubscribe from the current group") - ;; - ;; Some useful agent icons? I don't use the agent so agent users should - ;; suggest useful commands: - (gnus-group-send-queue "mail/outbox" t - :visible (and gnus-agent gnus-plugged) - :help "Send articles from the queue group") - (gnus-agent-toggle-plugged "connect" nil - :visible (and gnus-agent (not gnus-plugged))) - (gnus-agent-toggle-plugged "disconnect" nil - :visible (and gnus-agent gnus-plugged)) - ;; + (gnus-group-prev-unread-group "prev-node") ;; Emacs 22 + (gnus-group-next-unread-group "next-node") ;; Emacs 22 (gnus-group-exit "exit") (gnus-info-find-node "help")) "List of functions for the group tool bar (GNOME style). diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index ab5b112..7638136 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2652,6 +2652,8 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and (defcustom gnus-summary-tool-bar-gnome '((gnus-summary-post-news "mail/compose" nil) + (gnus-summary-insert-new-articles "mail/inbox") + ;; (gnus-summary-reply-with-original "mail/reply") (gnus-summary-reply "mail/reply" nil :visible nil) (gnus-summary-followup-with-original "mail/reply-all") @@ -2680,10 +2682,8 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and (gnus-summary-enter-digest-group "right_arrow" nil :visible nil) ;; ;; Maybe some sort-by-... could be added: - (gnus-summary-sort-by-author "sort-a-z" nil :visible nil) - (gnus-summary-sort-by-date "sort-1-9" nil :visible nil) - ;; - (gnus-summary-insert-new-articles "mail/inbox") + ;; (gnus-summary-sort-by-author "sort-a-z" nil :visible nil) + ;; (gnus-summary-sort-by-date "sort-1-9" nil :visible nil) ;; (gnus-summary-exit "exit") ;; (customize-group 'gnus-summary) "preferences" diff --git a/lisp/message.el b/lisp/message.el index db83406..607c8d2 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -4161,8 +4161,8 @@ not have PROP." ;; (when (let ((char (char-after))) ;; (or (< (mm-char-int char) 128) ;; (and (mm-multibyte-p) -;; ;; Fixme: Wrong for Emacs 23 and for things -;; ;; like undecable utf-8. Should at least +;; ;; Fixme: Wrong for Emacs 23 (unicode) and for +;; ;; things like undecable utf-8. Should at least ;; ;; use find-coding-systems-region. ;; (memq (char-charset char) ;; '(eight-bit-control eight-bit-graphic @@ -7461,14 +7461,12 @@ Pre-defined symbols include `message-tool-bar-gnome' and (message-send-and-exit "mail/send") (message-dont-send "mail/save-draft") (message-kill-buffer "close") ;; stock_cancel -;; (mml-attach-file "mail/attach" mml-mode-map) + ;;(mml-attach-file "mail/attach" mml-mode-map) (ispell-message "spell" nil :visible (not flyspell-mode)) (flyspell-buffer "spell" t :visible flyspell-mode :help "Flyspell whole buffer") - ;; We should have a mail-preview icon with an envelope like the one in - ;; stock_mail-reply. -;; (mml-preview "mail/preview" mml-mode-map) -;; (mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil) + ;;(mml-preview "mail/preview" mml-mode-map) + ;;(mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil) (message-insert-importance-high "important" nil :visible nil) (message-insert-importance-low "unimportant" nil :visible nil) (message-insert-disposition-notification-to "receipt" nil :visible nil) @@ -7483,7 +7481,7 @@ See `gmm-tool-bar-from-list' for details on the format of the list." :group 'message) (defcustom message-tool-bar-retro - '(;; Old Emacs 21 icon for consitency. + '(;; Old Emacs 21 icon for consistency. (message-send-and-exit "gnus/mail_send") (message-kill-buffer "close") (message-dont-send "cancel") diff --git a/lisp/mm-util.el b/lisp/mm-util.el index aae4119..be34ddd 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -167,7 +167,7 @@ system object in XEmacs." (if (fboundp 'coding-system-p) (when (coding-system-p cs) cs) - ;; Is this branch ever actually useful? + ;; no-MULE XEmacs: (car (memq cs (mm-get-coding-system-list)))))) (defun mm-codepage-setup (number &optional alias) @@ -400,7 +400,7 @@ with Mule charsets. It is completely useless for Emacs." cs mime mule alist) (while css (setq cs (pop css) - mime (or (coding-system-get cs :mime-charset) ; Emacs 22 + mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode) (coding-system-get cs 'mime-charset))) (when (and mime (not (eq t (setq mule diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 980a79d..f0c644e 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -73,6 +73,7 @@ (defcustom mm-fill-flowed t "If non-nil a format=flowed article will be displayed flowed." :type 'boolean + :version "22.1" :group 'mime-display) ;;; Internal variables. diff --git a/lisp/qp.el b/lisp/qp.el index d96a6d9..37bef26 100644 --- a/lisp/qp.el +++ b/lisp/qp.el @@ -118,7 +118,7 @@ encode lines starting with \"From\"." (not (eobp))) (insert (prog1 - ;; To unibyte in case of Emacs 22 eight-bit. + ;; To unibyte in case of Emacs 23 (unicode) eight-bit. (format "=%02X" (mm-multibyte-char-to-unibyte (char-after))) (delete-char 1)))) ;; Encode white space at the end of lines. diff --git a/lisp/utf7.el b/lisp/utf7.el index 5ad2e3c..d218c49 100644 --- a/lisp/utf7.el +++ b/lisp/utf7.el @@ -80,7 +80,7 @@ (defconst utf7-utf-16-coding-system (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS 'utf-16-be-no-signature) - ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1 + ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22 ;; Avoid versions with BOM. (= 2 (length (encode-coding-string "a" 'utf-16-be)))) 'utf-16-be) -- 1.7.10.4