]>
Commit | Line | Data |
---|---|---|
7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.133 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.133 | |
11 | Problem: When using encryption it's not clear what method was used. | |
12 | Solution: In the file message show "blowfish" when using blowfish. | |
13 | Files: src/fileio.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.132/src/fileio.c 2011-02-15 17:39:14.000000000 +0100 | |
17 | --- src/fileio.c 2011-02-25 16:30:19.000000000 +0100 | |
18 | *************** | |
19 | *** 250,255 **** | |
20 | --- 250,256 ---- | |
21 | #ifdef FEAT_CRYPT | |
22 | char_u *cryptkey = NULL; | |
23 | int did_ask_for_key = FALSE; | |
24 | + int crypt_method_used; | |
25 | #endif | |
26 | #ifdef FEAT_PERSISTENT_UNDO | |
27 | context_sha256_T sha_ctx; | |
28 | *************** | |
29 | *** 2289,2294 **** | |
30 | --- 2290,2296 ---- | |
31 | save_file_ff(curbuf); /* remember the current file format */ | |
32 | ||
33 | #ifdef FEAT_CRYPT | |
34 | + crypt_method_used = use_crypt_method; | |
35 | if (cryptkey != NULL) | |
36 | { | |
37 | crypt_pop_state(); | |
38 | *************** | |
39 | *** 2483,2489 **** | |
40 | #ifdef FEAT_CRYPT | |
41 | if (cryptkey != NULL) | |
42 | { | |
43 | ! STRCAT(IObuff, _("[crypted]")); | |
44 | c = TRUE; | |
45 | } | |
46 | #endif | |
47 | --- 2485,2494 ---- | |
48 | #ifdef FEAT_CRYPT | |
49 | if (cryptkey != NULL) | |
50 | { | |
51 | ! if (crypt_method_used == 1) | |
52 | ! STRCAT(IObuff, _("[blowfish]")); | |
53 | ! else | |
54 | ! STRCAT(IObuff, _("[crypted]")); | |
55 | c = TRUE; | |
56 | } | |
57 | #endif | |
58 | *************** | |
59 | *** 3199,3204 **** | |
60 | --- 3204,3212 ---- | |
61 | int write_undo_file = FALSE; | |
62 | context_sha256_T sha_ctx; | |
63 | #endif | |
64 | + #ifdef FEAT_CRYPT | |
65 | + int crypt_method_used; | |
66 | + #endif | |
67 | ||
68 | if (fname == NULL || *fname == NUL) /* safety check */ | |
69 | return FAIL; | |
70 | *************** | |
71 | *** 4728,4733 **** | |
72 | --- 4736,4742 ---- | |
73 | mch_set_acl(wfname, acl); | |
74 | #endif | |
75 | #ifdef FEAT_CRYPT | |
76 | + crypt_method_used = use_crypt_method; | |
77 | if (wb_flags & FIO_ENCRYPTED) | |
78 | crypt_pop_state(); | |
79 | #endif | |
80 | *************** | |
81 | *** 4882,4888 **** | |
82 | #ifdef FEAT_CRYPT | |
83 | if (wb_flags & FIO_ENCRYPTED) | |
84 | { | |
85 | ! STRCAT(IObuff, _("[crypted]")); | |
86 | c = TRUE; | |
87 | } | |
88 | #endif | |
89 | --- 4891,4900 ---- | |
90 | #ifdef FEAT_CRYPT | |
91 | if (wb_flags & FIO_ENCRYPTED) | |
92 | { | |
93 | ! if (crypt_method_used == 1) | |
94 | ! STRCAT(IObuff, _("[blowfish]")); | |
95 | ! else | |
96 | ! STRCAT(IObuff, _("[crypted]")); | |
97 | c = TRUE; | |
98 | } | |
99 | #endif | |
100 | *** ../vim-7.3.132/src/version.c 2011-02-25 15:18:46.000000000 +0100 | |
101 | --- src/version.c 2011-02-25 16:42:58.000000000 +0100 | |
102 | *************** | |
103 | *** 716,717 **** | |
104 | --- 716,719 ---- | |
105 | { /* Add new patch number below this line */ | |
106 | + /**/ | |
107 | + 133, | |
108 | /**/ | |
109 | ||
110 | -- | |
111 | [clop clop] | |
112 | GUARD #1: Halt! Who goes there? | |
113 | ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of | |
114 | Camelot. King of the Britons, defeator of the Saxons, sovereign of | |
115 | all England! | |
116 | GUARD #1: Pull the other one! | |
117 | The Quest for the Holy Grail (Monty Python) | |
118 | ||
119 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
120 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
121 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
122 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |