* message.el (message-strip-special-text-properties): Default to t

 because of the new function `message-tamago-not-in-use-p'.

Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 148e6ba..a7a4180 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/message.el (message-strip-special-text-properties): Default
+       to t because of the new function `message-tamago-not-in-use-p'.
+
+2001-11-26  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * make-x.bat: Use parameter "/copy" rather than "copy" for increased
+       dwimishness for old-time DOS users.  From Frank Schmitt
+       <ich@Frank-Schmitt.net>.
+
 2001-11-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/message.el (message-strip-special-text-properties): Default
@@ -63,7 +74,7 @@
 
        * lisp/message.el (rfc822-goto-eoh): Remove.
 
-2001-10-19  Kai Gro\e.A\eN_johann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-19  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        From Frank Schmitt <ich@Frank-Schmitt.net>.
 
        * make-x.bat: Use correct directory structure for XEmacs on Windows.
@@ -161,7 +172,7 @@
 
        * configure.in: Generate texi/ps/Makefile.
 
-2001-09-21  Kai Gro\eN_johann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-09-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * make.bat: Use parameter "/copy" rather than "copy" for increased
        dwimishness for old-time DOS users.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c77bd7..d799138 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2001-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * canlock.el: Remove sha1.el and base64.el stuff.
+
+2001-11-26  Didier Verna  <didier@xemacs.org>
+
+       * nnmbox.el (nnmbox-create-mbox): create the mbox file directory
+       if needed.
+
+2001-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-tamago-not-in-use-p): New function.
+       (message-strip-forbidden-properties): Use it.
+
+2001-11-26  Didier Verna  <didier@xemacs.org>
+
+       * gnus-start.el (gnus-check-first-time-used): only check for
+       existence of .el[d] files.
+
 2001-11-25 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-coding-system-priorities): Add backslash in the doc.

