Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Dmitry Gutov]

Hi!

> branch: master
> commit d20acfe06340953dce443795d28ac224a2223414
> Author: Eric Abrahamsen <eric@ericabrahamsen.net>
> Commit: Katsumi Yamaoka <yamaoka@jpl.org>

This commit breaks compilation of Emacs master:

Compiling gnus/gnus-registry.el
Eager macro-expansion failure: (invalid-slot-type max-size integer most-positive-fixnum)
Eager macro-expansion failure: (invalid-slot-type max-size integer most-positive-fixnum)

In toplevel form:
gnus/gnus-registry.el:88:1:Error: Invalid slot type: max-size, integer, most-positive-fixnum
make[3]: *** [gnus/gnus-registry.elc] Error 1
make[3]: Leaving directory `/home/gutov/vc/emacs/lisp'
make[2]: *** [compile-main] Error 2
make[2]: Leaving directory `/home/gutov/vc/emacs/lisp'
make[1]: *** [lisp] Error 2
make[1]: Leaving directory `/home/gutov/vc/emacs'
make: *** [bootstrap] Error 2

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Eric Abrahamsen]

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

Dmitry Gutov <dgutov@yandex.ru> writes:

> Hi!
>
>> branch: master
>> commit d20acfe06340953dce443795d28ac224a2223414
>> Author: Eric Abrahamsen <eric@ericabrahamsen.net>
>> Commit: Katsumi Yamaoka <yamaoka@jpl.org>
>
> This commit breaks compilation of Emacs master:

I just got a bunch of mean emails from the buildbot...

Sorry about that. I didn't know enough about the build process to
anticipate this failure -- I guess most-positive-fixnum isn't available
when batch-compiling?

I've attached a patch that puts things back the way they were.

Eric


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Revert-gnus-registry-slot-initform-to-previous-value.patch --]
[-- Type: text/x-diff, Size: 921 bytes --]

From c556f9b91e9a1d2d0fefb7440d49d09ba375b0fa Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Thu, 18 Dec 2014 23:22:43 +0800
Subject: [PATCH] Revert gnus registry slot initform to previous value

* lisp/gnus/registry.el (registry-db): Hardcode an integer; using
  most-positive-fixnum breaks compilation.
---
 lisp/gnus/registry.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index d086d64..bd711e7 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -98,7 +98,7 @@
             :type (or null float)
             :documentation "The registry version.")
    (max-size :initarg :max-size
-             :initform most-positive-fixnum
+             :initform 5000000
              :type integer
              :custom integer
              :documentation "The maximum number of registry entries.")
-- 
2.2.0


[-- Attachment #3: Type: text/plain, Size: 649 bytes --]



> Compiling gnus/gnus-registry.el
> Eager macro-expansion failure: (invalid-slot-type max-size integer most-positive-fixnum)
> Eager macro-expansion failure: (invalid-slot-type max-size integer most-positive-fixnum)
>
> In toplevel form:
> gnus/gnus-registry.el:88:1:Error: Invalid slot type: max-size, integer, most-positive-fixnum
> make[3]: *** [gnus/gnus-registry.elc] Error 1
> make[3]: Leaving directory `/home/gutov/vc/emacs/lisp'
> make[2]: *** [compile-main] Error 2
> make[2]: Leaving directory `/home/gutov/vc/emacs/lisp'
> make[1]: *** [lisp] Error 2
> make[1]: Leaving directory `/home/gutov/vc/emacs'
> make: *** [bootstrap] Error 2

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Andreas Schwab]

Eric Abrahamsen <eric@ericabrahamsen.net> writes:

> Sorry about that. I didn't know enough about the build process to
> anticipate this failure -- I guess most-positive-fixnum isn't available
> when batch-compiling?

No, the problem is that 'most-positive-fixnum is a symbol, not an
integer.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Paul Eggert]

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

On 12/18/2014 07:35 AM, Andreas Schwab wrote:
> No, the problem is that 'most-positive-fixnum is a symbol

I attempted to work around the problem by installing the attached 
patch.  Please let me know if it's not right.

