(gnus-copy-article-buffer): Encode smileys to ordinary text if the feature

[elisp/gnus.git-] / lisp / gnus-msg.el

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 63ea229..9ba9f4e 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -30,7 +30,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'cl)
+  (require 'static))
 
 (require 'gnus)
 (require 'gnus-ems)
@@ -479,6 +481,10 @@ header line with the old Message-ID."
          (set-buffer gnus-article-copy)
          (delete-region (goto-char (point-min))
                         (or (search-forward "\n\n" nil t) (point-max)))
+         ;; Encode bitmap smileys to ordinary text.
+         (static-unless (featurep 'xemacs)
+           (when (featurep 'smiley-mule)
+             (smiley-encode-buffer)))
          ;; Insert the original article headers.
          (insert-buffer-substring gnus-original-article-buffer beg end)
          (article-decode-encoded-words)))
@@ -939,23 +945,26 @@ If YANK is non-nil, include the original article."
       (insert gnus-bug-message)
       (goto-char (point-min)))
     (message-pop-to-buffer "*Gnus Bug*")
-    (message-setup
-     `((To . ,gnus-maintainer) (Cc . ,semi-gnus-developers) (Subject . "")))
+    (message-setup `((To . ,gnus-maintainer) (Subject . "")))
     (when gnus-bug-create-help-buffer
       (push `(gnus-bug-kill-buffer) message-send-actions))
     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)
-    (insert (gnus-version) "\n"
+    (insert gnus-product-name " " gnus-version-number
+           " (r" gnus-revision-number ") "
+           "based on " gnus-original-product-name " v"
+           gnus-original-version-number "\n"
            (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)
               (stringp nntp-server-type))
       (insert nntp-server-type))
     (insert "\n\n\n\n\n")
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create " *gnus environment info*"))
-      (gnus-debug))
-    (insert "<#part type=application/x-emacs-lisp buffer=\" *gnus environment info*\" disposition=inline description=\"User settings\"><#/part>")
+    (let (mime-content-types)
+      (mime-edit-insert-tag "text" "plain" "; type=emacs-lisp"))
+    (insert (with-temp-buffer
+             (gnus-debug)
+             (buffer-string)))
     (goto-char (point-min))
     (search-forward "Subject: " nil t)
     (message "")))
@@ -1197,7 +1206,7 @@ this is a reply."
   (unless gnus-inhibit-posting-styles
     (let ((group (or gnus-newsgroup-name ""))
          (styles gnus-posting-styles)
-         style match variable attribute value v styles results
+         style match variable attribute value v results
          filep name address element)
       ;; If the group has a posting-style parameter, add it at the end with a
       ;; regexp matching everything, to be sure it takes precedence over all
@@ -1232,7 +1241,7 @@ this is a reply."
                  filep nil)
            (setq value
                  (cond
-                  ((eq (car attribute) :file)
+                  ((eq (car attribute) ':file)
                    (setq filep t)
                    (cadr attribute))
                   ((eq (car attribute) :value)
@@ -1272,6 +1281,8 @@ this is a reply."
        (when (cdr result)
          (add-hook 'message-setup-hook
                    (cond
+                    ((eq 'eval (car result))
+                     'ignore)
                     ((eq 'body (car result))
                      `(lambda ()
                         (save-excursion