From c7280fb559080f4f7a239fa2de41802bb409d322 Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Thu, 3 Nov 2005 14:35:26 +0000 Subject: [PATCH] (mouse-wheel-down-event, mouse-wheel-up-event): Use system-type instead of window-system because window-system is not correctly defined during loadup. --- lisp/ChangeLog | 6 ++++++ lisp/mwheel.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d58ced9fbe4..3e5c73ebd2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-11-03 Sam Steingold + + * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Use + system-type instead of window-system because window-system is not + correctly defined during loadup. + 2005-11-02 Mark A. Hershberger * xml.el (xml-syntax-table): Allow xml.el to compile in xemacs. diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 391ce3a5e04..c4e604bfd6e 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -59,7 +59,7 @@ 'mouse-wheel-down-event) (defcustom mouse-wheel-down-event ;; In the latest versions of XEmacs, we could just use mouse-%s as well. - (if (memq window-system '(w32 mac)) + (if (memq system-type '(windows-nt macos)) 'wheel-up (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") mouse-wheel-down-button))) @@ -73,7 +73,7 @@ 'mouse-wheel-up-event) (defcustom mouse-wheel-up-event ;; In the latest versions of XEmacs, we could just use mouse-%s as well. - (if (memq window-system '(w32 mac)) + (if (memq system-type '(windows-nt macos)) 'wheel-down (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") mouse-wheel-up-button))) -- 2.11.4.GIT