X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Flpath.el;h=7726dff5f9b8895e8b5ff510f83cc606d2b397db;hb=de091d488a09fe5125d556e824baecdfdc9d73f7;hp=2e08821fea6917ffbe3f8a654d650f990b70b2e0;hpb=bda3e8962af0aee90144c3ae8c5360aa4c106d94;p=gnus

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 2e08821fe..7726dff5f 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -26,40 +26,17 @@
     (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines
 						ports defaults))
     (defun netrc-parse (file))
-    (defun nnkiboze-score-file (a))
     (maybe-fbind
      '(Info-index
        Info-index-next Info-menu bbdb-complete-name bookmark-default-handler
        bookmark-get-bookmark-record bookmark-make-record-default
        bookmark-prop-get display-time-event-handler epg-check-configuration
-       find-coding-system frame-device recenter-top-bottom
-       rmail-swap-buffers-maybe w3-do-setup w3-prepare-buffer w3-region
-       w32-focus-frame w3m-detect-meta-charset w3m-region))
+       find-coding-system frame-device 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))
     (maybe-bind
-     '(w3m-link-map)))
-
-  (when (= emacs-major-version 21)
-    (defun canlock-insert-header (&optional id-for-key id-for-lock password))
-    (defun split-line (&optional arg))
-    (maybe-fbind
-     '(clear-string
-       coding-system-aliasee coding-system-from-name custom-autoload
-       delete-annotation delete-extent device-connection dfw-device
-       events-to-keys find-face font-lock-set-defaults get-char-table
-       glyph-height glyph-width help-buffer int-to-char ldap-search-entries
-       mail-aliases-setup make-annotation make-event make-glyph
-       make-network-process map-extents message-xmas-redefine put-char-table
-       run-mode-hooks set-extent-property set-itimer-function
-       set-keymap-default-binding temp-directory time-to-seconds ucs-to-char
-       unicode-precedence-list unicode-to-char url-generic-parse-url
-       url-http-file-exists-p valid-image-instantiator-format-p
-       vcard-pretty-print w3-coding-system-for-mime-charset window-pixel-height
-       window-pixel-width))
-    (maybe-bind
-     '(eudc-protocol
-       filladapt-mode help-echo-owns-message itimer-list ps-print-color-p
-       smtpmail-default-smtp-server w3-meta-charset-content-type-regexp
-       w3-meta-content-type-charset-regexp))))
+     '(w3m-link-map))))
 
 (when (featurep 'xemacs)
   (defun canlock-insert-header (&optional id-for-key id-for-lock password))
@@ -73,7 +50,6 @@
   (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines
 					      ports defaults))
   (defun netrc-parse (file))
-  (defun nnkiboze-score-file (a))
   (defun split-line (&optional arg))
   (eval-after-load "rmail"
     '(defun rmail-toggle-header (&optional arg)))
@@ -85,45 +61,42 @@
      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 help-buffer image-size image-type-available-p insert-image
+     float-time help-buffer ido-completing-read image-size
+     image-type-available-p insert-image libxml-parse-html-region
      mail-abbrevs-setup make-mode-line-mouse-map make-network-process
      mouse-minibuffer-check mouse-movement-p mouse-scroll-subr overlay-lists
      pgg-display-output-buffer posn-point posn-window put-image read-event
      recenter-top-bottom rmail-msg-restore-non-pruned-header
-     rmail-swap-buffers-maybe select-safe-coding-system sort-coding-systems
-     track-mouse ucs-to-char url-generic-parse-url url-http-file-exists-p
-     url-insert-file-contents vcard-pretty-print w3m-detect-meta-charset
-     w3m-region window-edges))
+     rmail-swap-buffers-maybe select-safe-coding-system shr-insert-document
+     sort-coding-systems 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))
   (maybe-bind
    '(adaptive-fill-first-line-regexp
-     buffer-display-table cursor-in-non-selected-windows
-     default-enable-multibyte-characters default-file-name-coding-system
-     eudc-protocol filladapt-mode gnus-agent-expire-current-dirs
-     help-xref-stack-item idna-program installation-directory
-     line-spacing mark-active mouse-selection-click-count
-     mouse-selection-click-count-buffer ps-print-color-p rmail-default-file
-     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))
+     buffer-display-table completion-styles completion-styles-alist
+     cursor-in-non-selected-windows default-enable-multibyte-characters
+     default-file-name-coding-system eudc-protocol filladapt-mode
+     gnus-agent-expire-current-dirs help-xref-stack-item idna-program
+     installation-directory iswitchb-mode iswitchb-temp-buflist line-spacing
+     mark-active mouse-selection-click-count mouse-selection-click-count-buffer
+     ps-print-color-p rmail-default-file 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))
 
   (when (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
 	    (featurep 'sxemacs))
     (maybe-fbind
      '(custom-autoload
        decode-char display-graphic-p display-images-p display-visual-class
-       get-display-table make-temp-file next-single-char-property-change
-       put-display-table select-frame-set-input-focus set-buffer-multibyte
-       string-as-multibyte timer-set-function unicode-precedence-list
-       unicode-to-char w32-focus-frame x-focus-frame))
+       get-display-table help-function-arglist make-temp-file
+       next-single-char-property-change put-display-table
+       select-frame-set-input-focus set-buffer-multibyte string-as-multibyte
+       timer-set-function unicode-precedence-list unicode-to-char))
     (maybe-bind
-     '(scroll-margin
-       timer-list)))
-
-  (when (and (= emacs-major-version 21) (= emacs-minor-version 4))
-    (maybe-fbind
-     '(propertize)))
+     '(header-line-format
+       scroll-margin timer-list)))
 
   (unless (featurep 'mule)
     (maybe-fbind
@@ -148,5 +121,3 @@
        enable-multibyte-characters file-name-coding-system))))
 
 (provide 'lpath)
-
-;;; arch-tag: d1ad864f-dca6-4d21-aa3f-be3248e66dba