Mercurial > emacs
changeset 66647:f6c8a712bfcd
(mouse-wheel-down-event, mouse-wheel-up-event): Use system-type instead
of window-system because window-system is not correctly defined during loadup.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Thu, 03 Nov 2005 14:35:26 +0000 |
| parents | 173cd676da78 |
| children | 3dbeee07bb77 |
| files | lisp/ChangeLog lisp/mwheel.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 03 03:56:38 2005 +0000 +++ b/lisp/ChangeLog Thu Nov 03 14:35:26 2005 +0000 @@ -1,3 +1,9 @@ +2005-11-03 Sam Steingold <sds@gnu.org> + + * 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 <mah@everybody.org> * xml.el (xml-syntax-table): Allow xml.el to compile in xemacs.
--- a/lisp/mwheel.el Thu Nov 03 03:56:38 2005 +0000 +++ b/lisp/mwheel.el Thu Nov 03 14:35:26 2005 +0000 @@ -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)))