diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/hippie-exp.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d450e3d5d5..c142daeee7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-23 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * hippie-exp.el (he-line-search-regexp): | ||
| 4 | Handle comint-prompt-regexp containing subgroups. (Bug#17529) | ||
| 5 | |||
| 1 | 2014-05-23 Stephen Berman <stephen.berman@gmx.net> | 6 | 2014-05-23 Stephen Berman <stephen.berman@gmx.net> |
| 2 | 7 | ||
| 3 | * calendar/todo-mode.el: Remove dependence on auto-mode-alist, | 8 | * calendar/todo-mode.el: Remove dependence on auto-mode-alist, |
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index 51c8c3c3d7e..d3b8a2cf6c5 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el | |||
| @@ -715,7 +715,7 @@ string). It returns t if a new completion is found, nil otherwise." | |||
| 715 | 715 | ||
| 716 | (defun he-line-search-regexp (pat strip-prompt) | 716 | (defun he-line-search-regexp (pat strip-prompt) |
| 717 | (if strip-prompt | 717 | (if strip-prompt |
| 718 | (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\(" | 718 | (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\(?2:" |
| 719 | (regexp-quote pat) | 719 | (regexp-quote pat) |
| 720 | "[^\n]*[^ \t\n]\\)") | 720 | "[^\n]*[^ \t\n]\\)") |
| 721 | (concat "^\\(\\s-*\\)\\(" | 721 | (concat "^\\(\\s-*\\)\\(" |