Mercurial > hg > xemacs-beta
view lisp/term/xterm.el @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 3ecd8885ac67 |
children | 308d34e9f07d |
line wrap: on
line source
;;; xterm.el --- define function key sequences for xterm ;; Author: FSF ;; Keywords: terminals ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Code: ;; Termcap or terminfo should set these next four? (define-key function-key-map "\e[A" [up]) (define-key function-key-map "\e[B" [down]) (define-key function-key-map "\e[C" [right]) (define-key function-key-map "\e[D" [left]) (define-key function-key-map "\eO\000" [home]) (define-key function-key-map "\eOe" [end]) (define-key function-key-map "\e[1~" [find]) (define-key function-key-map "\e[2~" [insert]) (define-key function-key-map "\e[3~" [delete]) (define-key function-key-map "\e[4~" [select]) (define-key function-key-map "\e[5~" [prior]) (define-key function-key-map "\e[6~" [next]) (define-key function-key-map "\e[11~" [f1]) (define-key function-key-map "\e[12~" [f2]) (define-key function-key-map "\e[13~" [f3]) (define-key function-key-map "\e[14~" [f4]) (define-key function-key-map "\e[15~" [f5]) (define-key function-key-map "\e[17~" [f6]) (define-key function-key-map "\e[18~" [f7]) (define-key function-key-map "\e[19~" [f8]) (define-key function-key-map "\e[20~" [f9]) (define-key function-key-map "\e[21~" [f10]) (define-key function-key-map "\e[23~" [f11]) (define-key function-key-map "\e[24~" [f12]) (define-key function-key-map "\e[25~" [f13]) (define-key function-key-map "\e[26~" [f14]) (define-key function-key-map "\e[28~" [help]) (define-key function-key-map "\e[29~" [menu]) ; FSF's xterm.el defines this like this: ; (I don't know which one is more correct) ;(define-key function-key-map "\e[29~" [print]) (define-key function-key-map "\e[31~" [f17]) (define-key function-key-map "\e[32~" [f18]) (define-key function-key-map "\e[33~" [f19]) (define-key function-key-map "\e[34~" [f20]) ;; Termcap or terminfo should set these next four. (define-key function-key-map "\eOA" [up]) (define-key function-key-map "\eOB" [down]) (define-key function-key-map "\eOC" [right]) (define-key function-key-map "\eOD" [left]) (define-key function-key-map "\eOp" [kp-0]) (define-key function-key-map "\eOq" [kp-1]) (define-key function-key-map "\eOr" [kp-2]) (define-key function-key-map "\eOs" [kp-3]) (define-key function-key-map "\eOt" [kp-4]) (define-key function-key-map "\eOu" [kp-5]) (define-key function-key-map "\eOv" [kp-6]) (define-key function-key-map "\eOw" [kp-7]) (define-key function-key-map "\eOx" [kp-8]) (define-key function-key-map "\eOy" [kp-9]) (define-key function-key-map "\eOk" [kp-add]) (define-key function-key-map "\eOm" [kp-subtract]) (define-key function-key-map "\eOM" [kp-enter]) (define-key function-key-map "\eOj" [kp-multiply]) (define-key function-key-map "\eOo" [kp-divide]) (define-key function-key-map "\eOn" [kp-decimal]) ;; If you use the X resource -- XTerm*sunFunctionKeys: on -- you may ;; need these. (define-key function-key-map "\e[224z" [f1]) (define-key function-key-map "\e[225z" [f2]) (define-key function-key-map "\e[226z" [f3]) (define-key function-key-map "\e[227z" [f4]) (define-key function-key-map "\e[228z" [f5]) (define-key function-key-map "\e[229z" [f6]) (define-key function-key-map "\e[230z" [f7]) (define-key function-key-map "\e[231z" [f8]) (define-key function-key-map "\e[232z" [f9]) (define-key function-key-map "\e[233z" [f10]) (define-key function-key-map "\e[234z" [f11]) (define-key function-key-map "\e[235z" [f12]) (define-key function-key-map "\e[194z" [(shift f1)]) (define-key function-key-map "\e[195z" [(shift f2)]) (define-key function-key-map "\e[196z" [(shift f3)]) (define-key function-key-map "\e[197z" [(shift f4)]) (define-key function-key-map "\e[198z" [(shift f5)]) (define-key function-key-map "\e[199z" [(shift f6)]) (define-key function-key-map "\e[200z" [(shift f7)]) (define-key function-key-map "\e[201z" [(shift f8)]) (define-key function-key-map "\e[208z" [(shift f9)]) (define-key function-key-map "\e[209z" [(shift f10)]) (define-key function-key-map "\e[210z" [(shift f11)]) (define-key function-key-map "\e[211z" [(shift f12)]) (define-key function-key-map "\e[2z" [insert]) (define-key function-key-map "\e[5z" [prior]) (define-key function-key-map "\e[6z" [next]) ;;; xterm.el ends here