diff --git a/lisp/canlock.el b/lisp/canlock.el
index f1d5b6a..f24a88e 100644 (file)
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -45,8 +45,6 @@
   (require 'cl))
 
 (autoload 'sha1-binary "sha1-el")
-(autoload 'sha1-encode-binary "sha1")
-(autoload 'base64-encode "base64")
 
 (defgroup canlock nil
   "The Cancel-Lock feature."
@@ -54,16 +52,14 @@
 
 (defcustom canlock-sha1-function 'sha1-binary
   "Function to call to make a SHA-1 message digest."
-  :type '(radio (function-item sha1-encode-binary)
-               (function-item sha1-binary)
+  :type '(radio (function-item sha1-binary)
                (function-item canlock-sha1-with-openssl)
                (function :tag "Other"))
   :group 'canlock)
 
 (defcustom canlock-sha1-function-for-verify canlock-sha1-function
   "Function to call to make a SHA-1 message digest for verifying."
-  :type '(radio (function-item sha1-encode-binary)
-               (function-item sha1-binary)
+  :type '(radio (function-item sha1-binary)
                (function-item canlock-sha1-with-openssl)
                (function :tag "Other"))
   :group 'canlock)

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 84801c7..b570854 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1199,10 +1199,8 @@ for new groups, and subscribe the new groups as zombies."
   (catch 'ended
     ;; First check if any of the following files exist.  If they do,
     ;; it's not the first time the user has used Gnus.
-    (dolist (file (list gnus-current-startup-file
-                       (concat gnus-current-startup-file ".el")
+    (dolist (file (list (concat gnus-current-startup-file ".el")
                        (concat gnus-current-startup-file ".eld")
-                       gnus-startup-file
                        (concat gnus-startup-file ".el")
                        (concat gnus-startup-file ".eld")))
       (when (file-exists-p file)

diff --git a/lisp/message.el b/lisp/message.el
index 82e3eb7..b32e135 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1856,15 +1856,15 @@ Point is left at the beginning of the narrowed-to region."
 ;; that interfer with the normal function of message mode out of the
 ;; buffer.
 
-(defcustom message-strip-special-text-properties nil
+(defcustom message-strip-special-text-properties t
   "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."
+packages 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)
 
@@ -1883,11 +1883,26 @@ hope the message composition doesn't break too bad."
   "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)
+  "Return t when tamago version 4 is not in use at the cursor position.
+Tamago version 4 is a popular input method for writing Japanese text.
+It uses the properties `intangible', `invisible', `modification-hooks'
+and `read-only' when translating ascii or kana text to kanji text.
+These properties are essential to work, so we should never strip them."
+  (not (and (boundp 'egg-modefull-mode)
+           (symbol-value 'egg-modefull-mode)
+           (or (memq (get-text-property pos 'intangible)
+                     '(its-part-1 its-part-2))
+               (get-text-property pos 'egg-end)
+               (get-text-property pos 'egg-lang)
+               (get-text-property pos 'egg-start)))))
+
 (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'."
-  (when message-strip-special-text-properties
+  (when (and message-strip-special-text-properties
+            (message-tamago-not-in-use-p begin))
     (remove-text-properties begin end message-forbidden-properties)))
 
 ;;;###autoload

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index a20777f..966e468 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -616,7 +616,9 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
   (when (not (file-exists-p nnmbox-mbox-file))
     (let ((nnmail-file-coding-system
           (or nnmbox-file-coding-system-for-write
-              nnmbox-file-coding-system)))
+              nnmbox-file-coding-system))
+         (dir (file-name-directory nnmbox-mbox-file)))
+      (and dir (gnus-make-directory dir))
       (nnmail-write-region 1 1 nnmbox-mbox-file t 'nomesg))))
 
 (defun nnmbox-read-mbox ()

diff --git a/make-x.bat b/make-x.bat
index f141851..d79340d 100644 (file)
--- a/make-x.bat
+++ b/make-x.bat
@@ -3,7 +3,6 @@
 rem Modified once more by Frank Schmitt (ich@Frank-Schmitt.net)\r
 rem Modified by ShengHuo Zhu (zsh@cs.rochester.edu)\r
 rem Originally from make.bat by David Charlap (shamino@writeme.com)\r
-rem\r
 \r
 rem Clear PWD so emacs doesn't get confused\r
 set GNUS_PWD_SAVE=%PWD%\r
@@ -16,6 +15,7 @@ set emacs=xemacs.exe
 cd lisp\r
 call %1\%emacs% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile\r
 if not "%2" == "copy" goto info\r
+if not "%2" == "/copy" goto info\r
 attrib -r %1\..\..\xemacs-packages\lisp\gnus\*.*\r
 copy *.el* %1\..\..\xemacs-packages\lisp\gnus\r
 \r
@@ -26,6 +26,7 @@ cd ..\texi
 %EMACSINFO% emacs-mime.texi\r
 %EMACSINFO% gnus.texi\r
 if not "%2" == "copy" goto done\r
+if not "%2" == "/copy" goto done\r
 copy gnus %1\..\..\xemacs-packages\info\r
 copy gnus-?? %1\..\..\xemacs-packages\info\r
 copy message %1\..\..\xemacs-packages\info\r
@@ -40,12 +41,12 @@ cd ..
 goto end\r
 \r
 :usage\r
-echo Usage: make :xemacs-dir: [copy]\r
+echo Usage: make-x.bat :xemacs-dir: [/copy]\r
 echo.\r
 echo where: :xemacs-dir: is the directory you installed xemacs in \r
 echo                     (the directory where xemacs.exe is situated)\r
 echo                    eg. C:\Programme\XEmacs\XEmacs-21.4.3\i586-pc-win32\r
-echo        copy indicates that the compiled files should be copied to your\r
+echo        /copy indicates that the compiled files should be copied to your\r
 echo             emacs lisp, info, and etc directories\r
 echo.\r
 echo Note: If you have Emacs/w3 you should set the environment variable \r