Synch to No Gnus 200504182315.

[elisp/gnus.git-] / lisp / lpath.el

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 0529e9a..db11ae0 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -10,31 +10,31 @@
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
 (maybe-fbind '(Info-directory
-              Info-menu bbdb-create-internal bbdb-records create-image
-              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-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 rmail-insert-mime-forwarded-message-function
-             url-current-object url-package-name url-package-version
+              Info-menu 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 propertize put-image
+              replace-regexp-in-string rmail-msg-is-pruned
+              rmail-msg-restore-non-pruned-header sort-coding-systems
+              tool-bar-add-item tool-bar-add-item-from-menu
+              tool-bar-local-item-from-menu url-generic-parse-url
+              url-http-file-exists-p url-insert-file-contents
+              vcard-pretty-print w32-focus-frame w3m-detect-meta-charset
+              w3m-region x-focus-frame))
+(maybe-bind '(eudc-protocol
+             filladapt-mode 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))
+             w3m-display-inline-images w3m-minor-mode-map))
 
 (if (featurep 'xemacs)
     (progn
       (maybe-fbind '(delete-overlay
-                    event-click-count event-end event-start
-                    find-coding-systems-for-charsets
+                    detect-coding-string eudc-expand-inline event-click-count
+                    event-end event-start find-coding-systems-for-charsets
                     find-coding-systems-region find-coding-systems-string
                     mail-abbrevs-setup mouse-minibuffer-check
                     mouse-movement-p mouse-scroll-subr overlay-lists
@@ -85,29 +85,14 @@
        (cond
        ((featurep 'xemacs)
         '(frame-char-height frame-char-width))
-       ((>= emacs-major-version 21)
-        '(function-max-args smiley-encode-buffer))
-       ((boundp 'MULE)
-        '(charsetp
-          coding-system-base coding-system-get coding-system-list
-          coding-system-to-mime-charset compose-mail
-          file-name-extension find-coding-systems-for-charsets
-          find-coding-systems-region function-max-args get-charset-property
-          read-passwd ;; See the Mule23@1934 file.
-          smiley-encode-buffer smtpmail-send-it))
        (t
         '(function-max-args smiley-encode-buffer))))
       (common-fns
-       nil)
+       '(lsdb-complete-name))
       (variables
        (cond
        ((featurep 'xemacs)
         '(font-lock-defaults))
-       ((>= emacs-major-version 21)
-        nil)
-       ((boundp 'MULE)
-        '(adaptive-fill-first-line-regexp
-          default-enable-multibyte-characters enable-multibyte-characters))
        (t
         nil)))
       (common-vars