Synch with Oort Gnus.

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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index ea9333e..6e33af8 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -23,6 +23,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
@@ -32,7 +33,7 @@
               frames-on-display-list
               make-mode-line-mouse-map
               rmail-select-summary rmail-summary-exists rmail-update-summary
-              rmail-toggle-header
+              rmail-msg-is-pruned rmail-msg-restore-non-pruned-header
               sc-cite-regexp set-font-family set-font-size temp-directory
               string-as-multibyte
               tool-bar-add-item tool-bar-add-item-from-menu
@@ -50,6 +51,7 @@
              display-time-mail-function imap-password mail-mode-hook
              filladapt-mode
              mc-pgp-always-sign
+             gnus-message-group-art
              gpg-unabbrev-trust-alist
              nnoo-definition-alist
              url-current-callback-func url-be-asynchronous
@@ -85,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
@@ -116,25 +119,40 @@
                 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-variables
+(let ((functions
        (cond
        ((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 shell-command-to-string
-           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))))))
-  (maybe-fbind (car functions-variables))
-  (maybe-bind (car (cdr functions-variables))))
+        '(function-max-args smiley-encode-buffer))))
+      (common-fns
+       nil)
+      (variables
+       (cond
+       ((featurep 'xemacs)
+        nil)
+       ((>= emacs-major-version 21)
+        nil)
+       ((boundp 'MULE)
+        nil)
+       (t
+        nil)))
+      (common-vars
+       '(navi2ch-mona-font)))
+  (maybe-fbind functions)
+  (maybe-fbind common-fns)
+  (maybe-bind variables)
+  (maybe-bind common-vars))
 
 (defun nnkiboze-score-file (a)
   )