Merge branch 'master' of https://git.gnus.org/gnus
[gnus] / lisp / lpath.el
index 107fcce..dc2d6cc 100644 (file)
        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-parse-buffer w3-prepare-buffer
-       w3-region w32-focus-frame w3m-detect-meta-charset w3m-region))
+       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
-       device-on-window-system-p 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-edges window-pixel-height
-       window-pixel-width))
-    (maybe-bind
-     '(completion-styles
-       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))
      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 w3-parse-buffer
-     w3m-detect-meta-charset w3m-region window-edges))
+     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 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
+     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 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
        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))
+       unicode-to-char))
     (maybe-bind
      '(header-line-format
        scroll-margin timer-list)))
 
-  (when (and (= emacs-major-version 21) (= emacs-minor-version 4))
-    (maybe-fbind
-     '(propertize)))
-
   (unless (featurep 'mule)
     (maybe-fbind
      '(ccl-execute-on-string