* dgnushack.el: Autoload get-display-table and put-display-table for XEmacs

 21.5.

* lpath.el: Fbind get-display-table and put-display-table for XEmacs 21.4 and
 SXEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be601be..ebae060 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * dgnushack.el: Autoload get-display-table and put-display-table for
+       XEmacs 21.5.
+
+       * lpath.el: Fbind get-display-table and put-display-table for XEmacs
+       21.4 and SXEmacs.
+
 2008-06-15  David Engster  <dengste@eml.cc>
 
        * nnimap.el (nnimap-request-delete-group): Unselect group if necessary.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index b4958a3..908340a 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -230,6 +230,10 @@ fixed in Emacs 22."
     (autoload 'eudc-expand-inline "eudc" nil t)
     (autoload 'executable-find "executable")
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
+    (when (and (emacs-version>= 21 5)
+              (not (featurep 'sxemacs)))
+      (autoload 'get-display-table "disp-table.el")
+      (autoload 'put-display-table "disp-table.el"))
     (autoload 'info "info" nil t)
     (autoload 'mail-extract-address-components "mail-extr")
     (autoload 'mail-fetch-field "mail-utils")

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 2407a20..bc814ce 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -79,8 +79,8 @@
     (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)))