]>
Commit | Line | Data |
---|---|---|
8bb52fd3 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.599 | |
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.599 (after 7.3.597) | |
11 | Problem: Missing change in one file. | |
12 | Solution: Patch for changed clip_autoselect(). | |
13 | Files: src/option.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.598/src/option.c 2012-06-29 15:51:26.000000000 +0200 | |
17 | --- src/option.c 2012-07-10 16:35:07.000000000 +0200 | |
18 | *************** | |
19 | *** 7377,7383 **** | |
20 | check_clipboard_option() | |
21 | { | |
22 | int new_unnamed = 0; | |
23 | ! int new_autoselect = FALSE; | |
24 | int new_autoselectml = FALSE; | |
25 | int new_html = FALSE; | |
26 | regprog_T *new_exclude_prog = NULL; | |
27 | --- 7377,7384 ---- | |
28 | check_clipboard_option() | |
29 | { | |
30 | int new_unnamed = 0; | |
31 | ! int new_autoselect_star = FALSE; | |
32 | ! int new_autoselect_plus = FALSE; | |
33 | int new_autoselectml = FALSE; | |
34 | int new_html = FALSE; | |
35 | regprog_T *new_exclude_prog = NULL; | |
36 | *************** | |
37 | *** 7398,7410 **** | |
38 | p += 11; | |
39 | } | |
40 | else if (STRNCMP(p, "autoselect", 10) == 0 | |
41 | ! && (p[10] == ',' || p[10] == NUL)) | |
42 | { | |
43 | ! new_autoselect = TRUE; | |
44 | p += 10; | |
45 | } | |
46 | else if (STRNCMP(p, "autoselectml", 12) == 0 | |
47 | ! && (p[12] == ',' || p[12] == NUL)) | |
48 | { | |
49 | new_autoselectml = TRUE; | |
50 | p += 12; | |
51 | --- 7399,7417 ---- | |
52 | p += 11; | |
53 | } | |
54 | else if (STRNCMP(p, "autoselect", 10) == 0 | |
55 | ! && (p[10] == ',' || p[10] == NUL)) | |
56 | { | |
57 | ! new_autoselect_star = TRUE; | |
58 | p += 10; | |
59 | } | |
60 | + else if (STRNCMP(p, "autoselectplus", 14) == 0 | |
61 | + && (p[14] == ',' || p[14] == NUL)) | |
62 | + { | |
63 | + new_autoselect_plus = TRUE; | |
64 | + p += 14; | |
65 | + } | |
66 | else if (STRNCMP(p, "autoselectml", 12) == 0 | |
67 | ! && (p[12] == ',' || p[12] == NUL)) | |
68 | { | |
69 | new_autoselectml = TRUE; | |
70 | p += 12; | |
71 | *************** | |
72 | *** 7433,7439 **** | |
73 | if (errmsg == NULL) | |
74 | { | |
75 | clip_unnamed = new_unnamed; | |
76 | ! clip_autoselect = new_autoselect; | |
77 | clip_autoselectml = new_autoselectml; | |
78 | clip_html = new_html; | |
79 | vim_free(clip_exclude_prog); | |
80 | --- 7440,7447 ---- | |
81 | if (errmsg == NULL) | |
82 | { | |
83 | clip_unnamed = new_unnamed; | |
84 | ! clip_autoselect_star = new_autoselect_star; | |
85 | ! clip_autoselect_plus = new_autoselect_plus; | |
86 | clip_autoselectml = new_autoselectml; | |
87 | clip_html = new_html; | |
88 | vim_free(clip_exclude_prog); | |
89 | *** ../vim-7.3.598/src/version.c 2012-07-10 17:14:50.000000000 +0200 | |
90 | --- src/version.c 2012-07-10 18:30:17.000000000 +0200 | |
91 | *************** | |
92 | *** 716,717 **** | |
93 | --- 716,719 ---- | |
94 | { /* Add new patch number below this line */ | |
95 | + /**/ | |
96 | + 599, | |
97 | /**/ | |
98 | ||
99 | -- | |
100 | hundred-and-one symptoms of being an internet addict: | |
101 | 108. While reading a magazine, you look for the Zoom icon for a better | |
102 | look at a photograph. | |
103 | ||
104 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
105 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
106 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
107 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |