From: Stefan Monnier Date: Sun, 19 Sep 2004 06:07:38 +0000 (+0000) Subject: (event-basic-type): Fix mask (extend to 22bits). X-Git-Tag: ttn-vms-21-2-B4~4876 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8a64811dc35200e4378d2ab3b7cc947da75fce5;p=emacs.git (event-basic-type): Fix mask (extend to 22bits). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34418fde798..95cd807ebcc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-09-19 Stefan + + * subr.el (event-basic-type): Fix mask (extend to 22bits). + 2004-09-18 Luc Teirlinck * textmodes/enriched.el (enriched-rerun-flag): New variable. diff --git a/lisp/subr.el b/lisp/subr.el index 327d6386fcb..d7bfcc1f7fe 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,7 +1,7 @@ ;;; subr.el --- basic lisp subroutines for Emacs -;; Copyright (C) 1985, 86, 92, 94, 95, 99, 2000, 2001, 2002, 03, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, +;; 2004 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -683,7 +683,7 @@ in the current Emacs session, then this function may return nil." (setq event (car event))) (if (symbolp event) (car (get event 'event-symbol-elements)) - (let ((base (logand event (1- (lsh 1 18))))) + (let ((base (logand event (1- ?\A-\^@)))) (downcase (if (< base 32) (logior base 64) base))))) (defsubst mouse-movement-p (object) @@ -2649,5 +2649,5 @@ The properties used on SYMBOL are `composefunc', `sendfunc', (put symbol 'abortfunc (or abortfunc 'kill-buffer)) (put symbol 'hookvar (or hookvar 'mail-send-hook))) -;;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc +;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc ;;; subr.el ends here