* message.el (message-forbidden-properties): Defcustom; make it a list;

 don't include `intangible', `invisible', `modification-hooks' or `read-only'.
(message-strip-forbidden-properties): Convert the value of
 `message-forbidden-properties' to plist.

and synch gnus-score.el with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 63424ef..e686c89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-11-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/message.el (message-forbidden-properties): Defcustom; make
+       it a list; don't include `intangible', `invisible',
+       `modification-hooks' or `read-only'.
+       (message-strip-forbidden-properties): Convert the value of
+       `message-forbidden-properties' to plist.
+
+2001-11-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * lisp/gnus-group.el (gnus-group-group-map): Bind `G n' key to the
        command `gnus-group-make-shimbun-group'.
        (gnus-group-group-menu): Add `gnus-group-make-shimbun-group'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e51534..6f0e70f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-14  Sam Steingold  <sds@gnu.org>
+
+       * gnus-score.el: Fixed some doc strings to properly quote symbols.
+
 2001-11-15  Simon Josefsson  <jas@extundo.com>
 
        Support "Importance:" header in Message.

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 497d93b..ba7bd65 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -60,10 +60,10 @@ Each element of this alist should be of the form
 If the name of a group is matched by REGEXP, the corresponding scorefiles
 will be used for that group.
 The first match found is used, subsequent matching entries are ignored (to
-use multiple matches, see gnus-score-file-multiple-match-alist).
+use multiple matches, see `gnus-score-file-multiple-match-alist').
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
+`gnus-score-find-score-files-function'."
   :group 'gnus-score-files
   :type '(repeat (cons regexp (repeat file))))
 
@@ -76,10 +76,10 @@ If the name of a group is matched by REGEXP, the corresponding scorefiles
 will be used for that group.
 If multiple REGEXPs match a group, the score files corresponding to each
 match will be used (for only one match to be used, see
-gnus-score-file-single-match-alist).
+`gnus-score-file-single-match-alist').
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
+`gnus-score-find-score-files-function'."
   :group 'gnus-score-files
   :type '(repeat (cons regexp (repeat file))))
 
@@ -102,9 +102,9 @@ files do not actually have to exist.
 
 Predefined values are:
 
-gnus-score-find-single: Only apply the group's own score file.
-gnus-score-find-hierarchical: Also apply score files from parent groups.
-gnus-score-find-bnews: Apply score files whose names matches.
+`gnus-score-find-single': Only apply the group's own score file.
+`gnus-score-find-hierarchical': Also apply score files from parent groups.
+`gnus-score-find-bnews': Apply score files whose names matches.
 
 See the documentation to these functions for more information.
 
@@ -1537,7 +1537,7 @@ THREAD is expected to contain a list of the form `(PARENT [CHILD1
 CHILD2 ...])' where PARENT is a header array and each CHILD is a list
 of the same form as THREAD.  The empty list `nil' is valid.  For each
 article in the tree, the score of the corresponding entry in
-GNUS-NEWSGROUP-SCORED is adjusted by SCORE-ADJUST."
+`gnus-newsgroup-scored' is adjusted by SCORE-ADJUST."
   (while thread
     (let ((head (car thread)))
       (if (listp head)
@@ -1555,7 +1555,7 @@ GNUS-NEWSGROUP-SCORED is adjusted by SCORE-ADJUST."
 A root is an article with no references.  An orphan is an article
 which has references, but is not connected via its references to a
 root article.  This function finds all the orphans, and adjusts their
-score in GNUS-NEWSGROUP-SCORED by SCORE."
+score in `gnus-newsgroup-scored' by SCORE."
   ;; gnus-make-threads produces a list, where each entry is a "thread"
   ;; as described in the gnus-score-lower-thread docs.  This function
   ;; will be called again (after limiting has been done) if the display
@@ -2722,7 +2722,7 @@ Destroys the current buffer."
 
 (defun gnus-score-find-alist (group)
   "Return list of score files for GROUP.
-The list is determined from the variable gnus-score-file-alist."
+The list is determined from the variable `gnus-score-file-alist'."
   (let ((alist gnus-score-file-multiple-match-alist)
        score-files)
     ;; if this group has been seen before, return the cached entry

diff --git a/lisp/message.el b/lisp/message.el
index 294cabc..4f42672 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1843,28 +1843,35 @@ 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. 
-
-(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) 
+;; 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."
   ;; 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.
-  "Property list of with properties.forbidden in message buffers.
-The values of the properties are ignored, only the property names are used.")
+  :group 'message-various
+  :type '(repeat sexp))
 
 (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'."
-  (remove-text-properties begin end 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)))
 
 ;;;###autoload
 (define-derived-mode message-mode text-mode "Message"