X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Flpath.el;h=1f49e5b6588eb780cb3128293daf82ed67c4c778;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=7d1c2e33858f8ed75d4a8179d7564fd13447a5b0;hpb=88dfd27d0ea493d180e919e716c7880b9818ddfb;p=elisp%2Fgnus.git-

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 7d1c2e3..1f49e5b 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -10,25 +10,21 @@
   (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-detect-meta-charset w3m-region x-focus-frame))
+	       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
+	      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)))