From 8332fa80b6fc27d93719218a7cdbf71ea9533b8a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 15 May 1998 21:50:07 +0000 Subject: [PATCH] (define-mail-alias): Compensate for not resetting the match data when string-match fails. --- lisp/mail/mailalias.el | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 176bfd80163..9d15345dd43 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -334,10 +334,14 @@ if it is quoted with double-quotes." ;; double-quotes. Otherwise, addresses are separated by commas. (if from-mailrc-file (if (eq ?\" (aref definition start)) - (progn (string-match "[^\\]\\(\\([\\][\\]\\)*\\)\"[ \t,]*" definition start) - (setq start (1+ start) - end (match-end 1) - convert-backslash t)) + ;; The following test on `found' compensates for a bug + ;; in match-end, which does not return nil when match + ;; failed. + (let ((found (string-match "[^\\]\\(\\([\\][\\]\\)*\\)\"[ \t,]*" + definition start))) + (setq start (1+ start) + end (and found (match-end 1)) + convert-backslash t)) (setq end (string-match "[ \t,]+" definition start))) (setq end (string-match "[ \t\n,]*,[ \t\n,]*" definition start))) (let ((temp (substring definition start end)) -- 2.39.2