Synch to No Gnus 200510111141.

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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index db11ae0..1f49e5b 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -22,13 +22,9 @@
               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
+             filladapt-mode rmail-insert-mime-forwarded-message-function
              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-minor-mode-map))
+             w3-meta-content-type-charset-regexp))
 
 (if (featurep 'xemacs)
     (progn
@@ -51,15 +47,16 @@
   (maybe-fbind '(bbdb-complete-name
                 delete-annotation delete-extent device-connection dfw-device
                 events-to-keys font-lock-set-defaults frame-device
-                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
+                get-char-table glyph-height glyph-width ldap-search-entries
+                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 window-pixel-height
                 window-pixel-width))
-  (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map)))
+  (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map
+                                      show-nonbreak-escape)))
 
 (when (and (featurep 'xemacs)
           (not (featurep 'mule)))