X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Flpath.el;h=3988046a753f3ee90e63e30b275f35216ad81465;hb=2ec37f63143ecc8adf5054974df68062c5498e75;hp=504a6f4f18b25f85fc2a4d560e1856650c274382;hpb=6606be8f93a2d2e749e0082502f516382a1611df;p=gnus

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 504a6f4f1..3988046a7 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -11,9 +11,7 @@
 
 (unless (featurep 'xemacs)
   (maybe-fbind '(pgg-display-output-buffer url-generic-parse-url))
-  (maybe-bind '(help-xref-stack-item
-		url-version w3-meta-charset-content-type-regexp
-		w3-meta-content-type-charset-regexp))
+  (maybe-bind '(help-xref-stack-item url-version))
 
   (when (<= emacs-major-version 23)
     (maybe-bind '(mail-encode-mml)))
@@ -37,8 +35,7 @@
        bookmark-prop-get completion-at-point display-time-event-handler
        epg-check-configuration find-coding-system frame-device gnutls-negotiate
        libxml-parse-html-region recenter-top-bottom rmail-swap-buffers-maybe
-       shr-insert-document w3-do-setup w3-parse-buffer w3-prepare-buffer
-       w3-region w3m-detect-meta-charset w3m-region))
+       shr-insert-document w3m-detect-meta-charset w3m-region))
     (maybe-bind
      '(epa-file-encrypt-to w3m-link-map))))
 
@@ -59,27 +56,29 @@
   (eval-after-load "rmail"
     '(defun rmail-toggle-header (&optional arg)))
   (maybe-fbind
-   '(bookmark-default-handler
-     bookmark-get-bookmark-record bookmark-make-record-default
-     bookmark-prop-get clear-string codepage-setup coding-system-from-name
-     completion-at-point cp-supported-codepages create-image debbugs-gnu
-     delete-overlay detect-coding-string display-time-event-handler
-     epg-check-configuration event-click-count event-end event-start
-     find-coding-systems-for-charsets find-coding-systems-region
-     find-coding-systems-string find-image float-time gnutls-negotiate
-     help-buffer ido-completing-read image-size image-type-available-p
-     insert-image jka-compr-get-compression-info jka-compr-info-uncompress-args
-     jka-compr-info-uncompress-message jka-compr-info-uncompress-program
-     jka-compr-installed-p jka-compr-make-temp-name libxml-parse-html-region
-     mail-abbrevs-setup make-mode-line-mouse-map make-network-process
-     make-term mouse-minibuffer-check mouse-movement-p mouse-scroll-subr
-     overlay-lists pgg-display-output-buffer posn-point posn-window
-     process-type put-image read-char-choice read-event recenter-top-bottom
+   '(beginning-of-visual-line
+     bookmark-default-handler bookmark-get-bookmark-record
+     bookmark-make-record-default bookmark-prop-get clear-string codepage-setup
+     coding-system-from-name completion-at-point cp-supported-codepages
+     create-image debbugs-gnu delete-overlay detect-coding-string
+     display-time-event-handler epg-check-configuration event-click-count
+     event-end event-start find-coding-systems-for-charsets
+     find-coding-systems-region find-coding-systems-string find-image
+     float-time gnutls-negotiate help-buffer ido-completing-read image-size
+     image-type-available-p insert-image jka-compr-get-compression-info
+     jka-compr-info-uncompress-args jka-compr-info-uncompress-message
+     jka-compr-info-uncompress-program jka-compr-installed-p
+     jka-compr-make-temp-name libxml-parse-html-region mail-abbrevs-setup
+     make-mode-line-mouse-map make-network-process make-term
+     mouse-minibuffer-check mouse-movement-p mouse-scroll-subr overlay-lists
+     pgg-display-output-buffer posn-point posn-window process-type put-image
+     read-char-choice read-event recenter-top-bottom
      rmail-msg-restore-non-pruned-header rmail-swap-buffers-maybe
      select-safe-coding-system set-network-process-option shr-insert-document
-     sort-coding-systems term-char-mode term-mode track-mouse ucs-to-char
-     url-generic-parse-url url-insert-file-contents vcard-pretty-print
-     w3-parse-buffer w3m-detect-meta-charset w3m-region window-edges))
+     sort-coding-systems spam-initialize term-char-mode term-mode track-mouse
+     ucs-to-char url-generic-parse-url url-insert-file-contents
+     vcard-pretty-print w3m-detect-meta-charset w3m-region
+     window-edges network-interface-list))
   (maybe-bind
    '(adaptive-fill-first-line-regexp
      buffer-display-table buffer-save-without-query completion-styles
@@ -93,8 +92,7 @@
      rmail-default-rmail-file rmail-insert-mime-forwarded-message-function
      show-trailing-whitespace smtpmail-default-smtp-server
      temporary-file-directory tool-bar-mode transient-mark-mode url-version
-     w3-meta-charset-content-type-regexp w3m-link-map
-     w3-meta-content-type-charset-regexp))
+     w3m-link-map))
 
   (when (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
 	    (featurep 'sxemacs))