X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnheaderxm.el;h=0564ae6feda21ab2b7939bedbdbf4e04ba43a48b;hb=779dd81d09cb6fa76e6a0fd64147099b7cf0119d;hp=ecd256b4b864c3534cbbe382c7077d84942b4fc4;hpb=82300762c3419b73fc2e994b14e3d520fe88b0a9;p=elisp%2Fgnus.git-

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index ecd256b..0564ae6 100644
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -1,7 +1,10 @@
 ;;; nnheaderxm.el --- making Gnus backends work under XEmacs
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+;;      Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;	Katsumi Yamaoka  <yamaoka@jpl.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -18,24 +21,40 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;;; Code:
 
-(defun nnheader-xmas-run-at-time (time repeat function &rest args)
-  (start-itimer
-   "nnheader-run-at-time"
-   `(lambda ()
-      (,function ,@args))
-   time repeat))
-
-(fset 'nnheader-run-at-time 'nnheader-xmas-run-at-time)
-(fset 'nnheader-cancel-timer 'delete-itimer)
-(fset 'nnheader-cancel-function-timers 'ignore)
+(require 'timer-funcs)
+
+(defalias 'nnheader-cancel-timer 'delete-itimer)
+(defalias 'nnheader-string-as-multibyte 'identity)
+
+(defun nnheader-xmas-Y-or-n-p (prompt)
+  "Ask user a \"Y/n\" question. Return t if answer is neither \"n\", \"N\" nor \"C-g\"."
+  (if (should-use-dialog-box-p)
+      (yes-or-no-p-dialog-box prompt)
+    (let ((cursor-in-echo-area t)
+	  (echo-keystrokes 0)
+	  (inhibit-quit t)
+	  event)
+      (message "%s(Y/n) " prompt)
+      (while (or (not (key-press-event-p (setq event (next-command-event))))
+		 (not (or (eq (event-key event) 'escape)
+			  (memq (event-to-character event)
+				'(?\  ?N ?Y ?\C-g ?\e ?\n ?\r ?n ?y))))))
+      (if (memq (event-key event) '(?\C-g ?N ?n))
+	  (progn
+	    (message "%s(Y/n) No" prompt)
+	    nil)
+	(message "%s(Y/n) Yes" prompt)
+	t))))
+
+(defalias 'nnheader-Y-or-n-p 'nnheader-xmas-Y-or-n-p)
 
 (provide 'nnheaderxm)
 
-;;; nnheaderxm.el ends here.
+;;; nnheaderxm.el ends here