X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Flpath.el;h=6adcb66a5c694e3a5fd5e45b908b95038ec103da;hp=7726dff5f9b8895e8b5ff510f83cc606d2b397db;hb=87b53a7cf6962e5529f201fea6ad5b7cfdaa3bae;hpb=fcb10ff38be08239b3c8ea88d05bee527dce5576;ds=sidebyside

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 7726dff5f..6adcb66a5 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -11,9 +11,10 @@
 
 (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 syntax-propertize-function)))
 
   (when (<= emacs-major-version 22)
     (defun ecomplete-add-item (type key text))
@@ -26,17 +27,17 @@
     (defun netrc-machine-user-or-password (mode authinfo-file-or-list machines
 						ports defaults))
     (defun netrc-parse (file))
+    (defun shr-put-image (data alt &optional flags))
     (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 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))
+       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 w3m-detect-meta-charset w3m-region))
     (maybe-bind
-     '(w3m-link-map))))
+     '(epa-file-encrypt-to w3m-link-map))))
 
 (when (featurep 'xemacs)
   (defun canlock-insert-header (&optional id-for-key id-for-lock password))
@@ -51,49 +52,58 @@
 					      ports defaults))
   (defun netrc-parse (file))
   (defun split-line (&optional arg))
+  (defun shr-put-image (data alt &optional flags))
   (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
-     cp-supported-codepages create-image delete-overlay detect-coding-string
-     display-time-event-handler epg-check-configuration event-click-count
-     event-end event-start find-coding-systems-for-charsets
+   '(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 cursor-sensor-mode 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 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
+     float-time gnutls-negotiate font-lock-ensure font-lock-flush 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 put-image read-event
-     recenter-top-bottom rmail-msg-restore-non-pruned-header
-     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))
+     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 spam-initialize string-to-syntax 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 completion-styles completion-styles-alist
-     cursor-in-non-selected-windows default-enable-multibyte-characters
-     default-file-name-coding-system eudc-protocol filladapt-mode
+     buffer-display-table buffer-save-without-query completion-styles
+     completion-styles-alist cursor-in-non-selected-windows
+     default-enable-multibyte-characters default-file-name-coding-system
+     epa-file-encrypt-to 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))
+     mail-encode-mml 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
+     w3m-link-map))
 
   (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 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))
+     '(current-idle-time
+       custom-autoload decode-char display-graphic-p display-images-p
+       display-visual-class 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 set-char-table-range
+       string-as-multibyte timer-set-function unicode-precedence-list
+       unicode-to-char))
     (maybe-bind
      '(header-line-format
        scroll-margin timer-list)))
@@ -102,11 +112,10 @@
     (maybe-fbind
      '(ccl-execute-on-string
        char-charset charsetp coding-system-get find-charset-region
-       get-charset-property pgg-display-output-buffer pgg-parse-crc24-string
-       unicode-precedence-list))
+       get-charset-property pgg-display-output-buffer unicode-precedence-list))
     (maybe-bind
      '(current-language-environment
-       language-info-alist pgg-parse-crc24)))
+       language-info-alist)))
 
   (unless (featurep 'file-coding)
     (maybe-fbind