Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f44f4c7..355102f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-mode-map): Use C-c C-f C-i for Importance:
+       instead of C-c C-u.  Suggested by Per Abrahamsen
+       <abraham@dina.kvl.dk>.
+
 2001-11-18 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnfolder.el (nnfolder-read-folder): Use group instead of

diff --git a/lisp/message.el b/lisp/message.el
index b34ec13..31d19ab 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1735,13 +1735,13 @@ Point is left at the beginning of the narrowed-to region."
   (define-key message-mode-map "\C-c\C-f\C-m" 'message-goto-mail-followup-to)
   (define-key message-mode-map "\C-c\C-f\C-k" 'message-goto-keywords)
   (define-key message-mode-map "\C-c\C-f\C-u" 'message-goto-summary)
+  (define-key message-mode-map "\C-c\C-f\C-i" 'message-insert-or-toggle-importance)
   (define-key message-mode-map "\C-c\C-b" 'message-goto-body)
   (define-key message-mode-map "\C-c\C-i" 'message-goto-signature)
   (define-key message-mode-map "\C-c\C-fc" 'message-goto-mail-copies-to)
 
   (define-key message-mode-map "\C-c\C-t" 'message-insert-to)
   (define-key message-mode-map "\C-c\C-n" 'message-insert-newsgroups)
-  (define-key message-mode-map "\C-c\C-u" 'message-insert-or-toggle-importance)
 
   (define-key message-mode-map "\C-c\C-y" 'message-yank-original)
   (define-key message-mode-map "\C-c\M-\C-y" 'message-yank-buffer)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 7566a71..fc19d0b 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19  Simon Josefsson  <jas@extundo.com>
+
+       * message.texi (Header Commands, Insertion): Use C-c C-f C-i for
+       Importance: instead of C-c C-u.  Move to Header Commands from
+       Insertion. Suggested by Per Abrahamsen <abraham@dina.kvl.dk>.
+
 2001-11-17  Simon Josefsson  <jas@extundo.com>
 
        * message.texi (Insertion): Use C-c C-u for Importance: instead of

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index baebd89..af48338 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -337,8 +337,8 @@ Message \e$B$O%U%)%m!<%"%C%W$,$I$3$K9T$/$+$rIaDL$NJ}K!$r;H$C$F7hDj$7$^$9$,!"\e(B
 @node Header Commands
 @section \e$B%X%C%@!<L?Na\e(B
 
-\e$B$3$l$i$NA4$F$NL?Na$OEv$N%X%C%@!<$K0\F0$7$^$9!#$b$7$=$l$,B8:_$7$J$$$H!"$=\e(B
-\e$B$l$OA^F~$5$l$^$9!#\e(B
+\e$B$3$l$i$NA4$F$NL?Na$OEv$N%X%C%@!<$K0\F0$7$^$9\e(B (@samp{Importance:} \e$B7O$N%3\e(B
+\e$B%^%s%I$ONc30\e(B)\e$B!#$b$7$=$l$,B8:_$7$J$$$H!"$=$l$OA^F~$5$l$^$9!#\e(B
 
 @table @kbd
 
@@ -401,6 +401,26 @@ Message \e$B$O%U%)%m!<%"%C%W$,$I$3$K9T$/$+$rIaDL$NJ}K!$r;H$C$F7hDj$7$^$9$,!"\e(B
 @kindex C-c C-f C-u
 @findex message-goto-summary
 @code{Summary} \e$B%X%C%@!<$K9T$-$^$9\e(B (@code{message-goto-summary})\e$B!#\e(B
+
+@item C-c C-f C-i
+@kindex C-c C-f C-i
+@findex message-insert-or-toggle-importance
+\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#$3$N%X%C\e(B
+\e$B%@!<$O<u?.<T$K$=$N%a%C%;!<%8$N=EMW@-$rCN$i$;$k$?$a$K;H$o$l$k$b$N$G$9!#$b\e(B
+\e$B$7%P%C%U%!$K$9$G$K$3$N%X%C%@!<$,$"$k>l9g$O!"\e(BRFC 1376 \e$B$K=`$8$?;0$D$N\e(B
+\e$BCM\e(B @samp{low}\e$B!"\e(B@samp{normal} \e$B$*$h$S\e(B @samp{high} \e$B$r=[4D$5$;$^$9!#\e(B
+
+@item M-x message-insert-importance-high
+@kindex M-x message-insert-importance-high
+@findex message-insert-importance-high
+\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
+\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
+
+@item M-x message-insert-importance-low
+@kindex M-x message-insert-importance-low
+@findex message-insert-importance-low
+\e$BCM\e(B @samp{low} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
+\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
 @end table
 
 @node Movement
@@ -461,26 +481,6 @@ message buffer (@code{message-yank-buffer}).
 @kindex C-c M-h
 @findex message-insert-headers
 \e$B%a%C%;!<%8$N%X%C%@!<$rA^F~$7$^$9\e(B (@code{message-insert-headers})\e$B!#\e(B
-
-@item C-c C-u
-@kindex C-c C-u
-@findex message-insert-or-toggle-importance
-\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#$3$N%X%C\e(B
-\e$B%@!<$O<u?.<T$K$=$N%a%C%;!<%8$N=EMW@-$rCN$i$;$k$?$a$K;H$o$l$k$b$N$G$9!#$b\e(B
-\e$B$7%P%C%U%!$K$9$G$K$3$N%X%C%@!<$,$"$k>l9g$O!"\e(BRFC 1376 \e$B$K=`$8$?;0$D$N\e(B
-\e$BCM\e(B @samp{low}\e$B!"\e(B@samp{normal} \e$B$*$h$S\e(B @samp{high} \e$B$r=[4D$5$;$^$9!#\e(B
-
-@item M-x message-insert-importance-high
-@kindex M-x message-insert-importance-high
-@findex message-insert-importance-high
-\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
-\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
-
-@item M-x message-insert-importance-low
-@kindex M-x message-insert-importance-low
-@findex message-insert-importance-low
-\e$BCM\e(B @samp{low} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
-\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
 @end table
 
 @c FIXTGNUS We should provide MIME manual.

diff --git a/texi/message.texi b/texi/message.texi
index 0b3cb0d..e74c195 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -352,8 +352,9 @@ times, you will get back the un-edited message you're responding to.
 @node Header Commands
 @section Header Commands
 
-All these commands move to the header in question.  If it doesn't exist,
-it will be inserted.
+All these commands move to the header in question (except for the
+@samp{Importance:} related commands).  If it doesn't exist, it will be
+inserted.
 
 @table @kbd
 
@@ -417,6 +418,27 @@ Go to the @code{Keywords} header (@code{message-goto-keywords}).
 @findex message-goto-summary
 Go to the @code{Summary} header (@code{message-goto-summary}).
 
+@item C-c C-f C-i
+@kindex C-c C-f C-i
+@findex message-insert-or-toggle-importance
+This inserts the @samp{Importance:} header with a value of
+@samp{high}.  This header is used to signal the importance of the
+message to the receiver.  If the header is already present in the
+buffer, it cycles between the three valid values according to RFC
+1376: @samp{low}, @samp{normal} and @samp{high}.
+
+@item M-x message-insert-importance-high
+@kindex M-x message-insert-importance-high
+@findex message-insert-importance-high
+Insert a @samp{Importance:} header with a value of @samp{high},
+deleting headers if necessary.
+
+@item M-x message-insert-importance-low
+@kindex M-x message-insert-importance-low
+@findex message-insert-importance-low
+Insert a @samp{Importance:} header with a value of @samp{low},
+deleting headers if necessary.
+
 @end table
 
 
@@ -483,27 +505,6 @@ Insert a signature at the end of the buffer
 @findex message-insert-headers
 Insert the message headers (@code{message-insert-headers}).
 
-@item C-c C-u
-@kindex C-c C-u
-@findex message-insert-or-toggle-importance
-This inserts the @samp{Importance:} header with a value of
-@samp{high}.  This header is used to signal the importance of the
-message to the receiver.  If the header is already present in the
-buffer, it cycles between the three valid values according to RFC
-1376: @samp{low}, @samp{normal} and @samp{high}.
-
-@item M-x message-insert-importance-high
-@kindex M-x message-insert-importance-high
-@findex message-insert-importance-high
-Insert a @samp{Importance:} header with a value of @samp{high},
-deleting headers if necessary.
-
-@item M-x message-insert-importance-low
-@kindex M-x message-insert-importance-low
-@findex message-insert-importance-low
-Insert a @samp{Importance:} header with a value of @samp{low},
-deleting headers if necessary.
-
 @end table