[-- Attachment #2: 0001-registry.el-registry-db-Set-default-slot-later.patch --]
[-- Type: text/x-patch, Size: 1746 bytes --]

From 22e70c0440941ff8f77f990292bd20d79da3f99e Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 18 Dec 2014 13:00:15 -0800
Subject: [PATCH] * registry.el (registry-db): Set default slot later.

This is because its value is not a literal integer.
---
 lisp/gnus/ChangeLog   | 5 +++++
 lisp/gnus/registry.el | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 34dd919..6f0ea0f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* registry.el (registry-db): Set default slot later.
+	This is because its value is not a literal integer.
+
 2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mm-util.el (mm-with-unibyte-current-buffer): Mark obsolete and
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index d086d64..cc18407 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -98,7 +98,7 @@
             :type (or null float)
             :documentation "The registry version.")
    (max-size :initarg :max-size
-             :initform most-positive-fixnum
+             ;; :initform most-positive-fixnum ;; see below
              :type integer
              :custom integer
              :documentation "The maximum number of registry entries.")
@@ -123,6 +123,8 @@
    (data :initarg :data
          :type hash-table
          :documentation "The data hashtable.")))
+;; Do this separately, since defclass doesn't allow expressions in :initform.
+(oset-default registry-db max-size most-positive-fixnum)
 
 (defmethod initialize-instance :BEFORE ((this registry-db) slots)
   "Check whether a registry object needs to be upgraded."
-- 
1.9.3

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Ted Zlatanov]

On Thu, 18 Dec 2014 13:03:09 -0800 Paul Eggert <eggert@cs.ucla.edu> wrote: 

PE> On 12/18/2014 07:35 AM, Andreas Schwab wrote:
>> No, the problem is that 'most-positive-fixnum is a symbol

PE> I attempted to work around the problem by installing the attached
PE> patch.  Please let me know if it's not right.

It was perfect, thanks.

Ted

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Eric Abrahamsen]

Paul Eggert <eggert@cs.ucla.edu> writes:

> On 12/18/2014 07:35 AM, Andreas Schwab wrote:
>> No, the problem is that 'most-positive-fixnum is a symbol
>
> I attempted to work around the problem by installing the attached
> patch.  Please let me know if it's not right.

Thank you for the fix!

