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

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 0529e9a..1f49e5b 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -10,31 +10,27 @@
   (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-charset-to-coding-system w3m-region x-focus-frame))
-(maybe-bind '(filladapt-mode
-	      mc-pgp-always-sign rmail-insert-mime-forwarded-message-function
-	      url-current-object url-package-name url-package-version
+	       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 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-meta-content-type-charset-regexp
-	      w3m-minor-mode-map))
+	      w3-meta-content-type-charset-regexp))
 
 (if (featurep 'xemacs)
     (progn
       (maybe-fbind '(delete-overlay
-		     event-click-count event-end event-start
-		     find-coding-systems-for-charsets
+		     detect-coding-string eudc-expand-inline event-click-count
+		     event-end event-start find-coding-systems-for-charsets
 		     find-coding-systems-region find-coding-systems-string
 		     mail-abbrevs-setup mouse-minibuffer-check
 		     mouse-movement-p mouse-scroll-subr overlay-lists
@@ -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)))
@@ -85,29 +82,14 @@
        (cond
 	((featurep 'xemacs)
 	 '(frame-char-height frame-char-width))
-	((>= emacs-major-version 21)
-	 '(function-max-args smiley-encode-buffer))
-	((boundp 'MULE)
-	 '(charsetp
-	   coding-system-base 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
-	   read-passwd ;; See the Mule23@1934 file.
-	   smiley-encode-buffer smtpmail-send-it))
 	(t
 	 '(function-max-args smiley-encode-buffer))))
       (common-fns
-       nil)
+       '(lsdb-complete-name))
       (variables
        (cond
 	((featurep 'xemacs)
 	 '(font-lock-defaults))
-	((>= emacs-major-version 21)
-	 nil)
-	((boundp 'MULE)
-	 '(adaptive-fill-first-line-regexp
-	   default-enable-multibyte-characters enable-multibyte-characters))
 	(t
 	 nil)))
       (common-vars