* dgnushack.el: Autoload debug, eudc-expand-inline and pgg-snarf-keys-region

 for XEmacs.

* lpath.el: Fbind w3m-region, bind ps-print-color-p for XEmacs.

* nnmairix.el: Require edmacro when compiling with XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71f3591..3d71673 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * dgnushack.el: Autoload debug, eudc-expand-inline and
+       pgg-snarf-keys-region for XEmacs.
+
+       * lpath.el: Fbind w3m-region, bind ps-print-color-p for XEmacs.
+
+       * nnmairix.el: Require edmacro when compiling with XEmacs.
+
 2008-05-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-sum.el (gnus-summary-initial-limit): Use unless instead of if.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 797f038..b4958a3 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -219,6 +219,7 @@ fixed in Emacs 22."
     (autoload 'customize-save-variable "cus-edit" nil t)
     (autoload 'customize-set-variable "cus-edit" nil t)
     (autoload 'customize-variable "cus-edit" nil t)
+    (autoload 'debug "debug" nil t)
     (if (featurep 'mule)
        (unless (locate-library "mule-ccl")
          (autoload 'define-ccl-program "ccl" nil nil 'macro))
@@ -226,6 +227,7 @@ fixed in Emacs 22."
     (autoload 'delete-annotation "annotations")
     (autoload 'dolist "cl-macs" nil nil 'macro)
     (autoload 'enriched-decode "enriched")
+    (autoload 'eudc-expand-inline "eudc" nil t)
     (autoload 'executable-find "executable")
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
     (autoload 'info "info" nil t)
@@ -233,6 +235,7 @@ fixed in Emacs 22."
     (autoload 'mail-fetch-field "mail-utils")
     (autoload 'make-annotation "annotations")
     (autoload 'make-display-table "disp-table")
+    (autoload 'pgg-snarf-keys-region "pgg" nil t)
     (autoload 'pp "pp")
     (autoload 'ps-despool "ps-print" nil t)
     (autoload 'ps-spool-buffer "ps-print" nil t)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 4499fb3..38ad716 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -60,15 +60,15 @@
      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 window-edges))
+     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
-     rmail-insert-mime-forwarded-message-function show-trailing-whitespace
-     tool-bar-mode transient-mark-mode url-version
+     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))

diff --git a/lisp/nnmairix.el b/lisp/nnmairix.el
index 6ed5868..33d1642 100644 (file)
--- a/lisp/nnmairix.el
+++ b/lisp/nnmairix.el
@@ -162,6 +162,11 @@
 
 ;;; === Keymaps
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
+    (require 'edmacro)))
+
 ;; Group mode
 (defun nnmairix-group-mode-hook ()
   "Nnmairix group mode keymap."