* gnus-util.el (gnus-multiple-choice): Use message. XEmacs only

	takes one argument in read-char.

	* message.el (message-fix-before-sending): Forward a char.
	Check mmu-multibyte-p, add control-1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4176bcb..cefeaa4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
 2002-03-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * gnus-util.el (gnus-multiple-choice): Use message. XEmacs only
+       takes one argument in read-char.
+
        * message.el (message-fix-before-sending): Forward a char.
+       Check mmu-multibyte-p, add control-1.
 
 2002-03-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 1ef04d5..ed69d49 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -242,18 +242,18 @@ Modify to suit your needs."))
     (condition-case code
        (require 'w3-parse)
       (error
-       (message "No w3: %s %s" (cadr code) (locate-library "w3-parse"))
+       (message "No w3: %s %s" (cadr code) (or (locate-library "w3-parse") ""))
        (dolist (file '("nnultimate.el" "webmail.el" "nnwfm.el"))
         (setq files (delete file files)))))
     (condition-case code
        (require 'mh-e)
       (error
-       (message "No mh-e: %s %s" (cadr code) (locate-library "mh-e"))
+       (message "No mh-e: %s %s" (cadr code) (or (locate-library "mh-e") ""))
        (setq files (delete "gnus-mh.el" files))))
     (condition-case code
        (require 'xml)
       (error
-       (message "No xml: %s %s" (cadr code) (locate-library "xml"))
+       (message "No xml: %s %s" (cadr code) (or (locate-library "xml") ""))
        (setq files (delete "nnrss.el" files))))
     (dolist (file
             (if (featurep 'xemacs)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 532ac23..b0d901f 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1301,12 +1301,11 @@ CHOICE is a list of the choice char and help message at IDX."
     (save-window-excursion
       (save-excursion
        (while (not tchar)
-         (setq tchar 
-               (read-char
-                (format "%s (%s?): "
-                        prompt
-                        (mapconcat (lambda (s) (char-to-string (car s)))
-                                   choice ""))))
+         (message "%s (%s?): "
+                  prompt
+                  (mapconcat (lambda (s) (char-to-string (car s)))
+                             choice ""))
+         (setq tchar (read-char))
          (when (not (assq tchar choice))
            (setq tchar nil)
            (setq buf (get-buffer-create "*Gnus Help*"))

diff --git a/lisp/message.el b/lisp/message.el
index c003d87..631f34e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2712,9 +2712,10 @@ It should typically alter the sending method in some way or other."
       (while (not (eobp))
        (when (let ((char (char-after)))
                (or (< (mm-char-int char) 128)
-                   (and (fboundp 'char-charset)
+                   (and (mm-multibyte-p)
                         (memq (char-charset char)
-                              '(eight-bit-control eight-bit-graphic)))))
+                              '(eight-bit-control eight-bit-graphic 
+                                                  control-1)))))
          (add-text-properties (point) (1+ (point)) '(highlight t))
          (setq found t))
        (forward-char)
@@ -2733,9 +2734,10 @@ It should typically alter the sending method in some way or other."
        (while (not (eobp))
          (when (let ((char (char-after)))
                  (or (< (mm-char-int char) 128)
-                     (and (fboundp 'char-charset)
+                     (and (mm-multibyte-p)
                           (memq (char-charset char)
-                                '(eight-bit-control eight-bit-graphic)))))
+                                '(eight-bit-control eight-bit-graphic
+                                                    control-1)))))
            (delete-char 1)
            (if (eq choice ?r)
                (insert ".")))