From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: bojohan+news@dd.chalmers.se (Johan =?utf-8?Q?Bockg=C3=A5rd?=) Newsgroups: gmane.emacs.devel Subject: xterm.el Date: Wed, 04 Apr 2007 18:28:53 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1175704180 29382 80.91.229.12 (4 Apr 2007 16:29:40 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 4 Apr 2007 16:29:40 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 04 18:29:30 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HZ8MT-0000bY-Gc for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2007 18:29:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HZ8Pk-0002tH-7Z for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2007 12:32:52 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HZ8Pg-0002rb-IO for emacs-devel@gnu.org; Wed, 04 Apr 2007 12:32:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HZ8Pg-0002rO-1z for emacs-devel@gnu.org; Wed, 04 Apr 2007 12:32:48 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HZ8Pf-0002rL-QN for emacs-devel@gnu.org; Wed, 04 Apr 2007 12:32:47 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HZ8MN-0003WY-IB for emacs-devel@gnu.org; Wed, 04 Apr 2007 12:29:23 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1HZ8MC-0004Zl-Dj for emacs-devel@gnu.org; Wed, 04 Apr 2007 18:29:12 +0200 Original-Received: from gamma02.me.chalmers.se ([129.16.50.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 04 Apr 2007 18:29:12 +0200 Original-Received: from bojohan+news by gamma02.me.chalmers.se with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 04 Apr 2007 18:29:12 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 102 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: gamma02.me.chalmers.se Mail-Copies-To: never User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.93 (gnu/linux) Cancel-Lock: sha1:RUuNljnSuODrkH+vLo9JxFzwf1o= X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:69061 Archived-At: This patch fixes some incorrect key definitions and adds a binding for C-M-SPC. Also, maybe it would be more useful if the `Alt-foo' bindings (A-up, A-down, etc) in xterm.el were `Meta-foo'? Index: lisp/term/xterm.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/term/xterm.el,v retrieving revision 1.36 diff -u -r1.36 xterm.el --- lisp/term/xterm.el 21 Jan 2007 03:22:34 -0000 1.36 +++ lisp/term/xterm.el 4 Apr 2007 15:44:00 -0000 @@ -246,7 +246,7 @@ (define-key map "\e[27;5;49~" [?\C-1]) ;; Not all C-DIGIT keys have a distinct binding. (define-key map "\e[27;5;57~" [?\C-9]) - (define-key map "\e[27;5;59~" [(C-\;)]) + (define-key map "\e[27;5;59~" [?\C-\;]) (define-key map "\e[27;5;61~" [?\C-=]) (define-key map "\e[27;5;92~" [?\C-\\]) @@ -255,7 +255,7 @@ (define-key map "\e[27;6;35~" [?\C-#]) (define-key map "\e[27;6;36~" [?\C-$]) (define-key map "\e[27;6;37~" [?\C-%]) - (define-key map "\e[27;6;38~" [(C-&)]) + (define-key map "\e[27;6;38~" [?\C-&]) (define-key map "\e[27;6;40~" [?\C-(]) (define-key map "\e[27;6;41~" [?\C-)]) (define-key map "\e[27;6;42~" [?\C-*]) @@ -263,13 +263,13 @@ (define-key map "\e[27;6;58~" [?\C-:]) (define-key map "\e[27;6;60~" [?\C-<]) (define-key map "\e[27;6;62~" [?\C->]) - (define-key map "\e[27;6;63~" [(C-\?)]) + (define-key map "\e[27;6;63~" [(control ??)]) ;; These are the strings emitted for various C-M- combinations ;; for keyboards that the Meta and Alt modifiers are on the same ;; key (usually labeled "Alt"). - (define-key map "\e[27;13;9~" [(C-M-tab)]) - (define-key map "\e[27;13;13~" [(C-M-return)]) + (define-key map "\e[27;13;9~" [C-M-tab]) + (define-key map "\e[27;13;13~" [C-M-return]) (define-key map "\e[27;13;39~" [?\C-\M-\']) (define-key map "\e[27;13;44~" [?\C-\M-,]) @@ -295,7 +295,7 @@ (define-key map "\e[27;14;35~" [?\C-\M-#]) (define-key map "\e[27;14;36~" [?\C-\M-$]) (define-key map "\e[27;14;37~" [?\C-\M-%]) - (define-key map "\e[27;14;38~" [(C-M-&)]) + (define-key map "\e[27;14;38~" [?\C-\M-&]) (define-key map "\e[27;14;40~" [?\C-\M-(]) (define-key map "\e[27;14;41~" [?\C-\M-)]) (define-key map "\e[27;14;42~" [?\C-\M-*]) @@ -303,11 +303,12 @@ (define-key map "\e[27;14;58~" [?\C-\M-:]) (define-key map "\e[27;14;60~" [?\C-\M-<]) (define-key map "\e[27;14;62~" [?\C-\M->]) - (define-key map "\e[27;14;63~" [(C-M-\?)]) + (define-key map "\e[27;14;63~" [(control meta ??)]) - (define-key map "\e[27;7;9~" [(C-M-tab)]) - (define-key map "\e[27;7;13~" [(C-M-return)]) + (define-key map "\e[27;7;9~" [C-M-tab]) + (define-key map "\e[27;7;13~" [C-M-return]) + (define-key map "\e[27;7;32~" [?\C-\M-\s]) (define-key map "\e[27;7;39~" [?\C-\M-\']) (define-key map "\e[27;7;44~" [?\C-\M-,]) (define-key map "\e[27;7;45~" [?\C-\M--]) @@ -332,7 +333,7 @@ (define-key map "\e[27;8;35~" [?\C-\M-#]) (define-key map "\e[27;8;36~" [?\C-\M-$]) (define-key map "\e[27;8;37~" [?\C-\M-%]) - (define-key map "\e[27;8;38~" [(C-M-&)]) + (define-key map "\e[27;8;38~" [?\C-\M-&]) (define-key map "\e[27;8;40~" [?\C-\M-(]) (define-key map "\e[27;8;41~" [?\C-\M-)]) (define-key map "\e[27;8;42~" [?\C-\M-*]) @@ -340,13 +341,13 @@ (define-key map "\e[27;8;58~" [?\C-\M-:]) (define-key map "\e[27;8;60~" [?\C-\M-<]) (define-key map "\e[27;8;62~" [?\C-\M->]) - (define-key map "\e[27;8;63~" [(C-M-\?)]) + (define-key map "\e[27;8;63~" [(control meta ??)]) (define-key map "\e[27;2;9~" [S-tab]) (define-key map "\e[27;2;13~" [S-return]) - (define-key map "\e[27;6;9~" [(C-S-tab)]) - (define-key map "\e[27;6;13~" [(C-S-return)]) + (define-key map "\e[27;6;9~" [C-S-tab]) + (define-key map "\e[27;6;13~" [C-S-return]) ;; Other versions of xterm might emit these. (define-key map "\e[A" [up])