* packet.h, getkey.c (fixup_uidnode, merge_selfsigs_subkey): Keep track of

which self-sig we actually chose.

* keyedit.c (menu_expire, menu_set_primary_uid, menu_set_preferences): Use
it here to avoid updating non-used self-sigs and possibly promoting an old
self-sig into consideration again.

g10/packet.h

@@ -125,6 +125,7 @@ typedef struct {
     struct {
 	unsigned checked:1; /* signature has been checked */
 	unsigned valid:1;   /* signature is good (if checked is set) */
+        unsigned chosen_selfsig:1; /* a selfsig that is the chosen one */
 	unsigned unknown_critical:1;
         unsigned exportable:1;
         unsigned revocable:1;