diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-06-05 12:05:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-06-05 12:05:05 +0000 |
| commit | 4e722714a8add38dddbb4bc86903c8542d0ac28f (patch) | |
| tree | 4484a8e73ea20fe84d3def9cfb1fdba879e59e53 /lisp/gnus.el | |
| parent | e5fd28221b7f9c7404374b09751148255a581241 (diff) | |
| download | emacs-4e722714a8add38dddbb4bc86903c8542d0ac28f.tar.gz | |
(gnus-newsrc-to-gnus-format): In main loop,
don't try to match the ranges with the regexp.
Match just the group name and the subscribed-flag.
Diffstat (limited to 'lisp/gnus.el')
| -rw-r--r-- | lisp/gnus.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/gnus.el b/lisp/gnus.el index e32eb67a36c..b498747bc86 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -6586,18 +6586,17 @@ If optional argument RAWFILE is non-nil, the raw startup file is read." ;; Before supporting continuation lines, " newsgroup ! 1-5" was ;; okay, but now it is invalid. It should be "newsgroup! 1-5". (goto-char (point-min)) - ;; Due to overflows in regex.c, change the following regexp: + ;; We used this regexp, but it caused overflows. ;; "^\\([^:! \t\n]+\\)\\([:!]\\)[ \t]*\\(.*\\)$" ;; Suggested by composer@bucsf.bu.edu (Jeff Kellem) ;; but no longer viable because of extensive backtracking in Emacs 19: ;; "^\\([^:! \t\n]+\\)\\([:!]\\)[ \t]*\\(\\(...\\)*.*\\)$" ;; but, the following causes trouble on some case: ;; "^\\([^:! \t\n]+\\)\\([:!]\\)[ \t]*\\(\\|[^ \t\n].*\\)$" - (while (re-search-forward - (if (= gnus-emacs-version 18) - "^\\([^:! \t\n]+\\)\\([:!]\\)[ \t]*\\(\\(...\\)*.*\\)$" - "^\\([^:! \t\n]+\\)\\([:!]\\)[ \t]*\\(.*\\)$") - nil t) + ;; So now we don't try to match the tail of the line at all. + ;; It's just as easy to extract it later. + (while (re-search-forward "^\\([^:! \t\n]+\\)\\([:!]\\)" + nil t) (setq newsgroup (buffer-substring (match-beginning 1) (match-end 1))) ;; Check duplications of newsgroups. ;; Note: Checking the duplications takes very long time. @@ -6606,7 +6605,9 @@ If optional argument RAWFILE is non-nil, the raw startup file is read." (setq subscribe (string-equal ":" (buffer-substring (match-beginning 2) (match-end 2)))) - (setq ranges (buffer-substring (match-beginning 3) (match-end 3))) + (skip-chars-forward " \t") + (setq ranges (buffer-substring (point) (save-excursion + (end-of-line) (point)))) (setq read-list nil) (while (string-match "^[, \t]*\\([0-9-]+\\)" ranges) (setq subrange (substring ranges (match-beginning 1) (match-end 1))) |