From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 24 Feb 2011 06:32:08 +0000 (+0000)
Subject: auth-source.el (auth-source-netrc-create): Use `read-char' with no argument that... 
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=4c0611be7b8cf4b34d42531534d14b88ba60c9ca

auth-source.el (auth-source-netrc-create): Use `read-char' with no argument that XEmacs doesn't support.
dgnushack.el (dgnushack-compile): Exclude color.el from being compiled for Emacsen having no `libxml-parse-html-region' support.
gnus-xmas.el (gnus-xmas-define): Remove gnus-x-color-values.
lpath.el: Bind buffer-save-without-query for XEmacs.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7ea23954..278295c47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* auth-source.el (auth-source-netrc-create): Use `read-char' with no
+	argument that XEmacs doesn't support.
+
+	* dgnushack.el (dgnushack-compile): Exclude color.el from being
+	compiled for Emacsen having no `libxml-parse-html-region' support.
+
+	* gnus-xmas.el (gnus-xmas-define): Remove gnus-x-color-values.
+
+	* lpath.el: Bind buffer-save-without-query for XEmacs.
+
 2011-02-23  Julien Danjou  <julien@danjou.info>
 
 	* gnus-art.el (article-make-date-line): Ignore errors if time is
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 1db6b565f..467aa103a 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1041,7 +1041,8 @@ See `auth-source-search' for details on SPEC."
                             "(y)es/(n)o but use it/(e)dit line/(s)kip file"))
             done k)
         (while (not done)
-          (setq k (read-char prompt))
+	  (message "%s" prompt)
+          (setq k (read-char))
           (case k
             (?y (setq done t))
             (?n (setq add ""
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 62af7f45b..d5f8d01cc 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -310,7 +310,8 @@ dgnushack-compile."
 		 ;; lpath.el binds it.
 		 (not (eq (symbol-function 'libxml-parse-html-region)
 			  'ignore)))
-      (setq files (delete "shr-color.el" (delete "shr.el" files))))
+      (dolist (file '("color.el" "shr-color.el" "shr.el"))
+	(setq files (delete file files))))
 
     (dolist (file files)
       (setq file (expand-file-name file srcdir))
diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index bd2c6c5ca..a2f4d7ddf 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -442,13 +442,6 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
   (unless (fboundp 'match-string-no-properties)
     (defalias 'match-string-no-properties 'match-string))
 
-  (defalias 'gnus-x-color-values
-	(if (fboundp 'x-color-values)
-	    'x-color-values
-	  (lambda (color)
-	    (color-instance-rgb-components
-	     (make-color-instance color)))))
-
   (unless (fboundp 'char-width)
     (defalias 'char-width (lambda (ch) 1))))
 
diff --git a/lisp/lpath.el b/lisp/lpath.el
index 718966b6a..d03bc5858 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -73,18 +73,18 @@
      w3m-detect-meta-charset w3m-region window-edges))
   (maybe-bind
    '(adaptive-fill-first-line-regexp
-     buffer-display-table completion-styles completion-styles-alist
-     cursor-in-non-selected-windows default-enable-multibyte-characters
-     default-file-name-coding-system epa-file-encrypt-to eudc-protocol
-     filladapt-mode gnus-agent-expire-current-dirs help-xref-stack-item
-     idna-program installation-directory iswitchb-mode iswitchb-temp-buflist
-     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 transient-mark-mode url-version
-     w3-meta-charset-content-type-regexp w3m-link-map
-     w3-meta-content-type-charset-regexp))
+     buffer-display-table buffer-save-without-query completion-styles
+     completion-styles-alist cursor-in-non-selected-windows
+     default-enable-multibyte-characters default-file-name-coding-system
+     epa-file-encrypt-to eudc-protocol filladapt-mode
+     gnus-agent-expire-current-dirs help-xref-stack-item idna-program
+     installation-directory iswitchb-mode iswitchb-temp-buflist 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
+     transient-mark-mode url-version w3-meta-charset-content-type-regexp
+     w3m-link-map w3-meta-content-type-charset-regexp))
 
   (when (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
 	    (featurep 'sxemacs))