Synch to No Gnus 200405122100.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc003e7..9a584c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2004-05-12  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-xmas.el (gnus-xmas-select-lowest-window)
+       (gnus-xmas-redefine): Rename.
+
+       * gnus-score.el (gnus-score-insert-help): Use
+       gnus-select-lowest-window.
+
+       * gnus-ems.el (gnus-select-lowest-window): Copy definition of
+       appt-select-lowest-window and rename to gnus-select-lowest-window.
+
+       * gnus.el: do.
+
+2004-05-12  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * rfc2047.el (rfc2047-encode): Use uppercase letters to specify
+       encodings of MIME-encoded words, in order to improve
+       interoperability with several broken MUAs.
+
 2004-05-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
        * mm-view.el (mm-inline-text-html-render-with-w3): Check META

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 1493bbd..fe83ccf 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -45,7 +45,6 @@
 (eval-and-compile
   (autoload 'gnus-xmas-define "gnus-xmas")
   (autoload 'gnus-xmas-redefine "gnus-xmas")
-  (autoload 'appt-select-lowest-window "appt")
   (autoload 'gnus-get-buffer-create "gnus")
   (autoload 'nnheader-find-etc-directory "nnheader"))
 
@@ -148,6 +147,18 @@
               (gnus-truncate-string val (string-width val) ,cut))))))
     ))
 
+;; Clone of `appt-select-lowest-window' in appt.el.
+(defun gnus-select-lowest-window ()
+"Select the lowest window on the frame."
+  (let ((lowest-window (selected-window))
+       (bottom-edge (nth 3 (window-edges))))
+    (walk-windows (lambda (w)
+                   (let ((next-bottom-edge (nth 3 (window-edges w))))
+                     (when (< bottom-edge next-bottom-edge)
+                       (setq bottom-edge next-bottom-edge
+                             lowest-window w)))))
+    (select-window lowest-window)))
+
 (defun gnus-region-active-p ()
   "Say whether the region is active."
   (and (boundp 'transient-mark-mode)

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index b1502e5..13c9b3b 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -774,7 +774,7 @@ file for the command instead of the current score file."
        (setq i (1+ i))))
     (goto-char (point-min))
     ;; display ourselves in a small window at the bottom
-    (gnus-appt-select-lowest-window)
+    (gnus-select-lowest-window)
     (if (< (/ (window-height) 2) window-min-height)
        (switch-to-buffer "*Score Help*")
       (split-window)

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 7e2b920..92d9d8e 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -244,7 +244,7 @@ call it with the value of the `gnus-data' text property."
          (select-window selected))))))
 
 ;; Select the lowest window on the frame.
-(defun gnus-xmas-appt-select-lowest-window ()
+(defun gnus-xmas-select-lowest-window ()
   (let* ((lowest-window (selected-window))
         (bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
         (last-window (previous-window))
@@ -417,8 +417,8 @@ call it with the value of the `gnus-data' text property."
   (defalias 'gnus-read-event-char 'gnus-xmas-read-event-char)
   (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
   (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
-  (defalias 'gnus-appt-select-lowest-window
-    'gnus-xmas-appt-select-lowest-window)
+  (defalias 'gnus-select-lowest-window
+    'gnus-xmas-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'character-to-event)
   (defalias 'gnus-mode-line-buffer-identification

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2f20f6a..b68ae98 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -312,7 +312,6 @@ be set in `.emacs' instead."
   (defalias 'gnus-overlay-end 'overlay-end)
   (defalias 'gnus-extent-detached-p 'ignore)
   (defalias 'gnus-extent-start-open 'ignore)
-  (defalias 'gnus-appt-select-lowest-window 'appt-select-lowest-window)
   (defalias 'gnus-mail-strip-quoted-names 'mail-strip-quoted-names)
   (defalias 'gnus-character-to-event 'identity)
   (defalias 'gnus-assq-delete-all 'assq-delete-all)

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 20c3033..1f07cb6 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -406,7 +406,7 @@ By default, the region is treated as containing addresses (see
                           'Q))))
         (start (concat
                 "=?" (downcase (symbol-name mime-charset)) "?"
-                (downcase (symbol-name encoding)) "?"))
+                (upcase (symbol-name encoding)) "?"))
         (factor (case mime-charset
                   ((iso-8859-5 iso-8859-7 iso-8859-8 koi8-r) 1)
                   ((big5 gb2312 euc-kr) 2)