From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.bugs Subject: Re: Emacs does not distinguish between =?iso-8859-1?q?=60=E6=27?=and =?iso-8859-1?q?=60C-=E6=27?= Date: Wed, 14 May 2003 21:33:57 +0200 Sender: bug-gnu-emacs-bounces+gnu-bug-gnu-emacs=m.gmane.org@gnu.org Message-ID: References: <5l4r3x4bih.fsf@rum.cs.yale.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: main.gmane.org 1052942154 495 80.91.224.249 (14 May 2003 19:55:54 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 14 May 2003 19:55:54 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+gnu-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 14 21:55:51 2003 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19G2Lv-00007P-00 for ; Wed, 14 May 2003 21:55:51 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19G2MO-000180-04 for gnu-bug-gnu-emacs@m.gmane.org; Wed, 14 May 2003 15:56:20 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19G2Ku-0000Pa-00 for bug-gnu-emacs@gnu.org; Wed, 14 May 2003 15:54:48 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19G2Kk-0008Te-00 for bug-gnu-emacs@gnu.org; Wed, 14 May 2003 15:54:42 -0400 Original-Received: from ns.suse.de ([213.95.15.193] helo=Cantor.suse.de) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19G2Jt-0007mk-00 for bug-gnu-emacs@gnu.org; Wed, 14 May 2003 15:53:45 -0400 Original-Received: from Hermes.suse.de (Hermes.suse.de [213.95.15.136]) by Cantor.suse.de (Postfix) with ESMTP id 7F023154B6; Wed, 14 May 2003 21:53:44 +0200 (MEST) Original-To: "Stefan Monnier" X-Yow: Now I understand the meaning of ``THE MOD SQUAD''! In-Reply-To: <5l4r3x4bih.fsf@rum.cs.yale.edu> (Stefan Monnier's message of "14 May 2003 14:40:54 -0400") User-Agent: Gnus/5.1001 (Gnus v5.10.1) Emacs/21.3.50 (gnu/linux) X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Bug reports for GNU Emacs, the Swiss army knife of text editors List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: bug-gnu-emacs-bounces+gnu-bug-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.bugs:5052 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:5052 "Stefan Monnier" writes: |> Index: keyboard.c |> =================================================================== |> RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v |> retrieving revision 1.741 |> diff -u -r1.741 keyboard.c |> --- keyboard.c 10 May 2003 22:15:35 -0000 1.741 |> +++ keyboard.c 14 May 2003 18:38:00 -0000 |> @@ -5013,8 +5013,15 @@ |> case MULTIBYTE_CHAR_KEYSTROKE_EVENT: |> { |> Lisp_Object lispy_c; |> + int c = event->code; |> |> - XSETFASTINT (lispy_c, event->code); |> + /* Add in the other modifier bits. We took care of ctrl_modifier ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |> + just above, and the shift key was taken care of by the X code, |> + and applied to control characters by make_ctrl_char. */ |> + c |= (event->modifiers |> + & (meta_modifier | alt_modifier |> + | hyper_modifier | super_modifier | ctrl_modifier)); It seems comment and code aren't in line. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."