> From 22e70c0440941ff8f77f990292bd20d79da3f99e Mon Sep 17 00:00:00 2001
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Thu, 18 Dec 2014 13:00:15 -0800
> Subject: [PATCH] * registry.el (registry-db): Set default slot later.
>
> This is because its value is not a literal integer.
> ---
>  lisp/gnus/ChangeLog   | 5 +++++
>  lisp/gnus/registry.el | 4 +++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
> index 34dd919..6f0ea0f 100644
> --- a/lisp/gnus/ChangeLog
> +++ b/lisp/gnus/ChangeLog
> @@ -1,3 +1,8 @@
> +2014-12-18  Paul Eggert  <eggert@cs.ucla.edu>
> +
> +	* registry.el (registry-db): Set default slot later.
> +	This is because its value is not a literal integer.
> +
>  2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
>  
>  	* mm-util.el (mm-with-unibyte-current-buffer): Mark obsolete and
> diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
> index d086d64..cc18407 100644
> --- a/lisp/gnus/registry.el
> +++ b/lisp/gnus/registry.el
> @@ -98,7 +98,7 @@
>              :type (or null float)
>              :documentation "The registry version.")
>     (max-size :initarg :max-size
> -             :initform most-positive-fixnum
> +             ;; :initform most-positive-fixnum ;; see below
>               :type integer
>               :custom integer
>               :documentation "The maximum number of registry entries.")
> @@ -123,6 +123,8 @@
>     (data :initarg :data
>           :type hash-table
>           :documentation "The data hashtable.")))
> +;; Do this separately, since defclass doesn't allow expressions in :initform.
> +(oset-default registry-db max-size most-positive-fixnum)
>  
>  (defmethod initialize-instance :BEFORE ((this registry-db) slots)
>    "Check whether a registry object needs to be upgraded."

Re: master d20acfe: Fix Gnus registry pruning and sorting, and rename file

[Katsumi Yamaoka]

On Thu, 18 Dec 2014 16:33:18 +0200, Dmitry Gutov wrote:
> Hi!

>> branch: master
>> commit d20acfe06340953dce443795d28ac224a2223414
>> Author: Eric Abrahamsen <eric@ericabrahamsen.net>
>> Commit: Katsumi Yamaoka <yamaoka@jpl.org>

> This commit breaks compilation of Emacs master:
[...]

This should have been fixed now, thanks to Paul Eggert.

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

[Glenn Morris]

Some small comments on this change:

> +(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "24.4")

I think you meant 25.1.
Also, you haven't made it obsolete, you've removed it entirely:

> -(defcustom gnus-registry-max-pruned-entries nil
> -  "Maximum number of pruned entries in the registry, nil for unlimited."
> -  :version "24.1"

> +(defcustom gnus-registry-prune-factor 0.1
[...]
> +  :version "24.4"

Again, 25.1.

> +(defcustom gnus-registry-default-sort-function
> +  #'gnus-registry-sort-by-creation-time
> +  "Sort function to use when pruning the registry.
> +
> +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"
> +  :group 'gnus-registry
> +  :type 'symbol)

Again, 25.1. Also, a better :type would be:

(choice (const :tag "No sorting" nil) function)


Also, as a general comment, Gnus changes almost never seem to get NEWS
(or GNUS-NEWS) entries.

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

[Eric Abrahamsen]

On 12/19/14 02:39 AM, Glenn Morris wrote:
> Some small comments on this change:
>
>> +(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "24.4")
>
> I think you meant 25.1.
> Also, you haven't made it obsolete, you've removed it entirely:
>
>> -(defcustom gnus-registry-max-pruned-entries nil
>> -  "Maximum number of pruned entries in the registry, nil for unlimited."
>> -  :version "24.1"
>
>> +(defcustom gnus-registry-prune-factor 0.1
> [...]
>> +  :version "24.4"
>
> Again, 25.1.
>
>> +(defcustom gnus-registry-default-sort-function
>> +  #'gnus-registry-sort-by-creation-time
>> +  "Sort function to use when pruning the registry.
>> +
>> +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"
>> +  :group 'gnus-registry
>> +  :type 'symbol)
>
> Again, 25.1. Also, a better :type would be:
>
> (choice (const :tag "No sorting" nil) function)
>
>
> Also, as a general comment, Gnus changes almost never seem to get NEWS
> (or GNUS-NEWS) entries.

Thanks for these comments! To be honest, I don't really understand the
relationship between the gnus repository on gnus.org, and the gnus
codebase as it lives inside the emacs repo. I wrote those patches
against the gnus repo, and at the time (this was a while ago) emacs 25
wasn't out yet. Dunno how these things are meant to related.

Other points well taken, and I can provide a further patch to fix them.

Eric

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

[Ted Zlatanov]

On Fri, 19 Dec 2014 02:39:23 -0500 Glenn Morris <rgm@gnu.org> wrote: 

GM> Also, as a general comment, Gnus changes almost never seem to get NEWS
GM> (or GNUS-NEWS) entries.

This one didn't seem to merit it, it was mostly internal (except for the
default gnus-registry filename). Eric, do you want to write something?

On Fri, 19 Dec 2014 20:18:40 +0800 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 

EA> Thanks for these comments! To be honest, I don't really understand the
EA> relationship between the gnus repository on gnus.org, and the gnus
EA> codebase as it lives inside the emacs repo. I wrote those patches
EA> against the gnus repo, and at the time (this was a while ago) emacs 25
EA> wasn't out yet. Dunno how these things are meant to related.

The patch reviewer (me) should have adjusted those, so it was my fault.

EA> Other points well taken, and I can provide a further patch to fix them.

Please do and I'll apply it, thanks. If you could add the 25.1 version
fixes Glenn noted as well, it would be really helpful.

Ted

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

[Eric Abrahamsen]

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

Ted Zlatanov <tzz@lifelogs.com> writes:

> On Fri, 19 Dec 2014 02:39:23 -0500 Glenn Morris <rgm@gnu.org> wrote: 
>
> GM> Also, as a general comment, Gnus changes almost never seem to get NEWS
> GM> (or GNUS-NEWS) entries.
>
> This one didn't seem to merit it, it was mostly internal (except for the
> default gnus-registry filename). Eric, do you want to write something?
>
> On Fri, 19 Dec 2014 20:18:40 +0800 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 
>
> EA> Thanks for these comments! To be honest, I don't really understand the
> EA> relationship between the gnus repository on gnus.org, and the gnus
> EA> codebase as it lives inside the emacs repo. I wrote those patches
> EA> against the gnus repo, and at the time (this was a while ago) emacs 25
> EA> wasn't out yet. Dunno how these things are meant to related.
>
> The patch reviewer (me) should have adjusted those, so it was my fault.
>
> EA> Other points well taken, and I can provide a further patch to fix them.
>
> Please do and I'll apply it, thanks. If you could add the 25.1 version
> fixes Glenn noted as well, it would be really helpful.
>
> Ted

Here goes! I think this is everything. I wasn't aware that obsolete
variables still need to be defined, and am not sure what I've done is
correct. The other `make-obsolete-variable' statements in here refer to
otherwise-undefined variables.... ?

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: 2695 bytes --]

From e3a354642abfd18c08c9110a1bfbc7c9a50cf8e1 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.  Obsolete variables still need to
  be defined.  Improve custom type of
  `gnus-registry-default-sort-function'.

* GNUS-NEWS: Note earlier change of default registry filename
---
 GNUS-NEWS             |  3 +++
 lisp/gnus-registry.el | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

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..098248b 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -171,12 +171,14 @@ nnmairix groups are specifically excluded because they are ephemeral."
 
 (defvar gnus-registry-misc-menus nil)   ; ugly way to keep the menus
 
+(defvar gnus-registry-max-pruned-entries)
+
 (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")
+(make-obsolete-variable 'gnus-registry-max-pruned-entries nil "25.1")
 
 (defcustom gnus-registry-track-extra '(subject sender recipient)
   "Whether the registry should track extra data about a message.
@@ -253,7 +255,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 +267,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

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

[Stefan Monnier]

> Here goes! I think this is everything. I wasn't aware that obsolete
> variables still need to be defined,

The purpose of marking something obsolete is to try and make sure people
don't keep using it without realizing that this functionality is about
to disappear.
If the variable/function is already gone, then there's no need for any
make-obsolete(-variable).


        Stefan

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

[Ted Zlatanov]

On Sun, 21 Dec 2014 09:30:30 -0500 Stefan Monnier <monnier@iro.umontreal.ca> wrote: 

>> Here goes! I think this is everything. I wasn't aware that obsolete
>> variables still need to be defined,

SM> The purpose of marking something obsolete is to try and make sure people
SM> don't keep using it without realizing that this functionality is about
SM> to disappear.
SM> If the variable/function is already gone, then there's no need for any
SM> make-obsolete(-variable).

Yup.  And specifically here, I thought it was reasonable because the
change is not highly visible to users and will show up in 25.1 only.

Ted

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

[Ted Zlatanov]

On Sun, 21 Dec 2014 12:39:49 +0800 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 

EA> Here goes! I think this is everything. I wasn't aware that obsolete
EA> variables still need to be defined, and am not sure what I've done is
EA> correct. The other `make-obsolete-variable' statements in here refer to
EA> otherwise-undefined variables.... ?

The patch looks good, minus the obsolete variables.

Please also add ChangeLog entries, then it can go in straight away.

Ted

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

[Eric Abrahamsen]

Ted Zlatanov <tzz@lifelogs.com> writes:

> On Sun, 21 Dec 2014 12:39:49 +0800 Eric Abrahamsen <eric@ericabrahamsen.net> wrote: 
>
> EA> Here goes! I think this is everything. I wasn't aware that obsolete
> EA> variables still need to be defined, and am not sure what I've done is
> EA> correct. The other `make-obsolete-variable' statements in here refer to
> EA> otherwise-undefined variables.... ?
>
> The patch looks good, minus the obsolete variables.
>
> Please also add ChangeLog entries, then it can go in straight away.
>
> Ted

Okay, just to continue being deliberately dumb about this: the change is
already in lisp/ChangeLog, but not in the top-level ChangeLog, and the
patch I sent in already adds a brief mention in GNUS_NEWS. So do I also
want to put it in top-level ChangeLog?

Sorry, I'd just like to get this right!

Eric

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

[Ted Zlatanov]

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.

Ted

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

[Eric Abrahamsen]

[-- 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