Synch to Oort Gnus 200303202305.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce6a708..2df0773 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-split-line): Ignore error.
+
+       * lpath.el (split-line): Avoid split-line warning message.
+
+2003-03-20  Kim F. Storm  <storm@cua.dk>
+
+       * message.el (message-split-line): New function.
+       (message-mode-map): Remap split-line to message-split-line.
+
 2003-03-20  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * message.el (message-make-overlay): Defalias it to make-overlay.
@@ -14,6 +25,8 @@
 
 2003-03-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * rfc2231.el (rfc2231-decode-encoded-string): Downcase charset.
+       
        * mm-url.el (mm-url-insert): Move url-current-object stuff into
        mm-url-insert-file-contents.
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index f80ced9..c84539b 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -106,4 +106,7 @@
 (defun nnkiboze-score-file (a)
   )
 
+(defun split-line (&optional arg)
+  )
+
 (provide 'lpath)

diff --git a/lisp/message.el b/lisp/message.el
index 96cca9a..a34f417 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2327,6 +2327,7 @@ Point is left at the beginning of the narrowed-to region."
   (define-key message-mode-map "\C-c\C-z" 'message-kill-to-signature)
   (define-key message-mode-map "\M-\r" 'message-newline-and-reformat)
   ;;(define-key message-mode-map "\M-q" 'message-fill-paragraph)
+  (define-key message-mode-map [remap split-line]  'message-split-line)
 
   (define-key message-mode-map "\C-a" 'message-beginning-of-line)
   (define-key message-mode-map "\t" 'message-tab)
@@ -5544,6 +5545,16 @@ Headers already prepared in the buffer are not modified."
           (if (consp value) (car value) value))
          "\n"))
 
+(defun message-split-line ()
+  "Split current line, moving portion beyond point vertically down.
+If the current line has `message-yank-prefix', insert it on the new line."
+  (interactive "*")
+  (condition-case nil
+      (split-line message-yank-prefix) ;; Emacs 21.3.50+ supports arg.
+    (error
+     (split-line))))
+     
+
 (defun message-fill-header (header value)
   (let ((begin (point))
        (fill-column 78)

diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index 5d9b491..88730a3 100644 (file)
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -154,9 +154,9 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
       ;; Encode using the charset, if any.
       (when (and (mm-multibyte-p)
                 (> (length elems) 1)
-                (not (equal (intern (car elems)) 'us-ascii)))
+                (not (equal (intern (downcase (car elems))) 'us-ascii)))
        (mm-decode-coding-region (point-min) (point-max)
-                                (intern (car elems))))
+                                (intern (downcase (car elems)))))
       (buffer-string))))
 
 (defun rfc2231-encode-string (param value)