Synch with Oort Gnus.

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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 5f11c24..df816d5 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -9,20 +9,24 @@
 (defun maybe-bind (args)
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
-(maybe-fbind '(create-image
-              display-graphic-p display-time-event-handler 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
+(maybe-fbind '(bbdb-records
+              bbdb-search bbdb-create-internal
+              create-image display-graphic-p
+              display-time-event-handler 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
               tool-bar-add-item tool-bar-add-item-from-menu
-              vcard-pretty-print w32-focus-frame w3m-charset-to-coding-system
-              x-focus-frame))
+              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))
 (maybe-bind '(filladapt-mode
              mc-pgp-always-sign rmail-enable-mime-composing
              rmail-insert-mime-forwarded-message-function
              w3m-cid-retrieve-function-alist w3m-current-buffer
-             w3m-meta-content-type-charset-regexp w3m-mode-map))
+             w3m-meta-content-type-charset-regexp w3m-minor-mode-map))
 
 (if (featurep 'xemacs)
     (progn
@@ -39,7 +43,7 @@
                     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))
+                    window-edges w3m-region))
       (maybe-bind '(adaptive-fill-first-line-regexp
                    buffer-display-table buffer-file-coding-system
                    current-language-environment
@@ -49,7 +53,7 @@
                    mouse-selection-click-count-buffer pgg-parse-crc24
                    temporary-file-directory transient-mark-mode)))
   (maybe-fbind '(bbdb-complete-name
-                bbdb-records delete-annotation device-connection dfw-device
+                delete-annotation 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
@@ -68,13 +72,13 @@
 (let ((functions
        (cond
        ((featurep 'xemacs)
-        nil)
+        '(frame-char-height frame-char-width))
        ((>= emacs-major-version 21)
         '(function-max-args smiley-encode-buffer))
        ((boundp 'MULE)
-        '(coding-system-get
-          coding-system-list coding-system-to-mime-charset compose-mail
-          file-name-extension find-coding-systems-for-charsets
+        '(charsetp
+          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
           smiley-encode-buffer smtpmail-send-it))
        (t
@@ -84,11 +88,12 @@
       (variables
        (cond
        ((featurep 'xemacs)
-        nil)
+        '(font-lock-defaults))
        ((>= emacs-major-version 21)
         nil)
        ((boundp 'MULE)
-        nil)
+        '(adaptive-fill-first-line-regexp
+          default-enable-multibyte-characters enable-multibyte-characters))
        (t
         nil)))
       (common-vars