[Emacs-diffs] emacs-24 r117145: Small fix for he-line-search-regexp

[Glenn Morris]

------------------------------------------------------------
revno: 117145
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17529
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-05-23 14:14:24 -0400
message:
  Small fix for he-line-search-regexp 
  
  * lisp/hippie-exp.el (he-line-search-regexp):
  Handle comint-prompt-regexp containing subgroups.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/hippie-exp.el             
hippieexp.el-20091113204419-o5vbwnq5f7feedwu-531

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-23 16:54:35 +0000
+++ b/lisp/ChangeLog    2014-05-23 18:14:24 +0000
@@ -1,3 +1,8 @@
+2014-05-23  Glenn Morris  <address@hidden>
+
+       * hippie-exp.el (he-line-search-regexp):
+       Handle comint-prompt-regexp containing subgroups.  (Bug#17529)
+
 2014-05-23  Stephen Berman  <address@hidden>
 
        * calendar/todo-mode.el: Remove dependence on auto-mode-alist,

=== modified file 'lisp/hippie-exp.el'
--- a/lisp/hippie-exp.el        2014-02-10 01:34:22 +0000
+++ b/lisp/hippie-exp.el        2014-05-23 18:14:24 +0000
@@ -715,7 +715,7 @@
 
 (defun he-line-search-regexp (pat strip-prompt)
   (if strip-prompt
-      (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\("
+      (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\(?2:"
              (regexp-quote pat)
              "[^\n]*[^ \t\n]\\)")
       (concat "^\\(\\s-*\\)\\("