diff options
| author | Gerd Moellmann | 2001-01-11 15:31:12 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-01-11 15:31:12 +0000 |
| commit | c5348233d2efc2cf1a4d5d1afa9287a46c43c795 (patch) | |
| tree | 0eb33231a2a02a252ec55a4062377574f65f4d31 | |
| parent | 50ca4be0b9764baaa8bf0f49ba02b6b638053d7d (diff) | |
| download | emacs-c5348233d2efc2cf1a4d5d1afa9287a46c43c795.tar.gz emacs-c5348233d2efc2cf1a4d5d1afa9287a46c43c795.zip | |
(isearch-search): In the condition-case handler for
`error', set isearch-invalid-regexp to the whole error message.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/isearch.el | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f4e7912766e..68f61071a54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-01-11 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-01-11 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * isearch.el (isearch-search): In the condition-case handler for | ||
| 4 | `error', set isearch-invalid-regexp to the whole error message. | ||
| 5 | |||
| 3 | * subr.el (eval-after-load): Call load-symbol-file-load-history to | 6 | * subr.el (eval-after-load): Call load-symbol-file-load-history to |
| 4 | ensure that eval-after-load works for files dumped with Emacs. | 7 | ensure that eval-after-load works for files dumped with Emacs. |
| 5 | 8 | ||
diff --git a/lisp/isearch.el b/lisp/isearch.el index 997cdc6aac9..251c85cf1e9 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -1583,8 +1583,8 @@ If there is no completion possible, say so and continue searching." | |||
| 1583 | isearch-invalid-regexp) | 1583 | isearch-invalid-regexp) |
| 1584 | (setq isearch-invalid-regexp "incomplete input"))) | 1584 | (setq isearch-invalid-regexp "incomplete input"))) |
| 1585 | (error | 1585 | (error |
| 1586 | ;; stack overflow in regexp search. | 1586 | ;; Stack overflow in regexp search, for instance. |
| 1587 | (setq isearch-invalid-regexp (car (cdr lossage))))) | 1587 | (setq isearch-invalid-regexp (format "%s" lossage)))) |
| 1588 | 1588 | ||
| 1589 | (if isearch-success | 1589 | (if isearch-success |
| 1590 | nil | 1590 | nil |