diff options
author | Richard M. Stallman <[email protected]> | 1995-04-17 07:11:51 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 1995-04-17 07:11:51 +0000 |
commit | 01ea0e3b377632db843fdfb39144b60c8d4c5fe9 (patch) | |
tree | 01b51f16cf15b5589a44b5a38ca1efca6979f78f | |
parent | 1b8fa736b3881e2e3a06af8cf105fa91d30f1557 (diff) |
(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 75590e711f..2dd5f2ac11 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -6,6 +6,8 @@ ;;; ;;; ;;; Authors : Ken Stevens <[email protected]> +;;; Note: version numbers and time stamp are not updated +;;; when this file is edited for release with GNU Emacs. ;;; Last Modified On: Mon Feb 6 17:39:38 EST 1995 ;;; Update Revision : 2.36 ;;; Syntax : emacs-lisp @@ -1545,9 +1547,14 @@ scrolling the current window. Leave the new window selected." (accept-process-output ispell-process) ; Get version ID line (cond ((null ispell-filter) (error "%s did not output version line" ispell-program-name)) - ((and (null (cdr ispell-filter)) - (stringp (car ispell-filter)) - (string-match "^@(#) " (car ispell-filter))) + ((and + (stringp (car ispell-filter)) + (if (string-match "warning: " (car ispell-filter)) + (progn + (accept-process-output ispell-process 5) ; 1st was warn msg. + (stringp (car ispell-filter))) + (null (cdr ispell-filter))) + (string-match "^@(#) " (car ispell-filter))) ;; got the version line as expected (we already know it's the right ;; version, so don't bother checking again.) nil) |