Synch with Oort Gnus.

* message.el (message-strip-special-text-properties): Default to nil
 temporarily (it should be automated).
(message-forbidden-properties): Undo last change.
(message-strip-forbidden-properties): Undo last change.

diff --git a/ChangeLog b/ChangeLog
index e686c89..148e6ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/message.el (message-strip-special-text-properties): Default
+       to nil temporarily (it should be automated).
+       (message-forbidden-properties): Undo last change.
+       (message-strip-forbidden-properties): Undo last change; synch with
+       Oort Gnus.
+
 2001-11-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/message.el (message-forbidden-properties): Defcustom; make

diff --git a/etc/gnus/important.xpm b/etc/gnus/important.xpm
index aa23264..e972fac 100644 (file)
--- a/etc/gnus/important.xpm
+++ b/etc/gnus/important.xpm
@@ -7,21 +7,21 @@ static char *magick[] = {
 /* pixels */
 "wwwwwwwwwwwwwwwwwwwwwwww",
 "wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwww!!wwwwwwwwwwwww",
 "wwwwwwwww!!!wwwwwwwwwwww",
+"wwwwwwwww!!!wwwwwwwwwwww",
+"wwwwwwww!!!!!wwwwwwwwwww",
 "wwwwwwww!!!!!wwwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
+"wwwwwww!!!!!!!wwwwwwwwww",
 "wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwww!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwww!!!!!wwwwwwwwwwww",
-"wwwwwwww!!!!wwwwwwwwwwww",
-"wwwwwwww!!!!wwwwwwwwwwww",
 "wwwwwwww!!!!!wwwwwwwwwww",
-"wwwwwwwww!!!!wwwwwwwwwww",
+"wwwwwwww!!!!!wwwwwwwwwww",
+"wwwwwwwww!!!wwwwwwwwwwww",
 "wwwwwwwwwwwwwwwwwwwwwwww",
 "wwwwwwwww!!!wwwwwwwwwwww",
 "wwwwwwww!!!!!wwwwwwwwwww",

diff --git a/etc/gnus/unimportant.xpm b/etc/gnus/unimportant.xpm
index 6822346..4298224 100644 (file)
--- a/etc/gnus/unimportant.xpm
+++ b/etc/gnus/unimportant.xpm
@@ -7,26 +7,26 @@ static char *magick[] = {
 /* pixels */
 "wwwwwwwwwwwwwwwwwwwwwwww",
 "wwwwwwwwwwwwwwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww",
-"ww!!wwwwww!!wwwwww!!wwww",
-"www!!wwwww!!wwwww!!wwwww",
-"wwww!!wwww!!wwww!!wwwwww",
-"wwwww!!www!!www!!wwwwwww",
-"wwwwww!!ww!!ww!!wwwwwwww",
-"wwwwwww!!w!!w!!wwwwwwwww",
-"wwwwwwww!!!!!!wwwwwwwwww",
-"wwwwwwwww!!!!wwwwwwwwwww",
-"wwwwwwwwww!!wwwwwwwwwwww"
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"ww!!!wwwwww!!!wwwwww!!!w",
+"www!!!wwwww!!!wwwww!!!ww",
+"wwww!!!wwww!!!wwww!!!www",
+"wwwww!!!www!!!www!!!wwww",
+"wwwwww!!!ww!!!ww!!!wwwww",
+"wwwwwww!!!w!!!w!!!wwwwww",
+"wwwwwwww!!!!!!!!!wwwwwww",
+"wwwwwwwww!!!!!!!wwwwwwww",
+"wwwwwwwwww!!!!!wwwwwwwww",
+"wwwwwwwwwww!!!wwwwwwwwww",
+"wwwwwwwwwwwwwwwwwwwwwwww",
+"wwwwwwwwwwwwwwwwwwwwwwww"
 };

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f0e70f..f44f4c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2001-11-18 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnfolder.el (nnfolder-read-folder): Use group instead of
+       nnfolder-current-group.
+       Suggested by Lorentey Karoly <lorentey@elte.hu>.
+
+2001-11-17  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-send): Ask user if Fcc/Gcc should be
+       performed when no other sender was specified.
+       Suggested by prj@po.cwru.edu (Paul Jarc).
+
+2001-11-17  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-mode, message-mode-map): Use C-c C-u for
+       Importance: instead of C-c C-p (used by SC).
+
+2001-11-16  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-insert-importance-high) 
+       (message-insert-importance-low): Save point.
+
+       * mail-source.el (mail-source-fetch-imap): Fix BODY.PEEK return
+       value.
+
+2001-11-16  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * message.el (message-strip-special-text-properties): New option.
+       (message-strip-forbidden-properties): Obey it.
+
 2001-11-14  Sam Steingold  <sds@gnu.org>
 
        * gnus-score.el: Fixed some doc strings to properly quote symbols.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index e29e72a..6cc9e78 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -925,10 +925,11 @@ This only works when `display-time' is enabled."
                  (push (cons from imap-password) mail-source-password-cache)))
              ;; if predicate is nil, use all uids
              (dolist (uid (imap-search (or predicate "1:*") buf))
-               (when (setq str (if (imap-capability 'IMAP4rev1 buf)
-                                   (imap-fetch uid "BODY.PEEK[]" 'BODYDETAIL
-                                               nil buf)
-                           (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf)))
+               (when (setq str
+                           (if (imap-capability 'IMAP4rev1 buf)
+                               (caddar (imap-fetch uid "BODY.PEEK[]"
+                                                   'BODYDETAIL nil buf))
+                             (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf)))
                  (push uid remove)
                  (insert "From imap " (current-time-string) "\n")
                  (save-excursion

diff --git a/lisp/message.el b/lisp/message.el
index 4f42672..b34ec13 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1741,7 +1741,7 @@ Point is left at the beginning of the narrowed-to region."
 
   (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-p" 'message-insert-or-toggle-importance)
+  (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)
@@ -1843,35 +1843,41 @@ Point is left at the beginning of the narrowed-to region."
 ;;
 ;; We use `after-change-functions' to keep special text properties
 ;; that interfer with the normal function of message mode out of the
