[Emacs-diffs] emacs/lisp ChangeLog simple.el w32-fns.el term/...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/14 01:22:46

Modified files:
        lisp           : ChangeLog simple.el w32-fns.el 
        lisp/term      : internal.el ns-win.el x-win.el 

Log message:
        * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
        to function-key-map, and give them ascii-character property.
        * term/x-win.el (x-alternatives-map):
        * term/ns-win.el (ns-alternatives-map):
        * term/internal.el (msdos-key-remapping-map):
        * w32-fns.el (x-alternatives-map): Remove redundant mappings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16164&r2=1.16165
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.1011&r2=1.1012
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/w32-fns.el?cvsroot=emacs&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/internal.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/x-win.el?cvsroot=emacs&r1=1.243&r2=1.244

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16164
retrieving revision 1.16165
diff -u -b -r1.16164 -r1.16165
--- ChangeLog   14 Sep 2009 00:48:06 -0000      1.16164
+++ ChangeLog   14 Sep 2009 01:22:42 -0000      1.16165
@@ -1,3 +1,12 @@
+2009-09-14  Stefan Monnier  <address@hidden>
+
+       * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
+       to function-key-map, and give them ascii-character property.
+       * term/x-win.el (x-alternatives-map):
+       * term/ns-win.el (ns-alternatives-map):
+       * term/internal.el (msdos-key-remapping-map):
+       * w32-fns.el (x-alternatives-map): Remove redundant mappings.
+
 2009-09-14  Glenn Morris  <address@hidden>
 
        * emacs-lisp/elint.el (elint-add-required-env): Revert to not using
@@ -28,16 +37,16 @@
        * progmodes/cperl-mode.el (cperl-init-faces): Revert last change.
 
        * eshell/em-hist.el:
-       * eshell/em-dirs.el (eshell-complete-user-reference): Declare
-       pcomplete functions and variables to avoid compiler warnings.
+       * eshell/em-dirs.el (eshell-complete-user-reference):
+       Declare pcomplete functions and variables to avoid compiler warnings.
 
 2009-09-13  Leo  <address@hidden>  (tiny change)
 
        * eshell/em-script.el (eshell-login-script, eshell-rc-script):
        * eshell/em-dirs.el (eshell-last-dir-ring-file-name):
        * eshell/em-alias.el (eshell-aliases-file):
-       * eshell/em-hist.el (eshell-history-file-name): Use
-       expand-file-name instead of concat to make file names (Bug#4308).
+       * eshell/em-hist.el (eshell-history-file-name):
+       Use expand-file-name instead of concat to make file names (Bug#4308).
 
 2009-09-13  Glenn Morris  <address@hidden>
 
@@ -1541,11 +1550,9 @@
        (cperl-forward-re): Check cperl-brace-recursing.
        (cperl-highlight-charclass): New function.
        (cperl-find-pods-heres): Use it.
-       (cperl-fill-paragraph): Synch to save-excursion placement used
-       upstream.
+       (cperl-fill-paragraph): Synch to save-excursion placement used upstream.
        (cperl-beautify-regexp-piece): Fix column calculation.
-       (cperl-make-regexp-x): Handle case where point is between "q" and
-       "rs".
+       (cperl-make-regexp-x): Handle case where point is between "q" and "rs".
        (cperl-beautify-level): Don't process entire regexp.
        (cperl-build-manpage, cperl-perldoc): Bind Man-switches before
        calling man.

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.1011
retrieving revision 1.1012
diff -u -b -r1.1011 -r1.1012
--- simple.el   13 Sep 2009 00:53:00 -0000      1.1011
+++ simple.el   14 Sep 2009 01:22:45 -0000      1.1012
@@ -6104,7 +6104,17 @@
    (kp-subtract ?-)
    (kp-decimal ?.)
    (kp-divide ?/)
-   (kp-equal ?=)))
+   (kp-equal ?=)
+   ;; Do the same for various keys that are represented as symbols under
+   ;; GUIs but naturally correspond to characters.
+   (backspace 127)
+   (delete 127)
+   (tab ?\t)
+   (linefeed ?\n)
+   (clear ?\C-l)
+   (return ?\C-m)
+   (escape ?\e)
+   ))
 
 ;;;;
 ;;;; forking a twin copy of a buffer.

