[Emacs-diffs] Changes to emacs/lisp/term/wyse50.el

[Dan Nicolaescu]

Index: emacs/lisp/term/wyse50.el
diff -c emacs/lisp/term/wyse50.el:1.21 emacs/lisp/term/wyse50.el:1.22
*** emacs/lisp/term/wyse50.el:1.21      Mon Jul  4 16:49:23 2005
--- emacs/lisp/term/wyse50.el   Wed Jul 27 18:02:07 2005
***************
*** 1,6 ****
  ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
  
! ;; Copyright (C) 1989, 1993, 1994 Free Software Foundation, Inc.
  
  ;; Author: Daniel Pfeiffer <address@hidden>,
  ;;    Jim Blandy <address@hidden>
--- 1,6 ----
  ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
  
! ;; Copyright (C) 1989, 1993, 1994, 2005 Free Software Foundation, Inc.
  
  ;; Author: Daniel Pfeiffer <address@hidden>,
  ;;    Jim Blandy <address@hidden>
***************
*** 37,110 ****
  
  ;;; Code:
  
! (define-key function-key-map "\C-a" (make-keymap))
! (mapcar (function (lambda (key-definition)
!                   (define-key function-key-map
!                     (car key-definition) (nth 1 key-definition))))
!       '(
!         ;; These might be set up by termcap and terminfo
!         ("\C-k"       [up])
!         ("\C-j"       [down])
!         ("\C-l"       [right])
!         ("\C-h"       [left])
!         ("address@hidden"     [f1])
!         ("\^aA\^m"    [f2])
!         ("\^aB\^m"    [f3])
!         ("\^aC\^m"    [f4])
!         ("\^aD\^m"    [f5])
!         ("\^aE\^m"    [f6])
!         ("\^aF\^m"    [f7])
!         ("\^aG\^m"    [f8])
!         ("\^aH\^m"    [f9])
! 
!         ;; These might be set up by terminfo
!         ("\eK"        [next])
!         ("\eT"        [clearline])
!         ("\^^"        [home])
!         ("\e\^^"      [end])
!         ("\eQ"        [insert])
!         ("\eE"        [insertline])
!         ("\eR"        [deleteline])
!         ("\eP"        [print])
!         ("\er"        [replace])
!         ("\^aI\^m"    [f10])
!         ("\^aJ\^m"    [f11])
!         ("\^aK\^m"    [f12])
!         ("\^aL\^m"    [f13])
!         ("\^aM\^m"    [f14])
!         ("\^aN\^m"    [f15])
!         ("\^aO\^m"    [f16])
!         ("\^a`\^m"    [f17])
!         ("\^aa\^m"    [f18])
!         ("\^ab\^m"    [f19])
!         ("\^ac\^m"    [f20])
!         ("\^ad\^m"    [f21])
!         ("\^ae\^m"    [f22])
!         ("\^af\^m"    [f23])
!         ("\^ag\^m"    [f24])
!         ("\^ah\^m"    [f25])
!         ("\^ai\^m"    [f26])
!         ("\^aj\^m"    [f27])
!         ("\^ak\^m"    [f28])
!         ("\^al\^m"    [f29])
!         ("\^am\^m"    [f30])
!         ("\^an\^m"    [f31])
!         ("\^ao\^m"    [f32])
! 
!         ;; Terminfo may know about these, but X won't
!         ("\eI"        [key-stab])             ;; Not an X keysym
!         ("\eJ"        [key-snext])            ;; Not an X keysym
!         ("\eY"        [key-clear])            ;; Not an X keysym
! 
!         ;; These are totally strange :-)
!         ("\eW"        [?\C-?])        ;; Not an X keysym
!         ("\^a\^k\^m"  [funct-up])     ;; Not an X keysym
!         ("\^a\^j\^m"  [funct-down])   ;; Not an X keysym
!         ("\^a\^l\^m"  [funct-right])  ;; Not an X keysym
!         ("\^a\^h\^m"  [funct-left])   ;; Not an X keysym
!         ("\^a\^m\^m"  [funct-return]) ;; Not an X keysym
!         ("\^a\^i\^m"  [funct-tab])    ;; Not an X keysym
! ))
  
  (defun enable-arrow-keys ()
    "To be called by term-setup-hook. Overrides 6 Emacs standard keys
--- 37,128 ----
  
  ;;; Code:
  
! (defun terminal-init-wyse50 ()
!   "Terminal initialization function for wyse50."
!   (define-key function-key-map "\C-a" (make-keymap))
!   (mapcar (function (lambda (key-definition)
!                     (define-key function-key-map
!                       (car key-definition) (nth 1 key-definition))))
!         '(
!           ;; These might be set up by termcap and terminfo
!           ("\C-k"     [up])
!           ("\C-j"     [down])
!           ("\C-l"     [right])
!           ("\C-h"     [left])
!           ("address@hidden"   [f1])
!           ("\^aA\^m"  [f2])
!           ("\^aB\^m"  [f3])
!           ("\^aC\^m"  [f4])
!           ("\^aD\^m"  [f5])
!           ("\^aE\^m"  [f6])
!           ("\^aF\^m"  [f7])
!           ("\^aG\^m"  [f8])
!           ("\^aH\^m"  [f9])
! 
!           ;; These might be set up by terminfo
!           ("\eK"      [next])
!           ("\eT"      [clearline])
!           ("\^^"      [home])
!           ("\e\^^"    [end])
!           ("\eQ"      [insert])
!           ("\eE"      [insertline])
!           ("\eR"      [deleteline])
!           ("\eP"      [print])
!           ("\er"      [replace])
!           ("\^aI\^m"  [f10])
!           ("\^aJ\^m"  [f11])
!           ("\^aK\^m"  [f12])
!           ("\^aL\^m"  [f13])
!           ("\^aM\^m"  [f14])
!           ("\^aN\^m"  [f15])
!           ("\^aO\^m"  [f16])
!           ("\^a`\^m"  [f17])
!           ("\^aa\^m"  [f18])
!           ("\^ab\^m"  [f19])
!           ("\^ac\^m"  [f20])
!           ("\^ad\^m"  [f21])
!           ("\^ae\^m"  [f22])
!           ("\^af\^m"  [f23])
!           ("\^ag\^m"  [f24])
!           ("\^ah\^m"  [f25])
!           ("\^ai\^m"  [f26])
!           ("\^aj\^m"  [f27])
!           ("\^ak\^m"  [f28])
!           ("\^al\^m"  [f29])
!           ("\^am\^m"  [f30])
!           ("\^an\^m"  [f31])
!           ("\^ao\^m"  [f32])
! 
!           ;; Terminfo may know about these, but X won't
!           ("\eI"      [key-stab])             ;; Not an X keysym
!           ("\eJ"      [key-snext])            ;; Not an X keysym
!           ("\eY"      [key-clear])            ;; Not an X keysym
! 
!           ;; These are totally strange :-)
!           ("\eW"      [?\C-?])            ;; Not an X keysym
!           ("\^a\^k\^m"        [funct-up]) ;; Not an X keysym
!           ("\^a\^j\^m"        [funct-down])  ;; Not an X keysym
!           ("\^a\^l\^m"        [funct-right]) ;; Not an X keysym
!           ("\^a\^h\^m"        [funct-left])  ;; Not an X keysym
!           ("\^a\^m\^m"        [funct-return]) ;; Not an X keysym
!           ("\^a\^i\^m"        [funct-tab])    ;; Not an X keysym
!           ))
! 
!   ;; Miscellaneous hacks
! 
!   ;; This is an ugly hack for a nasty problem:
!   ;; Wyse 50 takes one character cell to store video attributes (which seems 
to
!   ;; explain width 79 rather than 80, column 1 is not used!!!).
!   ;; On killing (C-x C-c) the end inverse code (on column 1 of line 24)
!   ;; of the mode line is overwritten AFTER all the y-or-n questions.
!   ;; This causes the attribute to remain in effect until the mode line has
!   ;; scrolled of the screen.  Suspending (C-z) does not cause this problem.
!   ;; On such terminals, Emacs should sacrifice the first and last character of
!   ;; each mode line, rather than a whole screen column!
!   (add-hook 'kill-emacs-hook
!           (function (lambda () (interactive)
!                       (send-string-to-terminal
!                        (concat "\ea23R" (1+ (frame-width)) "C\eG0"))))))
  
  (defun enable-arrow-keys ()
    "To be called by term-setup-hook. Overrides 6 Emacs standard keys
***************
*** 130,152 ****
            ("\C-h"     nil)
            ("\er"      nil)))
    (fset 'enable-arrow-keys nil))
- 
- 
- ;;; Miscellaneous hacks
- 
- ;;; This is an ugly hack for a nasty problem:
- ;;; Wyse 50 takes one character cell to store video attributes (which seems to
- ;;; explain width 79 rather than 80, column 1 is not used!!!).
- ;;; On killing (C-x C-c) the end inverse code (on column 1 of line 24)
- ;;; of the mode line is overwritten AFTER all the y-or-n questions.
- ;;; This causes the attribute to remain in effect until the mode line has
- ;;; scrolled of the screen.  Suspending (C-z) does not cause this problem.
- ;;; On such terminals, Emacs should sacrifice the first and last character of
- ;;; each mode line, rather than a whole screen column!
- (add-hook 'kill-emacs-hook
-         (function (lambda () (interactive)
-                     (send-string-to-terminal
-                      (concat "\ea23R" (1+ (frame-width)) "C\eG0")))))
  
  ;;; arch-tag: b6a05d37-eead-4cf6-b997-0f956c68881c
  ;;; wyse50.el ends here
--- 148,153 ----