[Emacs-diffs] emacs admin/FOR-RELEASE etc/NEWS lisp/ChangeLog...

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/30 16:11:22

Modified files:
        admin          : FOR-RELEASE 
        etc            : NEWS 
        lisp           : ChangeLog comint.el 

Log message:
        (comint-mode-map): Rebind `M-r' from
        `comint-previous-matching-input' to
        `comint-history-isearch-backward-regexp'.
        Unbind `M-s' to allow global key binding `M-s'.
        Add menu items for `comint-history-isearch-backward' and
        `comint-history-isearch-backward-regexp'.  (Bug#3746)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/admin/FOR-RELEASE?cvsroot=emacs&r1=1.897&r2=1.898
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2128&r2=1.2129
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16769&r2=1.16770
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/comint.el?cvsroot=emacs&r1=1.400&r2=1.401

Patches:
Index: admin/FOR-RELEASE
===================================================================
RCS file: /sources/emacs/emacs/admin/FOR-RELEASE,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -b -r1.897 -r1.898
--- admin/FOR-RELEASE   16 Jul 2009 03:30:31 -0000      1.897
+++ admin/FOR-RELEASE   30 Nov 2009 16:11:18 -0000      1.898
@@ -81,16 +81,12 @@
 2. Minibuffer binds `M-s' to `next-matching-history-element'
    (not useful any more since C-s can now search in the history).
 
-3. Shell mode binds `M-s' to `comint-next-matching-input'.
-   This key binding can be changed later when we will implement
-   incremental search through the shell history.
-
-4. `center-line' in Text mode was already moved to the text formatting
+3. `center-line' in Text mode was already moved to the text formatting
    keymap as `M-o M-s' (thus this binding is not necessary any more
    in `nroff-mode-map' too and can be removed now from the nroff mode
    because it can now use the global key binding `M-o M-s' `center-line').
 
-5. PCL-CVS binds `M-s' to `cvs-status', and log-edit-mode binds it to
+4. PCL-CVS binds `M-s' to `cvs-status', and log-edit-mode binds it to
    `log-edit-comment-search-forward'.  Perhaps search commands
    on the global key binding `M-s' are useless in these modes.
 

Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2128
retrieving revision 1.2129
diff -u -b -r1.2128 -r1.2129
--- etc/NEWS    29 Nov 2009 23:34:05 -0000      1.2128
+++ etc/NEWS    30 Nov 2009 16:11:18 -0000      1.2129
@@ -301,8 +301,8 @@
 
 *** Isearch searches in the comint/shell input history when the new variable
 `comint-history-isearch' is non-nil.  New commands 
`comint-history-isearch-backward'
-and `comint-history-isearch-backward-regexp' start Isearch in the input history
-regardless of the value of `comint-history-isearch'.
+and `comint-history-isearch-backward-regexp' (bound to M-r) start Isearch
+in the input history regardless of the value of `comint-history-isearch'.
 
 +++
 *** Autorevert Tail mode now works also for remote files.

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16769
retrieving revision 1.16770
diff -u -b -r1.16769 -r1.16770
--- lisp/ChangeLog      30 Nov 2009 16:05:47 -0000      1.16769
+++ lisp/ChangeLog      30 Nov 2009 16:11:19 -0000      1.16770
@@ -1,5 +1,14 @@
 2009-11-30  Juri Linkov  <address@hidden>
 
+       * comint.el (comint-mode-map): Rebind `M-r' from
+       `comint-previous-matching-input' to
+       `comint-history-isearch-backward-regexp'.
+       Unbind `M-s' to allow global key binding `M-s'.
+       Add menu items for `comint-history-isearch-backward' and
+       `comint-history-isearch-backward-regexp'.  (Bug#3746)
+
+2009-11-30  Juri Linkov  <address@hidden>
+
        * replace.el (perform-replace): Let-bind recenter-last-op to nil.
        For def=recenter, replace `recenter' with `recenter-top-bottom'
        that is called with `this-command' and `last-command' let-bound

Index: lisp/comint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/comint.el,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -b -r1.400 -r1.401
--- lisp/comint.el      23 Nov 2009 20:31:11 -0000      1.400
+++ lisp/comint.el      30 Nov 2009 16:11:22 -0000      1.401
@@ -62,8 +62,7 @@
 ;;
 ;; M-p    comint-previous-input           Cycle backwards in input history
 ;; M-n    comint-next-input               Cycle forwards
-;; M-r     comint-previous-matching-input  Previous input matching a regexp
-;; M-s     comint-next-matching-input      Next input that matches
+;; M-r     comint-history-isearch-backward-regexp  Isearch input regexp 
backward
 ;; M-C-l   comint-show-output             Show last batch of process output
 ;; RET    comint-send-input
 ;; C-d    comint-delchar-or-maybe-eof     Delete char unless at end of buff
@@ -446,10 +445,7 @@
     (define-key map "\en"        'comint-next-input)
     (define-key map [C-up]       'comint-previous-input)
     (define-key map [C-down]     'comint-next-input)
-    (define-key map "\er"        'comint-previous-matching-input)
-    ;; FIXME: maybe M-r better to be bound to Isearch comint history?
-    ;; (define-key map "\er"     'comint-history-isearch-backward-regexp)
-    (define-key map "\es"        'comint-next-matching-input)
+    (define-key map "\er"        'comint-history-isearch-backward-regexp)
     (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input)
     (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input)
     (define-key map "\e\C-l"     'comint-show-output)
@@ -512,6 +508,10 @@
       '("Kill Current Input" . comint-kill-input))
     (define-key map [menu-bar inout copy-input]
       '("Copy Old Input" . comint-copy-old-input))
+    (define-key map [menu-bar inout history-isearch-backward-regexp]
+      '("Isearch Input Regexp Backward..." . 
comint-history-isearch-backward-regexp))
+    (define-key map [menu-bar inout history-isearch-backward]
+      '("Isearch Input String Backward..." . comint-history-isearch-backward))
     (define-key map [menu-bar inout forward-matching-history]
       '("Forward Matching Input..." . comint-forward-matching-input))
     (define-key map [menu-bar inout backward-matching-history]