[Emacs-diffs] trunk r115903: * lisp/isearch.el (isearch-mode-map): Bind [return] and [backspace] to

[Juri Linkov]

------------------------------------------------------------
revno: 115903
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16342
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-01-07 09:55:50 +0200
message:
  * lisp/isearch.el (isearch-mode-map): Bind [return] and [backspace] to
  isearch-exit and isearch-delete-char resp.  (Bug#16342, bug#16035)
  
  * lisp/progmodes/ps-mode.el (ps-mode-map): Remove [return] key binding
  that shadows RET.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486
  lisp/progmodes/ps-mode.el      psmode.el-20091113204419-o5vbwnq5f7feedwu-1661

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-07 06:00:16 +0000
+++ b/lisp/ChangeLog    2014-01-07 07:55:50 +0000
@@ -1,3 +1,11 @@
+2014-01-07  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-mode-map): Bind [return] and [backspace] to
+       isearch-exit and isearch-delete-char resp.  (Bug#16342, bug#16035)
+
+       * progmodes/ps-mode.el (ps-mode-map): Remove [return] key binding
+       that shadows RET.  (Bug#16342)
+
 2014-01-07  Daniel Colascione  <address@hidden>
 
        * vc/log-view.el (log-view-beginning-of-defun): Add comment

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2014-01-07 04:36:52 +0000
+++ b/lisp/isearch.el   2014-01-07 07:55:50 +0000
@@ -446,6 +446,7 @@
     (define-key map "\M-\C-s" 'isearch-repeat-forward)
     (define-key map "\M-\C-r" 'isearch-repeat-backward)
     (define-key map "\177" 'isearch-delete-char)
+    (define-key map [backspace] 'isearch-delete-char)
     (define-key map "\C-g" 'isearch-abort)
 
     ;; This assumes \e is the meta-prefix-char.
@@ -456,6 +457,7 @@
     (define-key map "\C-q" 'isearch-quote-char)
 
     (define-key map "\r" 'isearch-exit)
+    (define-key map [return] 'isearch-exit)
     (define-key map "\C-j" 'isearch-printing-char)
     (define-key map "\t" 'isearch-printing-char)
     (define-key map [?\S-\ ] 'isearch-printing-char)

=== modified file 'lisp/progmodes/ps-mode.el'
--- a/lisp/progmodes/ps-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/ps-mode.el 2014-01-07 07:55:50 +0000
@@ -427,7 +427,6 @@
   (define-key ps-mode-map "\177" 'ps-mode-backward-delete-char)
   (define-key ps-mode-map "\t" 'ps-mode-tabkey)
   (define-key ps-mode-map "\r" 'ps-mode-newline)
-  (define-key ps-mode-map [return] 'ps-mode-newline)
   (easy-menu-define ps-mode-main ps-mode-map "PostScript" ps-mode-menu-main))
 
 (unless ps-run-mode-map