Fix last fix.

[gnus] / lisp / lpath.el

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 20e1d14..b2aa91c 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -26,15 +26,14 @@
     (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))
+       rmail-swap-buffers-maybe w3-do-setup w3-parse-buffer w3-prepare-buffer
+       w3-region w32-focus-frame w3m-detect-meta-charset w3m-region))
     (maybe-bind
      '(w3m-link-map)))
 
@@ -44,16 +43,18 @@
     (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
+       delete-annotation delete-extent device-connection
+       device-on-window-system-p dfw-device events-to-keys find-face
+       font-lock-set-defaults get-char-table glyph-height glyph-image
+       glyph-width glyphp 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
+       set-keymap-default-binding specifier-spec-list 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-edges window-pixel-height
        window-pixel-width))
     (maybe-bind
      '(completion-styles
@@ -74,7 +75,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)))
@@ -93,11 +93,11 @@
      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))
+     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
+     buffer-display-table completion-styles 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
@@ -118,12 +118,8 @@
        string-as-multibyte timer-set-function unicode-precedence-list
        unicode-to-char w32-focus-frame x-focus-frame))
     (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 +144,3 @@
        enable-multibyte-characters file-name-coding-system))))
 
 (provide 'lpath)
-
-;;; arch-tag: d1ad864f-dca6-4d21-aa3f-be3248e66dba