Synch to No Gnus 200509281448.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 931f86a..7af7006 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-bold-region, message-unbold-region): Rename
+       from `bold-region' and `unbold-region'.
+
+       * message.el: Remove useless autoloads.
+
 2005-09-28  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-use-idna): Default to t.

diff --git a/lisp/message.el b/lisp/message.el
index d6af679..887f07f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1567,10 +1567,10 @@ starting with `not' and followed by regexps."
 (put 'message-mode 'font-lock-defaults '(message-font-lock-keywords t))
 
 (defvar message-face-alist
-  '((bold . bold-region)
+  '((bold . message-bold-region)
     (underline . underline-region)
     (default . (lambda (b e)
-                (unbold-region b e)
+                (message-unbold-region b e)
                 (ununderline-region b e))))
   "Alist of mail and news faces for facemenu.
 The cdr of each entry is a function for applying the face to a region.")
@@ -2097,7 +2097,6 @@ Leading \"Re: \" is not stripped by this function.  Use the function
 
 ;;; Suggested by Jonas Steverud  @  www.dtek.chalmers.se/~d4jonas/
 
-;;;###autoload
 (defun message-change-subject (new-subject)
   "Ask for NEW-SUBJECT header, append (was: <Old Subject>)."
   ;; <URL:http://www.landfield.com/usefor/drafts/draft-ietf-usefor-useage--1.02.unpaged>
@@ -2129,7 +2128,6 @@ Leading \"Re: \" is not stripped by this function.  Use the function
                                    " (was: "
                                    old-subject ")\n")))))))))
 
-;;;###autoload
 (defun message-mark-inserted-region (beg end &optional verbatim)
   "Mark some region in the current article with enclosing tags.
 See `message-mark-insert-begin' and `message-mark-insert-end'.
@@ -2142,7 +2140,6 @@ If VERBATIM, use slrn style verbatim marks (\"#v+\" and \"#v-\")."
     (goto-char beg)
     (insert (if verbatim "#v+\n" message-mark-insert-begin))))
 
-;;;###autoload
 (defun message-mark-insert-file (file &optional verbatim)
   "Insert FILE at point, marking it with enclosing tags.
 See `message-mark-insert-begin' and `message-mark-insert-end'.
@@ -2156,7 +2153,6 @@ If VERBATIM, use slrn style verbatim marks (\"#v+\" and \"#v-\")."
     (goto-char p)
     (insert (if verbatim "#v+\n" message-mark-insert-begin))))
 
-;;;###autoload
 (defun message-add-archive-header ()
   "Insert \"X-No-Archive: Yes\" in the header and a note in the body.
 The note can be customized using `message-archive-note'.  When called with a
@@ -2176,7 +2172,6 @@ body, set  `message-archive-note' to nil."
       (message-add-header message-archive-header)
       (message-sort-headers)))
 
-;;;###autoload
 (defun message-cross-post-followup-to-header (target-group)
   "Mangles FollowUp-To and Newsgroups header to point to TARGET-GROUP.
 With prefix-argument just set Follow-Up, don't cross-post."
@@ -2220,7 +2215,6 @@ With prefix-argument just set Follow-Up, don't cross-post."
       (insert (concat "\nFollowup-To: " target-group)))
   (setq message-cross-post-old-target target-group))
 
-;;;###autoload
 (defun message-cross-post-insert-note (target-group cross-post in-old
                                                    old-groups)
   "Insert a in message body note about a set Followup or Crosspost.
@@ -2253,7 +2247,6 @@ been made to before the user asked for a Crosspost."
        (insert (concat message-followup-to-note target-group "\n"))
       (insert (concat message-cross-post-note target-group "\n")))))
 
-;;;###autoload
 (defun message-cross-post-followup-to (target-group)
   "Crossposts message and set Followup-To to TARGET-GROUP.
 With prefix-argument just set Follow-Up, don't cross-post."
@@ -2295,7 +2288,6 @@ With prefix-argument just set Follow-Up, don't cross-post."
 
 ;;; Reduce To: to Cc: or Bcc: header
 
-;;;###autoload
 (defun message-reduce-to-to-cc ()
  "Replace contents of To: header with contents of Cc: or Bcc: header."
  (interactive)
@@ -7345,7 +7337,7 @@ you."
 ;; This code should be moved to underline.el (from which it is stolen).
 
 ;;;###autoload
-(defun bold-region (start end)
+(defun message-bold-region (start end)
   "Bold all nonblank characters in the region.
 Works by overstriking characters.
 Called from program, takes two arguments START and END
@@ -7361,7 +7353,7 @@ which specify the range to operate on."
        (forward-char 1)))))
 
 ;;;###autoload
-(defun unbold-region (start end)
+(defun message-unbold-region (start end)
   "Remove all boldness (overstruck characters) in the region.
 Called from program, takes two arguments START and END
 which specify the range to operate on."

diff --git a/texi/ChangeLog b/texi/ChangeLog
index e44f415..d569664 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.texi (Insertion): Describe prefix for
+       message-mark-inserted-region and message-mark-insert-file.
+
 2005-09-28  Simon Josefsson  <jas@extundo.com>
 
        * message.texi (IDNA): Fix.

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 10b5ec1..063ddd1 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -786,14 +786,16 @@ MFT \e$B$rB:=E$9$k$3$H$ONI$$%M%A%1%C%H\e(B (netiquette) \e$B$G$"$k$H9M$($i$l$F$$$^$
 @findex message-mark-inserted-region
 \e$B8=:_$N5-;v$N$$$/$D$+$NNN0h$r!"$=$l$i$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#\e(B
 @code{message-mark-insert-begin} \e$B$H\e(B @code{message-mark-insert-end} \e$B$r8+\e(B
-\e$B$F2<$5$$!#\e(B
+\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H\e(B slrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
+\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B
 
 @item C-c M-f
 @kindex C-c M-f
 @findex message-mark-insert-file
 \e$B8=:_$N5-;v$K!"%?%0$G0O$^$l$?%U%!%$%k$rA^F~$7$^$9!#\e(B
 @code{message-mark-insert-begin} \e$B$H\e(B @code{message-mark-insert-end} \e$B$r8+\e(B
-\e$B$F2<$5$$!#\e(B
+\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H\e(B slrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
+\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B
 @end table
 
 @c FIXTGNUS We should provide MIME manual.

diff --git a/texi/message.texi b/texi/message.texi
index 4a30561..94ae5af 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -786,14 +786,18 @@ Insert the message headers (@code{message-insert-headers}).
 @item C-c M-m
 @kindex C-c M-m
 @findex message-mark-inserted-region
-Mark some region in the current article with enclosing tags.
-See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+Mark some region in the current article with enclosing tags.  See
+@code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+When called with a prefix argument, use slrn style verbatim marks
+(@samp{#v+} and @samp{#v-}).
 
 @item C-c M-f
 @kindex C-c M-f
 @findex message-mark-insert-file
 Insert a file in the current article with enclosing tags.
 See @code{message-mark-insert-begin} and @code{message-mark-insert-end}.
+When called with a prefix argument, use slrn style verbatim marks
+(@samp{#v+} and @samp{#v-}).
 
 @end table