From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#14804: Gnus spelling fix: unexist -> nonexistent Date: Sat, 06 Jul 2013 15:17:31 -0700 Organization: UCLA Computer Science Department Message-ID: <51D8977B.2060009@cs.ucla.edu> References: <51D7E64E.40601@cs.ucla.edu> <87d2qvzomv.fsf@building.gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1373149092 24688 80.91.229.3 (6 Jul 2013 22:18:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jul 2013 22:18:12 +0000 (UTC) Cc: 14804@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jul 07 00:18:12 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Uvany-0003gc-Bs for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 Jul 2013 00:18:10 +0200 Original-Received: from localhost ([::1]:38490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uvanx-0001bU-U9 for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jul 2013 18:18:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uvanr-0001bB-TX for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:18:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uvanq-0006SX-3T for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:18:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uvanq-0006SS-0C for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Uvanp-00081K-KA for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:18:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 Jul 2013 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14804 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.137314906830787 (code B ref -1); Sat, 06 Jul 2013 22:18:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Jul 2013 22:17:48 +0000 Original-Received: from localhost ([127.0.0.1]:35643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Uvanb-00080U-8v for submit@debbugs.gnu.org; Sat, 06 Jul 2013 18:17:48 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57020) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1UvanY-000805-Hm for submit@debbugs.gnu.org; Sat, 06 Jul 2013 18:17:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvanR-0006PL-QZ for submit@debbugs.gnu.org; Sat, 06 Jul 2013 18:17:39 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:37811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvanR-0006PH-N2 for submit@debbugs.gnu.org; Sat, 06 Jul 2013 18:17:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvanP-0001Zo-U8 for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:17:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvanO-0006Op-6s for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:17:35 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:38292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvanN-0006OT-SB for bug-gnu-emacs@gnu.org; Sat, 06 Jul 2013 18:17:34 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 88EF1A60047; Sat, 6 Jul 2013 15:17:32 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qAPpB9oxRlnO; Sat, 6 Jul 2013 15:17:31 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-71-108-49-126.lsanca.fios.verizon.net [71.108.49.126]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 7A918A60001; Sat, 6 Jul 2013 15:17:31 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 In-Reply-To: <87d2qvzomv.fsf@building.gnus.org> X-Enigmail-Version: 1.5.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:76029 Archived-At: On 07/06/2013 08:36 AM, Lars Ingebrigtsen wrote: > `unexist' has been in use for a couple of years, so this would break > people's Gnus files. Sorry, I thought 'unexist' was a more recent edition. In that case, how about if gnus-clean-old-newsrc automatically updates the old Gnus files from 'unexist' to 'nonexistent'? The code already does that for the old bad seplling 'unexists', so there's precedent for fixing spelling in this area. > it's probably "non-existent" or "unexisting". Those are both English words, but "unexisting" is rare nowadays (almost obsolete), and "unexist" itself is not English. The GNU Emacs trunk uses "nonexistent" in about 240 places, "non-existent" in about 120 places (this is more the British style, but whatever), and "unexisting" in zero places until the recent addition. There is some advantage to sticking with the more-common usage. Revised patch follows. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-07-06 12:49:38 +0000 +++ lisp/gnus/ChangeLog 2013-07-06 22:07:33 +0000 @@ -1,3 +1,21 @@ +2013-07-06 Paul Eggert + + Spelling fix: unexist -> nonexistent (Bug#14804). + * gnus-group.el (gnus-group-expire-articles-1): + * gnus-start.el (gnus-clean-old-newsrc): + * gnus-sum.el (gnus-articles-to-read, gnus-adjust-marked-articles) + (gnus-update-marks, gnus-summary-expire-articles) + (gnus-summary-insert-old-articles): + * gnus.el (gnus-article-mark-lists, gnus-article-special-mark-lists) + (gnus-article-unpropagated-mark-lists): + * nnimap.el (nnimap-retrieve-group-data-early, nnimap-update-info) + (nnimap-update-qresync-info): + Use 'nonexistent', not 'unexist', to for marks of nonexistent articles. + * gnus-start.el (gnus-clean-old-newsrc): Migrate old-spelling + 'unexist' marks to the new spelling 'nonexistent'. + * gnus-sum.el (gnus-newsgroup-nonexistent): + Rename from gnus-newsgroup-unexist. All uses changed. + 2013-07-05 David Kastrup * auth-source.el (auth-source-netrc-parse-one): Allow empty strings in === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2013-07-02 10:38:58 +0000 +++ lisp/gnus/gnus-group.el 2013-07-06 09:36:51 +0000 @@ -3657,7 +3657,7 @@ (articles-to-expire (gnus-list-range-difference (gnus-uncompress-sequence (cdr expirable)) - (cdr (assq 'unexist (gnus-info-marks info))))) + (cdr (assq 'nonexistent (gnus-info-marks info))))) (expiry-wait (gnus-group-find-parameter group 'expiry-wait)) (nnmail-expiry-target (or (gnus-group-find-parameter group 'expiry-target) === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2013-07-02 10:38:58 +0000 +++ lisp/gnus/gnus-start.el 2013-07-06 22:07:33 +0000 @@ -2306,10 +2306,11 @@ (defun gnus-clean-old-newsrc (&optional force) (when gnus-newsrc-file-version - ;; Remove totally bogus `unexists' entries. The name is - ;; `unexist'. + ;; Remove totally bogus `unexist' and `unexists' entries. The name is + ;; `nonexistent'. (dolist (info (cdr gnus-newsrc-alist)) - (let ((exist (assoc 'unexists (gnus-info-marks info)))) + (let ((exist (or (assoc 'unexist (gnus-info-marks info)) + (assoc 'unexists (gnus-info-marks info))))) (when exist (gnus-info-set-marks info (delete exist (gnus-info-marks info)))))) @@ -2318,7 +2319,7 @@ (gnus-continuum-version "Ma Gnus v0.03"))) ;; Remove old `exist' marks from old nnimap groups. (dolist (info (cdr gnus-newsrc-alist)) - (let ((exist (assoc 'unexist (gnus-info-marks info)))) + (let ((exist (assoc 'nonexistent (gnus-info-marks info)))) (when exist (gnus-info-set-marks info (delete exist (gnus-info-marks info))))))))) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2013-07-03 04:15:38 +0000 +++ lisp/gnus/gnus-sum.el 2013-07-06 09:36:51 +0000 @@ -1524,8 +1524,8 @@ (defvar gnus-newsgroup-seen nil "Range of seen articles in the current newsgroup.") -(defvar gnus-newsgroup-unexist nil - "Range of unexistent articles in the current newsgroup.") +(defvar gnus-newsgroup-nonexistent nil + "Range of nonexistent articles in the current newsgroup.") (defvar gnus-newsgroup-articles nil "List of articles in the current newsgroup.") @@ -1574,7 +1574,7 @@ gnus-newsgroup-killed gnus-newsgroup-unseen gnus-newsgroup-seen - gnus-newsgroup-unexist + gnus-newsgroup-nonexistent gnus-newsgroup-cached gnus-newsgroup-downloadable gnus-newsgroup-undownloaded @@ -5822,7 +5822,7 @@ (gnus-sorted-nunion (gnus-sorted-union gnus-newsgroup-dormant gnus-newsgroup-marked) gnus-newsgroup-unreads)) - (cdr (assq 'unexist (gnus-info-marks (gnus-get-info group)))))) + (cdr (assq 'nonexistent (gnus-info-marks (gnus-get-info group)))))) (scored-list (gnus-killed-articles gnus-newsgroup-killed articles)) (scored (length scored-list)) (number (length articles)) @@ -5993,7 +5993,7 @@ (> min (car articles))))) (pop articles)) (set var articles)) - ((eq mark 'unexist) + ((eq mark 'nonexistent) (set var (cdr marks))))))))) (defun gnus-update-missing-marks (missing) @@ -6071,7 +6071,7 @@ (push (list del 'del (list (cdr type))) delta-marks)))) (when (or list - (eq (cdr type) 'unexist)) + (eq (cdr type) 'nonexistent)) (push (cons (cdr type) list) newmarked))) (when delta-marks @@ -10327,7 +10327,7 @@ (gnus-list-of-read-articles gnus-newsgroup-name)) (setq gnus-newsgroup-expirable (sort gnus-newsgroup-expirable '<))) - gnus-newsgroup-unexist)) + gnus-newsgroup-nonexistent)) (expiry-wait (if now 'immediate (gnus-group-find-parameter gnus-newsgroup-name 'expiry-wait))) @@ -12862,7 +12862,7 @@ ;; Use a compressed range to avoid creating a huge list. (gnus-range-difference (gnus-range-difference (list gnus-newsgroup-active) old) - gnus-newsgroup-unexist)) + gnus-newsgroup-nonexistent)) (setq len (gnus-range-length older)) (cond ((null older) nil) === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2013-07-02 10:38:58 +0000 +++ lisp/gnus/gnus.el 2013-07-06 09:36:51 +0000 @@ -2636,11 +2636,11 @@ (scored . score) (saved . save) (cached . cache) (downloadable . download) (unsendable . unsend) (forwarded . forward) - (seen . seen) (unexist . unexist))) + (seen . seen) (nonexistent . nonexistent))) (defconst gnus-article-special-mark-lists '((seen range) - (unexist range) + (nonexistent range) (killed range) (bookmark tuple) (uid tuple) @@ -2655,7 +2655,7 @@ ;; `score' is not a proper mark ;; `bookmark': don't propagated it, or fix the bug in update-mark. (defconst gnus-article-unpropagated-mark-lists - '(seen cache download unsend score bookmark unexist) + '(seen cache download unsend score bookmark nonexistent) "Marks that shouldn't be propagated to back ends. Typical marks are those that make no sense in a standalone back end, such as a mark that says whether an article is stored in the cache === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2013-07-02 10:38:58 +0000 +++ lisp/gnus/nnimap.el 2013-07-06 09:36:51 +0000 @@ -1288,7 +1288,7 @@ (setf (nnimap-initial-resync nnimap-object) 0) (let ((qresyncp (nnimap-capability "QRESYNC")) params groups sequences active uidvalidity modseq group - unexist) + nonexistent) ;; Go through the infos and gather the data needed to know ;; what and how to request the data. (dolist (info infos) @@ -1296,7 +1296,7 @@ group (nnimap-decode-gnus-group (gnus-group-real-name (gnus-info-group info))) active (cdr (assq 'active params)) - unexist (assq 'unexist (gnus-info-marks info)) + nonexistent (assq 'nonexistent (gnus-info-marks info)) uidvalidity (cdr (assq 'uidvalidity params)) modseq (cdr (assq 'modseq params))) (setf (nnimap-examined nnimap-object) group) @@ -1304,7 +1304,7 @@ uidvalidity active modseq - unexist) + nonexistent) (push (list (nnimap-send-command "EXAMINE %S (%s (%s %s))" (utf7-encode group t) @@ -1323,7 +1323,7 @@ ;; is read-only or not. "SELECT")) start) - (if (and active uidvalidity unexist) + (if (and active uidvalidity nonexistent) ;; Fetch the last 100 flags. (setq start (max 1 (- (cdr active) 100))) (incf (nnimap-initial-resync nnimap-object)) @@ -1506,24 +1506,24 @@ (when new-marks (push (cons (car type) new-marks) marks))))) ;; Keep track of non-existing articles. - (let* ((old-unexists (assq 'unexist marks)) + (let* ((old-nonexistent (assq 'nonexistent marks)) (active (gnus-active group)) - (unexists + (nonexistent (if completep (gnus-range-difference active (gnus-compress-sequence existing)) (gnus-add-to-range - (cdr old-unexists) + (cdr old-nonexistent) (gnus-list-range-difference existing (gnus-active group)))))) (when (> (car active) 1) - (setq unexists (gnus-range-add - (cons 1 (1- (car active))) - unexists))) - (if old-unexists - (setcdr old-unexists unexists) - (push (cons 'unexist unexists) marks))) + (setq nonexistent (gnus-range-add + (cons 1 (1- (car active))) + nonexistent))) + (if old-nonexistent + (setcdr old-nonexistent nonexistent) + (push (cons 'nonexistent nonexistent) marks))) (gnus-info-set-marks info marks t)))) ;; Tell Gnus whether there are any \Recent messages in any of ;; the groups. @@ -1568,13 +1568,13 @@ (when ticks (push (cons (car type) ticks) marks))) (gnus-info-set-marks info marks t)) - ;; Add vanished to the list of unexisting articles. + ;; Add vanished to the list of nonexistent articles. (when vanished - (let* ((old-unexists (assq 'unexist marks)) - (unexists (gnus-range-add (cdr old-unexists) vanished))) - (if old-unexists - (setcdr old-unexists unexists) - (push (cons 'unexist unexists) marks))) + (let* ((old-nonexistent (assq 'nonexistent marks)) + (nonexistent (gnus-range-add (cdr old-nonexistent) vanished))) + (if old-nonexistent + (setcdr old-nonexistent nonexistent) + (push (cons 'nonexistent nonexistent) marks))) (gnus-info-set-marks info marks t)))) (defun nnimap-imap-ranges-to-gnus-ranges (irange)