From e4f74da9f47fd699b2529886625a4f80c743d6b0 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 7 Jan 2014 09:55:50 +0200 Subject: [PATCH] * 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. --- lisp/ChangeLog | 8 ++++++++ lisp/isearch.el | 2 ++ lisp/progmodes/ps-mode.el | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee11efdc7eb..222582b3d73 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-01-07 Juri Linkov + + * 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 * vc/log-view.el (log-view-beginning-of-defun): Add comment diff --git a/lisp/isearch.el b/lisp/isearch.el index fe2f1ace339..4749846d509 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -446,6 +446,7 @@ This is like `describe-bindings', but displays only Isearch keys." (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 @@ This is like `describe-bindings', but displays only Isearch keys." (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) diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index cd2d0fb74dd..f7de331f73b 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -427,7 +427,6 @@ If nil, use `temporary-file-directory'." (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 -- 2.39.2