Synch with Oort Gnus.

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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 0e753b1..018179d 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -14,7 +14,6 @@
 (maybe-fbind '(babel-fetch
               babel-wash create-image decode-coding-string display-graphic-p
               replace-regexp-in-string
-              bbdb-complete-name
               display-time-event-handler
               find-image font-create-object gnus-mule-get-coding-system
               font-lock-set-defaults
@@ -23,6 +22,7 @@
               image-type-from-file-header
               make-symbolic-link
               make-temp-file message-xmas-redefine
+              mail-abbrev-in-expansion-header-p
               mail-aliases-setup mm-copy-tree
               mule-write-region-no-coding-system put-image
               ring-elements
@@ -60,7 +60,8 @@
              rmail-insert-mime-forwarded-message-function
              w3-meta-content-type-charset-regexp
              w3m-cid-retrieve-function-alist w3m-current-buffer
-             w3m-meta-content-type-charset-regexp w3m-mode-map))
+             w3m-meta-content-type-charset-regexp w3m-mode-map
+             url-package-version url-package-name))
 
 (if (featurep 'xemacs)
     (progn
@@ -86,7 +87,8 @@
                     url-retrieve w3-form-encode-xwfu window-at
                     window-edges x-color-values x-popup-menu browse-url
                     frame-char-height frame-char-width
-                    url-generic-parse-url xml-parse-region))
+                    url-generic-parse-url xml-parse-region
+                    make-network-process))
       (maybe-bind '(buffer-display-table
                    buffer-file-coding-system font-lock-defaults
                    global-face-data gnus-article-x-face-too-ugly
@@ -117,7 +119,7 @@
                 specifier-instance url-generic-parse-url
                 valid-image-instantiator-format-p w3-do-setup
                 window-pixel-height window-pixel-width
-                xml-parse-region)))
+                xml-parse-region make-network-process)))
 
 ;; T-gnus.
 (let ((functions
@@ -125,14 +127,14 @@
        ((featurep 'xemacs)
         nil)
        ((>= emacs-major-version 21)
-        '((function-max-args smiley-encode-buffer)))
+        '(function-max-args smiley-encode-buffer))
        ((boundp 'MULE)
-        '((coding-system-get
-           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 smiley-encode-buffer)))
+        '(coding-system-get
+          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 smiley-encode-buffer))
        (t
-        '((function-max-args smiley-encode-buffer)))))
+        '(function-max-args smiley-encode-buffer))))
       (common-fns
        nil)
       (variables