vim: src/memline.c comparison

Change 'cryptmethod' from a number to a string option. Make it global-local.

comparison

equal deleted inserted replaced

-:496feb41b83f
+:d8e4b27cef80
 {
 if (*buf->b_p_key == NUL)
 	b0p->b0_id[1] = BLOCK0_ID1;
 else
 {
-	if (buf->b_p_cm == 0)
+	if (get_crypt_method(buf) == 0)
 	    b0p->b0_id[1] = BLOCK0_ID1_C0;
 	else
 	{
 	    b0p->b0_id[1] = BLOCK0_ID1_C1;
 	    /* Generate a seed and store it in block 0 and in the memfile. */
 /*
 * Called after the crypt key or 'cryptmethod' was changed for "buf".
 * Will apply this to the swapfile.
 * "old_key" is the previous key.  It is equal to buf->b_p_key when
 * 'cryptmethod' is changed.
-* "old_cm" is the previous 'cryptmethod'.  It is equal to buf->b_p_cm when
+* "old_cm" is the previous 'cryptmethod'.  It is equal to the current
-* 'key' is changed.
+* 'cryptmethod' when 'key' is changed.
 */
 void
 ml_set_crypt_key(buf, old_key, old_cm)
 buf_T	*buf;
 char_u	*old_key;
 	goto theend;
 }
 #ifdef FEAT_CRYPT
 if (b0p->b0_id[1] == BLOCK0_ID1_C0)
-	buf->b_p_cm = b0_cm = 0;
+	b0_cm = 0;
 else if (b0p->b0_id[1] == BLOCK0_ID1_C1)
 {
-	buf->b_p_cm = b0_cm = 1;
+	b0_cm = 1;
 	mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN);
 }
+set_crypt_method(buf, b0_cm);
 #else
 if (b0p->b0_id[1] != BLOCK0_ID1)
 {
 	EMSG2(_("E833: %s is encrypted and this version of Vim does not support encryption"), mfp->mf_fname);
 	goto theend;
 	key = mfp->mf_old_key;
 	seed = mfp->mf_old_seed;
 }
 else
 {
-	method = buf->b_p_cm;
+	method = get_crypt_method(buf);
 	key = buf->b_p_key;
 	seed = mfp->mf_seed;
 }
 use_crypt_method = method;  /* select pkzip or blowfish */

Mercurial > vim