Synch with Gnus.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f32980b..5e19f99 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-15 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gpg.el (gpg-command-alist): Alist may not be defined.
+
+2000-12-14 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gpg.el (gpg-make-temp-file): Don't check file-modes of M$Windows.
+
 2000-12-14 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gpg.el (gpg-passphrase-store): Don't activate timer if it is live.
@@ -12,7 +20,7 @@
        (gpg-with-temp-files): Ditto.
        (gpg-show-result): Ditto.
 
-2000-11-08  Bj\e-Aörn Torkelsson  <torkel@hpc2n.umu.se>\e$)A
+2000-11-08  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
 
        * gpg.el: In Xemacs it is called point-at-eol, not
        line-end-position
@@ -29,7 +37,7 @@
 
        * gpg.el (gpg-verify): The last argument of apply is a list.
        (gpg-encrypt): Add passphrase as a parameter.
-       
+
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 523728c..0a1b765 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -141,12 +141,19 @@
 
 ;;; Customization: Widgets:
 
-(define-widget 'gpg-command-alist 'alist
-  "An association list for GnuPG command names."
-  :key-type '(symbol :tag   "Abbreviation")
-  :value-type '(string :tag "Program name")
-  :convert-widget 'widget-alist-convert-widget
-  :tag "Alist")
+(if (get 'alist 'widget-type)
+    (define-widget 'gpg-command-alist 'alist
+      "An association list for GnuPG command names."
+      :key-type '(symbol :tag   "Abbreviation")
+      :value-type '(string :tag "Program name")
+      :convert-widget 'widget-alist-convert-widget
+      :tag "Alist")
+    (define-widget 'gpg-command-alist 'repeat
+      "An association list for GnuPG command names."
+      :args '((cons :format "%v"
+                   (symbol :tag   "Abbreviation")
+                   (string :tag "Program name")))
+      :tag "Alist"))
 
 (define-widget 'gpg-command-program 'choice
   "Widget for entering the name of a program (mostly the GnuPG binary)."
@@ -614,7 +621,8 @@ adjust according to `gpg-command-passphrase-env'."
       ;; make-temp-name doesn't create the file, and an ordinary
       ;; write-file operation is prone to nasty symlink attacks if the
       ;; temporary file resides in a world-writable directory.
-      (unless (eq (file-modes gpg-temp-directory) 448) ; mode 0700
+      (unless (or (memq system-type '(windows-nt cygwin32 win32 w32 mswindows))
+                 (eq (file-modes gpg-temp-directory) 448)) ; mode 0700
        (error "Directory for temporary files must have mode 0700."))
       (setq name (make-temp-name name))
       (let ((mode (default-file-modes)))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7ea637..2cbdca5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2000-12-17 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-extern.el (mm-inline-external-body): g-a-m-h may be a handle.
+
+       * mm-util.el (mm-enable-multibyte-mule4): Test charsetp.
+       (mm-disable-multibyte-mule4): Ditto.
+       (mm-with-unibyte-current-buffer-mule4): Ditto.
+
+2000-12-15 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * pop3.el (pop3-movemail): Use binary.
+       (pop3-movemail-file-coding-system): Removed.
+
 2000-12-14 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-charset-synonym-alist): Add cn-gb.

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index e9c07fb..5e58a12 100644 (file)
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -144,7 +144,10 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
            (unless good
              (mm-destroy-parts handles))))
        (mm-handle-set-cache handle handles))
-      (push handles gnus-article-mime-handles))
+      (if (listp (car gnus-article-mime-handles))
+         (push handles gnus-article-mime-handles)
+       (setq gnus-article-mime-handles
+             (list handles gnus-article-mime-handles))))
     (unless no-display
       (save-excursion
        (save-restriction

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index a1a9de7..77337e5 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -238,6 +238,7 @@ Only used in Emacs Mule 4."
   (when (and (fboundp 'set-buffer-multibyte)
              (boundp 'enable-multibyte-characters)
             (default-value 'enable-multibyte-characters)
+            (fboundp 'charsetp)
             (not (charsetp 'eight-bit-control)))
     (set-buffer-multibyte t)))
 
@@ -245,6 +246,7 @@ Only used in Emacs Mule 4."
   "Disable multibyte in the current buffer.
 Only used in Emacs Mule 4."
   (when (and (fboundp 'set-buffer-multibyte)
+            (fboundp 'charsetp)
             (not (charsetp 'eight-bit-control)))
     (set-buffer-multibyte nil)))
 
@@ -386,6 +388,7 @@ Mule4 only."
   (let ((multibyte (make-symbol "multibyte")))
     `(if (or (featurep 'xemacs)
             (not (fboundp 'set-buffer-multibyte))
+            (not (fboundp 'charsetp))
             (charsetp 'eight-bit-control)) ;; For Emacs Mule 4 only.
         (progn
           ,@forms)