diff options
| author | Richard M. Stallman | 1995-04-17 07:11:51 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-04-17 07:11:51 +0000 |
| commit | 01ea0e3b377632db843fdfb39144b60c8d4c5fe9 (patch) | |
| tree | 01b51f16cf15b5589a44b5a38ca1efca6979f78f | |
| parent | 1b8fa736b3881e2e3a06af8cf105fa91d30f1557 (diff) | |
| download | emacs-01ea0e3b377632db843fdfb39144b60c8d4c5fe9.tar.gz emacs-01ea0e3b377632db843fdfb39144b60c8d4c5fe9.zip | |
(ispell-init-ispell): Don't barf if there is a
warning message before the version line when Ispell starts up.
| -rw-r--r-- | lisp/textmodes/ispell.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 75590e711f5..2dd5f2ac118 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | ;;; | 6 | ;;; |
| 7 | ;;; | 7 | ;;; |
| 8 | ;;; Authors : Ken Stevens <k.stevens@ieee.org> | 8 | ;;; Authors : Ken Stevens <k.stevens@ieee.org> |
| 9 | ;;; Note: version numbers and time stamp are not updated | ||
| 10 | ;;; when this file is edited for release with GNU Emacs. | ||
| 9 | ;;; Last Modified On: Mon Feb 6 17:39:38 EST 1995 | 11 | ;;; Last Modified On: Mon Feb 6 17:39:38 EST 1995 |
| 10 | ;;; Update Revision : 2.36 | 12 | ;;; Update Revision : 2.36 |
| 11 | ;;; Syntax : emacs-lisp | 13 | ;;; Syntax : emacs-lisp |
| @@ -1545,9 +1547,14 @@ scrolling the current window. Leave the new window selected." | |||
| 1545 | (accept-process-output ispell-process) ; Get version ID line | 1547 | (accept-process-output ispell-process) ; Get version ID line |
| 1546 | (cond ((null ispell-filter) | 1548 | (cond ((null ispell-filter) |
| 1547 | (error "%s did not output version line" ispell-program-name)) | 1549 | (error "%s did not output version line" ispell-program-name)) |
| 1548 | ((and (null (cdr ispell-filter)) | 1550 | ((and |
| 1549 | (stringp (car ispell-filter)) | 1551 | (stringp (car ispell-filter)) |
| 1550 | (string-match "^@(#) " (car ispell-filter))) | 1552 | (if (string-match "warning: " (car ispell-filter)) |
| 1553 | (progn | ||
| 1554 | (accept-process-output ispell-process 5) ; 1st was warn msg. | ||
| 1555 | (stringp (car ispell-filter))) | ||
| 1556 | (null (cdr ispell-filter))) | ||
| 1557 | (string-match "^@(#) " (car ispell-filter))) | ||
| 1551 | ;; got the version line as expected (we already know it's the right | 1558 | ;; got the version line as expected (we already know it's the right |
| 1552 | ;; version, so don't bother checking again.) | 1559 | ;; version, so don't bother checking again.) |
| 1553 | nil) | 1560 | nil) |