Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 294-295)

   - Update from CVS

2008-06-06  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/lpath.el: Fbind propertize for XEmacs 21.4.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-508

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b15cc67..6ab7351 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Fbind propertize for XEmacs 21.4.
+
 2008-06-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnir.el: Move here from ../contrib.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 38ad716..2407a20 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -59,17 +59,20 @@
      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))
@@ -81,6 +84,10 @@
     (maybe-bind
      '(default-file-name-coding-system)))
 
+  (when (and (= emacs-major-version 21) (= emacs-minor-version 4))
+    (maybe-fbind
+     '(propertize)))
+
   (unless (featurep 'mule)
     (maybe-fbind
      '(ccl-execute-on-string