projects / people / ms / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.263 | |
| 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.263 | |
| 11 | Problem: Perl and Tcl have a few code style problems. | |
| 12 | Solution: Clean it up. (Elias Diem) | |
| 13 | Files: src/if_perl.xs, src/if_tcl.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.262/src/if_perl.xs 2010-10-23 14:02:48.000000000 +0200 | |
| 17 | --- src/if_perl.xs 2011-07-27 14:11:03.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 755,761 **** | |
| 20 | #ifdef HAVE_SANDBOX | |
| 21 | if (sandbox) | |
| 22 | { | |
| 23 | ! safe = perl_get_sv( "VIM::safe", FALSE ); | |
| 24 | # ifndef MAKE_TEST /* avoid a warning for unreachable code */ | |
| 25 | if (safe == NULL || !SvTRUE(safe)) | |
| 26 | EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); | |
| 27 | --- 755,761 ---- | |
| 28 | #ifdef HAVE_SANDBOX | |
| 29 | if (sandbox) | |
| 30 | { | |
| 31 | ! safe = perl_get_sv("VIM::safe", FALSE); | |
| 32 | # ifndef MAKE_TEST /* avoid a warning for unreachable code */ | |
| 33 | if (safe == NULL || !SvTRUE(safe)) | |
| 34 | EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); | |
| 35 | *************** | |
| 36 | *** 1108,1114 **** | |
| 37 | VIWIN win | |
| 38 | ||
| 39 | PPCODE: | |
| 40 | ! if(items == 1) | |
| 41 | { | |
| 42 | EXTEND(sp, 2); | |
| 43 | if (!win_valid(win)) | |
| 44 | --- 1108,1114 ---- | |
| 45 | VIWIN win | |
| 46 | ||
| 47 | PPCODE: | |
| 48 | ! if (items == 1) | |
| 49 | { | |
| 50 | EXTEND(sp, 2); | |
| 51 | if (!win_valid(win)) | |
| 52 | *************** | |
| 53 | *** 1116,1122 **** | |
| 54 | PUSHs(sv_2mortal(newSViv(win->w_cursor.lnum))); | |
| 55 | PUSHs(sv_2mortal(newSViv(win->w_cursor.col))); | |
| 56 | } | |
| 57 | ! else if(items == 3) | |
| 58 | { | |
| 59 | int lnum, col; | |
| 60 | ||
| 61 | --- 1116,1122 ---- | |
| 62 | PUSHs(sv_2mortal(newSViv(win->w_cursor.lnum))); | |
| 63 | PUSHs(sv_2mortal(newSViv(win->w_cursor.col))); | |
| 64 | } | |
| 65 | ! else if (items == 3) | |
| 66 | { | |
| 67 | int lnum, col; | |
| 68 | ||
| 69 | *************** | |
| 70 | *** 1249,1257 **** | |
| 71 | { | |
| 72 | lnum = SvIV(ST(1)); | |
| 73 | count = 1 + SvIV(ST(2)) - lnum; | |
| 74 | ! if(count == 0) | |
| 75 | count = 1; | |
| 76 | ! if(count < 0) | |
| 77 | { | |
| 78 | lnum -= count; | |
| 79 | count = -count; | |
| 80 | --- 1249,1257 ---- | |
| 81 | { | |
| 82 | lnum = SvIV(ST(1)); | |
| 83 | count = 1 + SvIV(ST(2)) - lnum; | |
| 84 | ! if (count == 0) | |
| 85 | count = 1; | |
| 86 | ! if (count < 0) | |
| 87 | { | |
| 88 | lnum -= count; | |
| 89 | count = -count; | |
| 90 | *** ../vim-7.3.262/src/if_tcl.c 2010-12-17 20:23:56.000000000 +0100 | |
| 91 | --- src/if_tcl.c 2011-07-27 14:11:03.000000000 +0200 | |
| 92 | *************** | |
| 93 | *** 1884,1897 **** | |
| 94 | { | |
| 95 | int newerr = OK; | |
| 96 | ||
| 97 | ! if (error == TCL_EXIT ) | |
| 98 | { | |
| 99 | int retval; | |
| 100 | char buf[50]; | |
| 101 | Tcl_Obj *robj; | |
| 102 | ||
| 103 | robj = Tcl_GetObjResult(tclinfo.interp); | |
| 104 | ! if( Tcl_GetIntFromObj(tclinfo.interp, robj, &retval) != TCL_OK ) | |
| 105 | { | |
| 106 | EMSG(_("E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org")); | |
| 107 | newerr = FAIL; | |
| 108 | --- 1884,1897 ---- | |
| 109 | { | |
| 110 | int newerr = OK; | |
| 111 | ||
| 112 | ! if (error == TCL_EXIT) | |
| 113 | { | |
| 114 | int retval; | |
| 115 | char buf[50]; | |
| 116 | Tcl_Obj *robj; | |
| 117 | ||
| 118 | robj = Tcl_GetObjResult(tclinfo.interp); | |
| 119 | ! if (Tcl_GetIntFromObj(tclinfo.interp, robj, &retval) != TCL_OK) | |
| 120 | { | |
| 121 | EMSG(_("E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org")); | |
| 122 | newerr = FAIL; | |
| 123 | *************** | |
| 124 | *** 1900,1906 **** | |
| 125 | { | |
| 126 | sprintf(buf, _("E572: exit code %d"), retval); | |
| 127 | tclerrmsg(buf); | |
| 128 | ! if (retval == 0 ) | |
| 129 | { | |
| 130 | did_emsg = 0; | |
| 131 | newerr = OK; | |
| 132 | --- 1900,1906 ---- | |
| 133 | { | |
| 134 | sprintf(buf, _("E572: exit code %d"), retval); | |
| 135 | tclerrmsg(buf); | |
| 136 | ! if (retval == 0) | |
| 137 | { | |
| 138 | did_emsg = 0; | |
| 139 | newerr = OK; | |
| 140 | *** ../vim-7.3.262/src/version.c 2011-07-27 14:09:05.000000000 +0200 | |
| 141 | --- src/version.c 2011-07-27 14:12:05.000000000 +0200 | |
| 142 | *************** | |
| 143 | *** 711,712 **** | |
| 144 | --- 711,714 ---- | |
| 145 | { /* Add new patch number below this line */ | |
| 146 | + /**/ | |
| 147 | + 263, | |
| 148 | /**/ | |
| 149 | ||
| 150 | -- | |
| 151 | DEAD PERSON: I don't want to go in the cart! | |
| 152 | CUSTOMER: Oh, don't be such a baby. | |
| 153 | MORTICIAN: I can't take him... | |
| 154 | DEAD PERSON: I feel fine! | |
| 155 | CUSTOMER: Oh, do us a favor... | |
| 156 | MORTICIAN: I can't. | |
| 157 | The Quest for the Holy Grail (Monty Python) | |
| 158 | ||
| 159 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 160 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 161 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 162 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |