Merge remote-tracking branch 'origin/no-gnus'

[gnus] / lisp / lpath.el

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 7726dff..91613a2 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -26,17 +26,18 @@
     (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 w3-do-setup w3-parse-buffer w3-prepare-buffer
+       w3-region 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,31 +52,34 @@
                                              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
+     completion-at-point 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
      find-coding-systems-region find-coding-systems-string find-image
-     float-time help-buffer ido-completing-read image-size
+     float-time gnutls-negotiate 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 shr-insert-document
+     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 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 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
@@ -88,12 +92,13 @@
   (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)))