Re: [Emacs-diffs] master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Eric Abrahamsen <eric@ericabrahamsen.net>]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

Ted Zlatanov <tzz@lifelogs.com> writes:

> On Wed, 24 Dec 2014 22:35:16 +0800 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 
>
> EA> Okay, just to continue being deliberately dumb about this: the change is
> EA> already in lisp/ChangeLog, but not in the top-level ChangeLog, and the
> EA> patch I sent in already adds a brief mention in GNUS_NEWS. So do I also
> EA> want to put it in top-level ChangeLog?
>
> Think of the ChangeLog as a restatement of the commit. So in this case,
> add a new entry to the ChangeLog even though you're not adding new
> features. Just say what you did ("Add version" etc.) and I can adjust if
> needed, but it should be part of the patch to make life easier for
> committers.
>
> I think you also want to update the GNUS-NEWS ChangeLog, likewise.

Okay, this should be it. Sorry for all the questions!

Eric


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-version-numbers-for-registry-var-updates.patch --]
[-- Type: text/x-diff, Size: 3306 bytes --]

From c52b8af5e0c577e73a90911ab0a5622a9f3a669a Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Sun, 21 Dec 2014 12:32:07 +0800
Subject: [PATCH] Fix version numbers for registry var updates

* lisp/gnus-registry.el: Emacs version number for altered variables
  and options should have been 25.1.  There's no need to keep
  `make-obsolete-variable' statements around for nonexistent
  variables.  Improve custom type of
  `gnus-registry-default-sort-function'.

* GNUS-NEWS: Note earlier change of default registry filename

* ChangeLog: Note change of default registry filename, and squashing
  of pruning bug in af0fe49.
---
 ChangeLog             |  6 ++++++
 GNUS-NEWS             |  3 +++
 lisp/gnus-registry.el | 13 +++----------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f41b90..76bc47e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-25  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	* lisp/gnus-registry.el: Change default extension of registry data file
+	from "eioio" to "eieio".  Fix bug leading to potential deletion of
+	"precious" registry entries.
+
 2014-06-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* configure.in: Add --without-compress-install option; check for gzip.
diff --git a/GNUS-NEWS b/GNUS-NEWS
index 16808af..777bc4c 100644
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -9,6 +9,9 @@ For older news, see Gnus info node "New Features".
 \f
 * New features
 
+** Default Gnus registry filename changed from "eioio" extension to
+   "eieio".
+
 ** New package `gnus-notifications.el' can send notifications when you
    receive new messages.
 
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 92f8f04..5038781 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -171,13 +171,6 @@ nnmairix groups are specifically excluded because they are ephemeral."
 
 (defvar gnus-registry-misc-menus nil)   ; ugly way to keep the menus
 
-(make-obsolete-variable 'gnus-registry-clean-empty nil "23.4")
-(make-obsolete-variable 'gnus-registry-use-long-group-names nil "23.4")
-(make-obsolete-variable 'gnus-registry-max-track-groups nil "23.4")
-(make-obsolete-variable 'gnus-registry-entry-caching nil "23.4")
-(make-obsolete-variable 'gnus-registry-trim-articles-without-groups nil "23.4")
-(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "24.4")
-
 (defcustom gnus-registry-track-extra '(subject sender recipient)
   "Whether the registry should track extra data about a message.
 The subject, recipients (To: and Cc:), and Sender (From:) headers
@@ -253,7 +246,7 @@ exactly how much less.  For example, given a maximum size of
 cut the registry back to \(- 50000 \(* 50000 0.1\)\) -> 45000
 entries.  The pruning process is constrained by the presence of
 \"precious\" entries."
-  :version "24.4"
+  :version "25.1"
   :group 'gnus-registry
   :type 'float)
 
@@ -265,9 +258,9 @@ Entries which sort to the front of the list will be pruned
 first.
 
 This can slow pruning down.  Set to nil to perform no sorting."
-  :version "24.4"
+  :version "25.1"
   :group 'gnus-registry
-  :type 'symbol)
+  :type '(choice (const :tag "No sorting" nil) function))
 
 (defun gnus-registry-sort-by-creation-time (l r)
   "Sort older entries to front of list."
-- 
2.2.1