Merge from emacs--devo--0

[gnus] / lisp / lpath.el

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 38ad716..733af3e 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -15,6 +15,10 @@
                url-version w3-meta-charset-content-type-regexp
                w3-meta-content-type-charset-regexp))
 
+  (when (>= emacs-major-version 23)
+    (maybe-fbind
+     '(codepage-setup)))
+
   (when (<= emacs-major-version 22)
     (defun nnkiboze-score-file (a))
     (maybe-fbind
@@ -59,27 +63,34 @@
      mouse-minibuffer-check mouse-movement-p mouse-scroll-subr
      pgg-display-output-buffer posn-point posn-window put-image read-event
      select-safe-coding-system sort-coding-systems track-mouse
-     url-generic-parse-url url-http-file-exists-p vcard-pretty-print
-     w3m-detect-meta-charset w3m-region window-edges))
+     url-generic-parse-url url-http-file-exists-p url-insert-file-contents
+     vcard-pretty-print 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 eudc-protocol filladapt-mode
-     gnus-agent-expire-current-dirs help-xref-stack-item line-spacing
-     mark-active mouse-selection-click-count mouse-selection-click-count-buffer
-     ps-print-color-p rmail-insert-mime-forwarded-message-function
-     show-trailing-whitespace tool-bar-mode transient-mark-mode url-version
-     w3-meta-charset-content-type-regexp w3-meta-content-type-charset-regexp))
+     default-enable-multibyte-characters 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-insert-mime-forwarded-message-function
+     show-trailing-whitespace tool-bar-mode transient-mark-mode
+     url-version w3-meta-charset-content-type-regexp
+     w3-meta-content-type-charset-regexp))
 
   (when (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
            (featurep 'sxemacs))
     (maybe-fbind
      '(custom-autoload
        display-graphic-p display-images-p display-visual-class
-       select-frame-set-input-focus unicode-precedence-list w32-focus-frame
-       x-focus-frame))
+       get-display-table put-display-table select-frame-set-input-focus
+       unicode-precedence-list w32-focus-frame x-focus-frame))
     (maybe-bind
-     '(default-file-name-coding-system)))
+     '(default-file-name-coding-system scroll-margin)))
+
+  (when (and (= emacs-major-version 21) (= emacs-minor-version 4))
+    (maybe-fbind
+     '(propertize)))
 
   (unless (featurep 'mule)
     (maybe-fbind