Synch to Gnus 200312250831.

* pop3.el: Autoload `open-ssl-stream' when compiling.

diff --git a/ChangeLog b/ChangeLog
index 5ee69c2..f770820 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/pop3.el: Autoload `open-ssl-stream' when compiling.
+
 2003-12-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * GNUS-NEWS: Mention change of `e' in draft groups.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a1e749..c0dec97 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Remove display-time-event-handler and open-ssl-stream;
+       add delete-extent for Emacs; rearrange bindings assuming w3 may
+       not be available and XEmacs without the file-coding feature may be
+       used.
+
 2003-12-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el (dgnushack-compile): Increase the value for

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 641c154..0529e9a 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -11,40 +11,35 @@
 
 (maybe-fbind '(Info-directory
               Info-menu bbdb-create-internal bbdb-records create-image
-              display-graphic-p display-time-event-handler find-coding-system
-              find-image image-size image-type-available-p insert-image
-              make-mode-line-mouse-map make-temp-file open-ssl-stream
-              propertize put-image replace-regexp-in-string
+              display-graphic-p find-coding-system find-image image-size
+              image-type-available-p insert-image make-mode-line-mouse-map
+              make-temp-file propertize put-image replace-regexp-in-string
               rmail-msg-is-pruned rmail-msg-restore-non-pruned-header
               sort-coding-systems spam-BBDB-register-routine
               spam-enter-ham-BBDB string-to-multibyte tool-bar-add-item
               tool-bar-add-item-from-menu tool-bar-local-item-from-menu
-              url-http-file-exists-p vcard-pretty-print w32-focus-frame
-              w3m-charset-to-coding-system x-focus-frame put-char-table
-              get-char-table))
+              url-generic-parse-url url-http-file-exists-p
+              url-insert-file-contents vcard-pretty-print w32-focus-frame
+              w3m-charset-to-coding-system w3m-region x-focus-frame))
 (maybe-bind '(filladapt-mode
-             mc-pgp-always-sign mm-w3m-mode-map rmail-enable-mime-composing
-             rmail-insert-mime-forwarded-message-function
+             mc-pgp-always-sign rmail-insert-mime-forwarded-message-function
+             url-current-object url-package-name url-package-version
+             w3-meta-charset-content-type-regexp
+             w3-meta-content-type-charset-regexp
              w3m-cid-retrieve-function-alist w3m-current-buffer
              w3m-display-inline-images w3m-meta-content-type-charset-regexp
              w3m-minor-mode-map))
 
 (if (featurep 'xemacs)
     (progn
-      (maybe-fbind '(Info-directory
-                    Info-menu ccl-execute-on-string char-charset charsetp
-                    coding-system-get coding-system-list coding-system-p
-                    decode-coding-region decode-coding-string
-                    define-ccl-program delete-overlay detect-coding-region
-                    encode-coding-region encode-coding-string
+      (maybe-fbind '(delete-overlay
                     event-click-count event-end event-start
-                    find-charset-region find-coding-systems-for-charsets
+                    find-coding-systems-for-charsets
                     find-coding-systems-region find-coding-systems-string
-                    get-charset-property mail-abbrevs-setup
-                    mouse-minibuffer-check mouse-movement-p mouse-scroll-subr
-                    overlay-lists pgg-parse-crc24-string posn-point
-                    posn-window read-event set-buffer-multibyte track-mouse
-                    window-edges w3m-region))
+                    mail-abbrevs-setup mouse-minibuffer-check
+                    mouse-movement-p mouse-scroll-subr overlay-lists
+                    posn-point posn-window read-event set-buffer-multibyte
+                    track-mouse window-edges))
       (maybe-bind '(adaptive-fill-first-line-regexp
                    buffer-display-table buffer-file-coding-system
                    current-language-environment
@@ -52,25 +47,38 @@
                    enable-multibyte-characters gnus-agent-expire-current-dirs
                    language-info-alist mark-active mouse-selection-click-count
                    mouse-selection-click-count-buffer pgg-parse-crc24
-                   temporary-file-directory transient-mark-mode
-                   w3-meta-content-type-charset-regexp
-                   w3-meta-charset-content-type-regexp)))
+                   temporary-file-directory transient-mark-mode)))
   (maybe-fbind '(bbdb-complete-name
-                delete-annotation device-connection dfw-device
+                delete-annotation delete-extent device-connection dfw-device
                 events-to-keys font-lock-set-defaults frame-device
-                glyph-height glyph-width mail-aliases-setup make-annotation
-                make-event make-glyph make-network-process map-extents
-                message-xmas-redefine set-extent-property temp-directory
-                url-generic-parse-url url-insert-file-contents
+                get-char-table glyph-height glyph-width mail-aliases-setup
+                make-annotation make-event make-glyph make-network-process
+                map-extents message-xmas-redefine put-char-table
+                set-extent-property temp-directory
                 valid-image-instantiator-format-p
                 w3-coding-system-for-mime-charset w3-do-setup
-                w3-prepare-buffer w3-region w3m-region window-pixel-height
+                w3-prepare-buffer w3-region window-pixel-height
                 window-pixel-width))
-  (maybe-bind '(help-echo-owns-message
-               mail-mode-hook
-               url-current-object url-package-name url-package-version
-               w3-meta-charset-content-type-regexp
-               w3-meta-content-type-charset-regexp)))
+  (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map)))
+
+(when (and (featurep 'xemacs)
+          (not (featurep 'mule)))
+  (maybe-fbind '(ccl-execute-on-string
+                char-charset charsetp coding-system-get define-ccl-program
+                find-charset-region get-charset-property
+                pgg-parse-crc24-string))
+  (unless (featurep 'file-coding)
+    (maybe-fbind '(coding-system-base
+                  coding-system-list coding-system-p decode-coding-region
+                  decode-coding-string detect-coding-region
+                  encode-coding-region encode-coding-string))))
+
+(defun nnkiboze-score-file (a)
+  )
+
+(defun split-line (&optional arg)
+  )
+
 
 ;; T-gnus.
 (let ((functions
@@ -109,16 +117,4 @@
   (maybe-bind variables)
   (maybe-bind common-vars))
 
-(when (and (featurep 'xemacs)
-          (not (featurep 'mule)))
-  (progn
-    (maybe-fbind '(coding-system-base find-charset-string))))
-
-
-(defun nnkiboze-score-file (a)
-  )
-
-(defun split-line (&optional arg)
-  )
-
 (provide 'lpath)

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 4ac4a75..c47a2e4 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -225,6 +225,9 @@ Argument PORT specifies connecting port."
                         (+ 1 (or (string-match ">" response) -1)))))
       process)))
 
+(eval-when-compile
+  (autoload 'open-ssl-stream "ssl"))
+
 (defun pop3-open-ssl-stream-1 (name buffer host service extra-arg)
   (require 'ssl)
   (let* ((ssl-program-name