Index: w32-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/w32-fns.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- w32-fns.el  3 Sep 2009 06:55:01 -0000       1.96
+++ w32-fns.el  14 Sep 2009 01:22:45 -0000      1.97
@@ -34,13 +34,6 @@
 (defvar x-alternatives-map
   (let ((map (make-sparse-keymap)))
     ;; Map certain keypad keys into ASCII characters that people usually 
expect.
-    (define-key map [backspace] [127])
-    (define-key map [delete] [127])
-    (define-key map [tab] [?\t])
-    (define-key map [linefeed] [?\n])
-    (define-key map [clear] [?\C-l])
-    (define-key map [return] [?\C-m])
-    (define-key map [escape] [?\e])
     (define-key map [M-backspace] [?\M-\d])
     (define-key map [M-delete] [?\M-\d])
     (define-key map [M-tab] [?\M-\t])
@@ -369,16 +362,6 @@
 (global-set-key [lwindow] 'ignore)
 (global-set-key [rwindow] 'ignore)
 
-;; These tell read-char how to convert
-;; these special chars to ASCII.
-(put 'tab 'ascii-character ?\t)
-(put 'linefeed 'ascii-character ?\n)
-(put 'clear 'ascii-character 12)
-(put 'return 'ascii-character 13)
-(put 'escape 'ascii-character ?\e)
-(put 'backspace 'ascii-character 127)
-(put 'delete 'ascii-character 127)
-
 (defun w32-add-charset-info (xlfd-charset windows-charset codepage)
   "Function to add character sets to display with Windows fonts.
 Creates entries in `w32-charset-info-alist'.

Index: term/internal.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/internal.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- term/internal.el    1 Sep 2009 03:17:28 -0000       1.48
+++ term/internal.el    14 Sep 2009 01:22:46 -0000      1.49
@@ -28,13 +28,6 @@
 (defvar msdos-key-remapping-map
   (let ((map (make-sparse-keymap)))
     ;; keyboard setup -- that's simple!
-    (define-key map [backspace] "\177") ; Normal behavior for BS
-    (define-key map [delete] "\C-d") ; ... and Delete
-    (define-key map [tab] [?\t])
-    (define-key map [linefeed] [?\n])
-    (define-key map [clear] [11])
-    (define-key map [return] [13])
-    (define-key map [escape] [?\e])
     (define-key map [M-backspace] [?\M-\d])
     (define-key map [M-delete] [?\M-d])
     (define-key map [M-tab] [?\M-\t])
@@ -45,15 +38,6 @@
     map)
   "Keymap for remapping special keys on MS-DOS keyboard.")
 
-;; These tell read-char how to convert these special chars to ASCII.
-(put 'backspace 'ascii-character 127)
-(put 'delete 'ascii-character 127)
-(put 'tab 'ascii-character ?\t)
-(put 'linefeed 'ascii-character ?\n)
-(put 'clear 'ascii-character 12)
-(put 'return 'ascii-character 13)
-(put 'escape 'ascii-character ?\e)
-
 (defun msdos-setup-keyboard (frame)
   "Setup `local-function-key-map' for MS-DOS keyboard."
   ;; Don't do this twice on the same display, or it would break

Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- term/ns-win.el      12 Sep 2009 19:04:26 -0000      1.51
+++ term/ns-win.el      14 Sep 2009 01:22:46 -0000      1.52
@@ -187,33 +187,13 @@
 ;;;; Keyboard mapping.
 
 ;; These tell read-char how to convert these special chars to ASCII.
-;;TODO: all terms have these, and at least the return mapping is necessary
-;;      for tramp to recognize the enter key.
-;;      Perhaps they should be moved into common code somewhere
-;;      (when a window system is active).
-;;      Remove if no problems for some time after 2008-08-06.
-(put 'backspace 'ascii-character 127)
-(put 'delete 'ascii-character 127)
-(put 'tab 'ascii-character ?\t)
 (put 'S-tab 'ascii-character (logior 16 ?\t))
-(put 'linefeed 'ascii-character ?\n)
-(put 'clear 'ascii-character 12)
-(put 'return 'ascii-character 13)
-(put 'escape 'ascii-character ?\e)
-
 
 (defvar ns-alternatives-map
   (let ((map (make-sparse-keymap)))
     ;; Map certain keypad keys into ASCII characters
     ;; that people usually expect.
-    (define-key map [backspace] [?\d])
-    (define-key map [delete] [?\d])
-    (define-key map [tab] [?\t])
     (define-key map [S-tab] [25])
-    (define-key map [linefeed] [?\n])
-    (define-key map [clear] [?\C-l])
-    (define-key map [return] [?\C-m])
-    (define-key map [escape] [?\e])
     (define-key map [M-backspace] [?\M-\d])
     (define-key map [M-delete] [?\M-\d])
     (define-key map [M-tab] [?\M-\t])

Index: term/x-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- term/x-win.el       13 Sep 2009 21:33:00 -0000      1.243
+++ term/x-win.el       14 Sep 2009 01:22:46 -0000      1.244
@@ -272,13 +272,6 @@
 (defvar x-alternatives-map
   (let ((map (make-sparse-keymap)))
     ;; Map certain keypad keys into ASCII characters that people usually 
expect.
-    (define-key map [backspace] [127])
-    (define-key map [delete] [127])
-    (define-key map [tab] [?\t])
-    (define-key map [linefeed] [?\n])
-    (define-key map [clear] [?\C-l])
-    (define-key map [return] [?\C-m])
-    (define-key map [escape] [?\e])
     (define-key map [M-backspace] [?\M-\d])
     (define-key map [M-delete] [?\M-\d])
     (define-key map [M-tab] [?\M-\t])
@@ -303,17 +296,6 @@
         (set-keymap-parent local-function-key-map map)))
     (set-terminal-parameter frame 'x-setup-function-keys t)))
 
-;; These tell read-char how to convert
-;; these special chars to ASCII.
-(put 'backspace 'ascii-character 127)
-(put 'delete 'ascii-character 127)
-(put 'tab 'ascii-character ?\t)
-(put 'linefeed 'ascii-character ?\n)
-(put 'clear 'ascii-character 12)
-(put 'return 'ascii-character 13)
-(put 'escape 'ascii-character ?\e)
-
-
 ;;;; Keysyms
 
 (defun vendor-specific-keysyms (vendor)