-;; buffer.
-
-(defcustom message-forbidden-properties
-  '(field insert-behind-hooks insert-in-front-hooks mouse-face
-         point-entered point-left
-         ;;intangible invisible modification-hooks read-only
-         )
-  "List of text properties forbidden in message buffers.
-If you are using tamago version 4 for writing Japanese text, you should
-remove `intangible', `invisible', `modification-hooks' and `read-only'
-from the list."
+;; buffer. 
+
+(defcustom message-strip-special-text-properties nil
+  "Strip special properties from the message buffer.
+
+Emacs has a number of special text properties which can break message
+composing in various ways.  If this option is set, message will strip
+these properties from the message composition buffer.  However, some
+packages like Tamago requires these properties to be present in order
+to work.  If you use one of these packages, turn this option off, and
+hope the message composition doesn't break too bad."
+  :group 'message-various
+  :type 'boolean)
+
+(defconst message-forbidden-properties 
+  ;; No reason this should be clutter up customize.  We make it a
+  ;; property list (rather than a list of property symbols), to be
+  ;; directly useful for `remove-text-properties'.
+  '(field nil read-only nil intangible nil invisible nil 
+         mouse-face nil modification-hooks nil insert-in-front-hooks nil
+         insert-behind-hooks nil point-entered nil point-left nil) 
   ;; Other special properties:
   ;; category, face, display: probably doesn't do any harm.
   ;; fontified: is used by font-lock.
   ;; syntax-table, local-map: I dunno.
   ;; We need to add XEmacs names to the list.
-  :group 'message-various
-  :type '(repeat sexp))
+  "Property list of with properties.forbidden in message buffers.
+The values of the properties are ignored, only the property names are used.")
 
 (defun message-strip-forbidden-properties (begin end &optional old-length)
   "Strip forbidden properties between BEGIN and END, ignoring the third arg.
 This function is intended to be called from `after-change-functions'.
 See also `message-forbidden-properties'."
-  (let ((props message-forbidden-properties)
-       plist)
-    (while props
-      (setq plist (plist-put plist (car props) nil)
-           props (cdr props)))
-    (remove-text-properties begin end plist)))
+  (when message-strip-special-text-properties
+    (remove-text-properties begin end message-forbidden-properties)))
 
 ;;;###autoload
 (define-derived-mode message-mode text-mode "Message"
@@ -2344,16 +2350,18 @@ Prefix arg means justify as well."
 (defun message-insert-importance-high ()
   "Insert header to mark message as important."
   (interactive)
-  (message-remove-header "Importance")
-  (message-goto-eoh)
-  (insert "Importance: high\n"))
+  (save-excursion
+    (message-remove-header "Importance")
+    (message-goto-eoh)
+    (insert "Importance: high\n")))
 
 (defun message-insert-importance-low ()
   "Insert header to mark message as unimportant."
   (interactive)
-  (message-remove-header "Importance")
-  (message-goto-eoh)
-  (insert "Importance: low\n"))
+  (save-excursion
+    (message-remove-header "Importance")
+    (message-goto-eoh)
+    (insert "Importance: low\n")))
 
 (defun message-insert-or-toggle-importance ()
   "Insert a \"Importance: high\" header, or cycle through the header values.

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index aac03e0..7a8f855 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -964,7 +964,7 @@ deleted.  Point is left where the deleted region was."
              (nnfolder-insert-newsgroup-line
               (cons nil
                     (setq newnum
-                          (nnfolder-active-number nnfolder-current-group))))
+                          (nnfolder-active-number group))))
              (when novbuf
                (let ((headers (nnfolder-parse-head newnum (point-min)
                                                    (point-max))))
@@ -981,7 +981,7 @@ deleted.  Point is left where the deleted region was."
          (setq newscantime (visited-file-modtime))
          (if scantime
              (setcdr scantime (list newscantime))
-           (push (list nnfolder-current-group newscantime)
+           (push (list group newscantime)
                  nnfolder-scantime-alist))
          ;; Save nov.
          (when novbuf

diff --git a/texi/ChangeLog b/texi/ChangeLog
index e987346..7566a71 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-17  Simon Josefsson  <jas@extundo.com>
+
+       * message.texi (Insertion): Use C-c C-u for Importance: instead of
+       C-c C-p (used by SC).
+
 2001-11-15  Simon Josefsson  <jas@extundo.com>
 
        * message.texi (Insertion): Add C-c C-p,

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 349e510..baebd89 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -462,8 +462,8 @@ message buffer (@code{message-yank-buffer}).
 @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-p
-@kindex C-c C-p
+@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

diff --git a/texi/message.texi b/texi/message.texi
index 112fb99..0b3cb0d 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -483,8 +483,8 @@ 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-p
-@kindex C-c C-p
+@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