]> git.eshelyaron.com Git - emacs.git/commitdiff
Clean up code in nnimap-parse-flags slightly
authorLars Ingebrigtsen <larsi@gnus.org>
Thu, 18 Jul 2019 13:17:27 +0000 (15:17 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Sat, 20 Jul 2019 12:08:36 +0000 (14:08 +0200)
* lisp/gnus/nnimap.el (nnimap-parse-flags): Clean up code
slightly, removing redundant checks for `end'.

lisp/gnus/nnimap.el

index 67c5db1e044cbc651d363d3edabea03942f72d1a..4a1ab2cca5c2aafbf2d15f0c20e06d8cf8a92d37 100644 (file)
@@ -1798,19 +1798,17 @@ If LIMIT, first try to limit the search to the N last articles."
                 (goto-char start)
                 (setq permanent-flags
                       (if (equal command "SELECT")
-                          (and (search-forward "PERMANENTFLAGS "
-                                               (or end (point-min)) t)
+                          (and (search-forward "PERMANENTFLAGS " end t)
                                (read (current-buffer)))
                         'not-scanned))
                 (goto-char start)
                 (setq uidnext
-                      (and (search-forward "UIDNEXT "
-                                           (or end (point-min)) t)
+                      (and (search-forward "UIDNEXT " end t)
                            (read (current-buffer))))
                 (goto-char start)
                 (setq uidvalidity
                       (and (re-search-forward "UIDVALIDITY \\([0-9]+\\)"
-                                              (or end (point-min)) t)
+                                              end t)
                            ;; Store UIDVALIDITY as a string, as it's
                            ;; too big for 32-bit Emacsen, usually.
                            (match-string 1)))
@@ -1818,12 +1816,12 @@ If LIMIT, first try to limit the search to the N last articles."
                 (setq vanished
                       (and (eq flag-sequence 'qresync)
                            (re-search-forward "^\\* VANISHED .*? \\([0-9:,]+\\)"
-                                              (or end (point-min)) t)
+                                              end t)
                            (match-string 1)))
                 (goto-char start)
                 (setq highestmodseq
                       (and (re-search-forward "HIGHESTMODSEQ \\([0-9]+\\)"
-                                           (or end (point-min)) t)
+                                              end t)
                            (match-string 1)))
                 (goto-char end)
                 (forward-line -1))