[Emacs-diffs] Changes to emacs/lisp/gnus/message.el

[Miles Bader]

Index: emacs/lisp/gnus/message.el
diff -c emacs/lisp/gnus/message.el:1.68 emacs/lisp/gnus/message.el:1.69
*** emacs/lisp/gnus/message.el:1.68     Mon Nov  1 23:06:34 2004
--- emacs/lisp/gnus/message.el  Tue Dec  7 21:56:39 2004
***************
*** 146,152 ****
  the article has been posted to will be inserted there.
  If this variable is nil, no such courtesy message will be added."
    :group 'message-sending
!   :type '(radio (string :format "%t: %v\n" :size 0) (const nil)))
  
  (defcustom message-ignored-bounced-headers
    "^\\(Received\\|Return-Path\\|Delivered-To\\):"
--- 146,152 ----
  the article has been posted to will be inserted there.
  If this variable is nil, no such courtesy message will be added."
    :group 'message-sending
!   :type '(radio string (const nil)))
  
  (defcustom message-ignored-bounced-headers
    "^\\(Received\\|Return-Path\\|Delivered-To\\):"
***************
*** 373,380 ****
    "Note to insert why you wouldn't want this posting archived.
  If nil, don't insert any text in the body."
    :version "21.4"
!   :type '(radio (string :format "%t: %v\n" :size 0)
!               (const nil))
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
  
--- 373,379 ----
    "Note to insert why you wouldn't want this posting archived.
  If nil, don't insert any text in the body."
    :version "21.4"
!   :type '(radio string (const nil))
    :link '(custom-manual "(message)Header Commands")
    :group 'message-various)
  
***************
*** 698,705 ****
    :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
!   :type '(radio (file :format "%t: %v\n" :size 0)
!               (const nil)))
  
  (defcustom message-subscribed-addresses nil
    "*Specifies a list of addresses the user is subscribed to.
--- 697,703 ----
    :version "21.4"
    :group 'message-interface
    :link '(custom-manual "(message)Mailing Lists")
!   :type '(radio file (const nil)))
  
  (defcustom message-subscribed-addresses nil
    "*Specifies a list of addresses the user is subscribed to.
***************
*** 1442,1448 ****
    :group 'message-headers
    :link '(custom-manual "(message)News Headers")
    :type '(radio (const :format "%v  " nil)
!               (string :format "FQDN: %v\n" :size 0)))
  
  (defcustom message-use-idna (and (condition-case nil (require 'idna)
                                   (file-error))
--- 1440,1446 ----
    :group 'message-headers
    :link '(custom-manual "(message)News Headers")
    :type '(radio (const :format "%v  " nil)
!               (string :format "FQDN: %v")))
  
  (defcustom message-use-idna (and (condition-case nil (require 'idna)
                                   (file-error))
***************
*** 2403,2409 ****
    ;; fontified: is used by font-lock.
    ;; syntax-table, local-map: I dunno.
    ;; We need to add XEmacs names to the list.
!   "Property list of with properties.forbidden in message buffers.
  The values of the properties are ignored, only the property names are used.")
  
  (defun message-tamago-not-in-use-p (pos)
--- 2401,2407 ----
    ;; fontified: is used by font-lock.
    ;; syntax-table, local-map: I dunno.
    ;; We need to add XEmacs names to the list.
!   "Property list of with properties forbidden in message buffers.
  The values of the properties are ignored, only the property names are used.")
  
  (defun message-tamago-not-in-use-p (pos)
***************
*** 2426,2436 ****
  See also `message-forbidden-properties'."
    (when (and message-strip-special-text-properties
             (message-tamago-not-in-use-p begin))
!     (while (not (= begin end))
!       (when (not (get-text-property begin 'message-hidden))
!       (remove-text-properties begin (1+ begin)
!                               message-forbidden-properties))
!       (incf begin))))
  
  ;;;###autoload
  (define-derived-mode message-mode text-mode "Message"
--- 2424,2436 ----
  See also `message-forbidden-properties'."
    (when (and message-strip-special-text-properties
             (message-tamago-not-in-use-p begin))
!     (let ((buffer-read-only nil)
!         (inhibit-read-only t))
!       (while (not (= begin end))
!       (when (not (get-text-property begin 'message-hidden))
!         (remove-text-properties begin (1+ begin)
!                                 message-forbidden-properties))
!       (incf begin)))))
  
  ;;;###autoload
  (define-derived-mode message-mode text-mode "Message"
***************
*** 6193,6200 ****
      (setq e (point))
      (insert
       "\n-------------------- End of forwarded message --------------------\n")
!     (when (and (not current-prefix-arg)
!              message-forward-ignored-headers)
        (save-restriction
        (narrow-to-region b e)
        (goto-char b)
--- 6193,6199 ----
      (setq e (point))
      (insert
       "\n-------------------- End of forwarded message --------------------\n")
!     (when message-forward-ignored-headers
        (save-restriction
        (narrow-to-region b e)
        (goto-char b)
***************
*** 6240,6246 ****
        (goto-char (point-max))))
      (setq e (point))
      (insert "<#/mml>\n")
!     (when (and (not current-prefix-arg)
               message-forward-ignored-headers)
        (save-restriction
        (narrow-to-region b e)
--- 6239,6245 ----
        (goto-char (point-max))))
      (setq e (point))
      (insert "<#/mml>\n")
!     (when (and (not message-forward-decoded-p)
               message-forward-ignored-headers)
        (save-restriction
        (narrow-to-region b e)