SOURCES: moria.vim (NEW), 7.1.306 (NEW), 7.1.307 (NEW), 7.1.308 (NEW), 7.1....
adamg
adamg at pld-linux.org
Sat Jun 7 21:17:39 CEST 2008
Author: adamg Date: Sat Jun 7 19:17:39 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
moria.vim (NONE -> 1.1) (NEW), 7.1.306 (NONE -> 1.1) (NEW), 7.1.307 (NONE -> 1.1) (NEW), 7.1.308 (NONE -> 1.1) (NEW), 7.1.309 (NONE -> 1.1) (NEW), 7.1.310 (NONE -> 1.1) (NEW), 7.1.311 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/moria.vim
diff -u /dev/null SOURCES/moria.vim:1.1
--- /dev/null Sat Jun 7 21:17:39 2008
+++ SOURCES/moria.vim Sat Jun 7 21:17:34 2008
@@ -0,0 +1,247 @@
+if exists("g:moria_style")
+ let s:moria_style = g:moria_style
+else
+ let s:moria_style = &background
+endif
+
+if exists("g:moria_monochrome")
+ let s:moria_monochrome = g:moria_monochrome
+else
+ let s:moria_monochrome = 0
+endif
+
+if exists("g:moria_fontface")
+ let s:moria_fontface = g:moria_fontface
+else
+ let s:moria_fontface = "plain"
+endif
+
+execute "command! -nargs=1 Colo let g:moria_style = \"<args>\" | colo moria"
+
+if s:moria_style == "black" || s:moria_style == "dark"
+ set background=dark
+elseif s:moria_style == "light" || s:moria_style == "white"
+ set background=light
+else
+ let s:moria_style = &background
+endif
+
+hi clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let colors_name = "moria"
+
+if &background == "dark"
+ if s:moria_style == "dark"
+ hi Normal ctermbg=Black ctermfg=LightGray guibg=#202020 guifg=#d0d0d0 gui=none
+
+ hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
+ hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
+ elseif s:moria_style == "black"
+ hi Normal ctermbg=Black ctermfg=LightGray guibg=#000000 guifg=#d0d0d0 gui=none
+
+ hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
+ hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
+ endif
+ if s:moria_monochrome == 1
+ hi FoldColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
+ hi LineNr guifg=#a0a0a0 gui=none
+ hi MoreMsg guibg=bg guifg=#b6b6b6 gui=bold
+ hi NonText ctermfg=DarkGray guibg=bg guifg=#a0a0a0 gui=bold
+ hi Pmenu guibg=#909090 guifg=#000000 gui=none
+ hi PmenuSbar guibg=#707070 guifg=fg gui=none
+ hi PmenuThumb guibg=#d0d0d0 guifg=bg gui=none
+ hi SignColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
+ hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#4c4c4c guifg=fg gui=bold
+ hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#404040 guifg=fg gui=none
+ hi TabLine guibg=#6e6e6e guifg=fg gui=underline
+ hi TabLineFill guibg=#6e6e6e guifg=fg gui=underline
+ hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#404040 guifg=fg gui=none
+ if s:moria_fontface == "mixed"
+ hi Folded guibg=#4e4e4e guifg=#c0c0c0 gui=bold
+ else
+ hi Folded guibg=#4e4e4e guifg=#c0c0c0 gui=none
+ endif
+ else
+ hi FoldColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
+ hi LineNr guifg=#8fa5d1 gui=none
+ hi MoreMsg guibg=bg guifg=#97abd5 gui=bold
+ hi NonText ctermfg=DarkGray guibg=bg guifg=#8fa5d1 gui=bold
+ hi Pmenu guibg=#6381be guifg=#000000 gui=none
+ hi PmenuSbar guibg=#41609e guifg=fg gui=none
+ hi PmenuThumb guibg=#bdcae3 guifg=bg gui=none
+ hi SignColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
+ hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#334b7d guifg=fg gui=bold
+ hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#25365a guifg=fg gui=none
+ hi TabLine guibg=#41609e guifg=fg gui=underline
+ hi TabLineFill guibg=#41609e guifg=fg gui=underline
+ hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#25365a guifg=fg gui=none
+ if s:moria_fontface == "mixed"
+ hi Folded guibg=#4e4e4e guifg=#bdcae3 gui=bold
+ else
+ hi Folded guibg=#4e4e4e guifg=#bdcae3 gui=none
+ endif
+ endif
+ hi Cursor guibg=#ffa500 guifg=bg gui=none
+ hi DiffAdd guibg=#008b00 guifg=fg gui=none
+ hi DiffChange guibg=#00008b guifg=fg gui=none
+ hi DiffDelete guibg=#8b0000 guifg=fg gui=none
+ hi DiffText guibg=#0000cd guifg=fg gui=bold
+ hi Directory guibg=bg guifg=#1e90ff gui=none
+ hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold
+ hi IncSearch guibg=#e0cd78 guifg=#000000 gui=none
+ hi ModeMsg guibg=bg guifg=fg gui=bold
+ hi PmenuSel guibg=#e0e000 guifg=#000000 gui=none
+ hi Question guibg=bg guifg=#e8b87e gui=bold
+ hi Search guibg=#90e090 guifg=#000000 gui=none
+ hi SpecialKey guibg=bg guifg=#e8b87e gui=none
+ if has("spell")
+ hi SpellBad guisp=#ee2c2c gui=undercurl
+ hi SpellCap guisp=#2c2cee gui=undercurl
+ hi SpellLocal guisp=#2ceeee gui=undercurl
+ hi SpellRare guisp=#ee2cee gui=undercurl
+ endif
+ hi TabLineSel guibg=bg guifg=fg gui=bold
+ hi Title ctermbg=Black ctermfg=White guifg=fg gui=bold
+ if version >= 700
+ hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 gui=none
+ else
+ hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 guifg=fg gui=none
+ endif
+ hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
+ hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
+ hi WildMenu guibg=#e0e000 guifg=#000000 gui=bold
+
+ hi Comment guibg=bg guifg=#d0d0a0 gui=none
+ hi Constant guibg=bg guifg=#87df71 gui=none
+ hi Error guibg=bg guifg=#ee2c2c gui=none
+ hi Identifier guibg=bg guifg=#7ee0ce gui=none
+ hi Ignore guibg=bg guifg=bg gui=none
+ hi lCursor guibg=#00e700 guifg=#000000 gui=none
+ hi MatchParen guibg=#008b8b gui=none
+ hi PreProc guibg=bg guifg=#d7a0d7 gui=none
+ hi Special guibg=bg guifg=#e8b87e gui=none
+ hi Todo guibg=#e0e000 guifg=#000000 gui=none
+ hi Underlined ctermbg=Black ctermfg=White guibg=bg guifg=#00a0ff gui=underline
+
+ if s:moria_fontface == "mixed"
+ hi Statement guibg=bg guifg=#7ec0ee gui=bold
+ hi Type guibg=bg guifg=#f09479 gui=bold
+ else
+ hi Statement guibg=bg guifg=#7ec0ee gui=none
+ hi Type guibg=bg guifg=#f09479 gui=none
+ endif
+
+ hi htmlBold ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold
+ hi htmlBoldItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,italic
+ hi htmlBoldUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline
+ hi htmlBoldUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline,italic
+ hi htmlItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=italic
+ hi htmlUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline
+ hi htmlUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline,italic
+elseif &background == "light"
+ if s:moria_style == "light"
+ hi Normal ctermbg=White ctermfg=Black guibg=#f0f0f0 guifg=#000000 gui=none
+
+ hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
+ hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
+ elseif s:moria_style == "white"
+ hi Normal ctermbg=White ctermfg=Black guibg=#ffffff guifg=#000000 gui=none
+
+ hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
+ hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
+ endif
+ if s:moria_monochrome == 1
+ hi FoldColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
+ hi Folded guibg=#cfcfcf guifg=#404040 gui=bold
+ hi LineNr guifg=#7a7a7a gui=none
+ hi MoreMsg guibg=bg guifg=#505050 gui=bold
+ hi NonText ctermfg=DarkGray guibg=bg guifg=#7a7a7a gui=bold
+ hi Pmenu guibg=#9a9a9a guifg=#000000 gui=none
+ hi PmenuSbar guibg=#808080 guifg=fg gui=none
+ hi PmenuThumb guibg=#c0c0c0 guifg=fg gui=none
+ hi SignColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
+ hi StatusLine ctermbg=Black ctermfg=White guibg=#a0a0a0 guifg=fg gui=bold
+ hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
+ hi TabLine guibg=#cdcdcd guifg=fg gui=underline
+ hi TabLineFill guibg=#cdcdcd guifg=fg gui=underline
+ hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
+ else
+ hi FoldColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
+ hi Folded guibg=#cfcfcf guifg=#25365a gui=bold
+ hi LineNr guifg=#375288 gui=none
+ hi MoreMsg guibg=bg guifg=#2f4471 gui=bold
+ hi NonText ctermfg=DarkGray guibg=bg guifg=#375288 gui=bold
+ hi Pmenu guibg=#708bc5 guifg=#000000 gui=none
+ hi PmenuSbar guibg=#4a6db5 guifg=fg gui=none
+ hi PmenuThumb guibg=#a6b7db guifg=fg gui=none
+ hi SignColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
+ hi StatusLine ctermbg=Black ctermfg=White guibg=#8fa5d1 guifg=fg gui=bold
+ hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
+ hi TabLine guibg=#b8c6e2 guifg=fg gui=underline
+ hi TabLineFill guibg=#b8c6e2 guifg=fg gui=underline
+ hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
+ endif
+ hi Cursor guibg=#883400 guifg=bg gui=none
+ hi DiffAdd guibg=#008b00 guifg=#ffffff gui=none
+ hi DiffChange guibg=#00008b guifg=#ffffff gui=none
+ hi DiffDelete guibg=#8b0000 guifg=#ffffff gui=none
+ hi DiffText guibg=#0000cd guifg=#ffffff gui=bold
+ hi Directory guibg=bg guifg=#0000f0 gui=none
+ hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold
+ hi IncSearch guibg=#ffcd78 gui=none
+ hi ModeMsg ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
+ hi PmenuSel guibg=#ffff00 guifg=#000000 gui=none
+ hi Question guibg=bg guifg=#813f11 gui=bold
+ hi Search guibg=#a0f0a0 gui=none
+ hi SpecialKey guibg=bg guifg=#912f11 gui=none
+ if has("spell")
+ hi SpellBad guisp=#ee2c2c gui=undercurl
+ hi SpellCap guisp=#2c2cee gui=undercurl
+ hi SpellLocal guisp=#008b8b gui=undercurl
+ hi SpellRare guisp=#ee2cee gui=undercurl
+ endif
+ hi TabLineSel guibg=bg guifg=fg gui=bold
+ hi Title guifg=fg gui=bold
+ if version >= 700
+ hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 gui=none
+ else
+ hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 guifg=fg gui=none
+ endif
+ hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
+ hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
+ hi WildMenu guibg=#ffff00 guifg=fg gui=bold
+
+ hi Comment guibg=bg guifg=#786000 gui=none
+ hi Constant guibg=bg guifg=#077807 gui=none
+ hi Error guibg=bg guifg=#ee2c2c gui=none
+ hi Identifier guibg=bg guifg=#007080 gui=none
+ hi Ignore guibg=bg guifg=bg gui=none
+ hi lCursor guibg=#008000 guifg=#ffffff gui=none
+ hi MatchParen guibg=#00ffff gui=none
+ hi PreProc guibg=bg guifg=#800090 gui=none
+ hi Special guibg=bg guifg=#912f11 gui=none
+ hi Statement guibg=bg guifg=#1f3f81 gui=bold
+ hi Todo guibg=#ffff00 guifg=fg gui=none
+ hi Type guibg=bg guifg=#912f11 gui=bold
+ hi Underlined ctermbg=White ctermfg=Black guibg=bg guifg=#0000cd gui=underline
+
+ hi htmlBold ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
+ hi htmlBoldItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,italic
+ hi htmlBoldUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline
+ hi htmlBoldUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline,italic
+ hi htmlItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=italic
+ hi htmlUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline
+ hi htmlUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline,italic
+endif
+
+hi! default link bbcodeBold htmlBold
+hi! default link bbcodeBoldItalic htmlBoldItalic
+hi! default link bbcodeBoldItalicUnderline htmlBoldUnderlineItalic
+hi! default link bbcodeBoldUnderline htmlBoldUnderline
+hi! default link bbcodeItalic htmlItalic
+hi! default link bbcodeItalicUnderline htmlUnderlineItalic
+hi! default link bbcodeUnderline htmlUnderline
================================================================
Index: SOURCES/7.1.306
diff -u /dev/null SOURCES/7.1.306:1.1
--- /dev/null Sat Jun 7 21:17:39 2008
+++ SOURCES/7.1.306 Sat Jun 7 21:17:34 2008
@@ -0,0 +1,61 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.306
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.306
+Problem: Some Unicode characters are handled like word characters while
+ they are symbols.
+Solution: Adjust the table for Unicode classification.
+Files: src/mbyte.c
+
+
+*** ../vim-7.1.305/src/mbyte.c Wed Feb 20 11:27:59 2008
+--- src/mbyte.c Wed May 21 20:49:34 2008
+***************
+*** 1973,1980 ****
+ {0x205f, 0x205f, 0},
+ {0x2060, 0x27ff, 1}, /* punctuation and symbols */
+ {0x2070, 0x207f, 0x2070}, /* superscript */
+! {0x2080, 0x208f, 0x2080}, /* subscript */
+! {0x2983, 0x2998, 1},
+ {0x29d8, 0x29db, 1},
+ {0x29fc, 0x29fd, 1},
+ {0x3000, 0x3000, 0}, /* ideographic space */
+--- 1973,1982 ----
+ {0x205f, 0x205f, 0},
+ {0x2060, 0x27ff, 1}, /* punctuation and symbols */
+ {0x2070, 0x207f, 0x2070}, /* superscript */
+! {0x2080, 0x2094, 0x2080}, /* subscript */
+! {0x20a0, 0x27ff, 1}, /* all kinds of symbols */
+! {0x2800, 0x28ff, 0x2800}, /* braille */
+! {0x2900, 0x2998, 1}, /* arrows, brackets, etc. */
+ {0x29d8, 0x29db, 1},
+ {0x29fc, 0x29fd, 1},
+ {0x3000, 0x3000, 0}, /* ideographic space */
+*** ../vim-7.1.305/src/version.c Thu May 29 22:41:19 2008
+--- src/version.c Wed Jun 4 10:54:36 2008
+***************
+*** 668,669 ****
+--- 673,676 ----
+ { /* Add new patch number below this line */
++ /**/
++ 306,
+ /**/
+
+--
+Engineers are always delighted to share wisdom, even in areas in which they
+have no experience whatsoever. Their logic provides them with inherent
+insight into any field of expertise. This can be a problem when dealing with
+the illogical people who believe that knowledge can only be derived through
+experience.
+ (Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: SOURCES/7.1.307
diff -u /dev/null SOURCES/7.1.307:1.1
--- /dev/null Sat Jun 7 21:17:39 2008
+++ SOURCES/7.1.307 Sat Jun 7 21:17:34 2008
@@ -0,0 +1,821 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.307
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.307
+Problem: Many warnings when compiling with Python 2.5.
+Solution: Use ssize_t instead of int for some types. (James Vega)
+Files: src/if_python.c
+
+
+*** ../vim-7.1.306/src/if_python.c Thu Mar 8 10:20:28 2007
+--- src/if_python.c Wed May 7 16:55:44 2008
+***************
+*** 38,43 ****
+--- 38,45 ----
+ # undef HAVE_STDARG_H /* Python's config.h defines it as well. */
+ #endif
+
++ #define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #if defined(MACOS) && !defined(MACOS_X_UNIX)
+ # include "macglue.h"
+***************
+*** 55,60 ****
+--- 57,78 ----
+ # define PySequenceMethods int
+ #endif
+
++ #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
++ # define PyInt Py_ssize_t
++ # define PyInquiry lenfunc
++ # define PyIntArgFunc ssizeargfunc
++ # define PyIntIntArgFunc ssizessizeargfunc
++ # define PyIntObjArgProc ssizeobjargproc
++ # define PyIntIntObjArgProc ssizessizeobjargproc
++ #else
++ # define PyInt int
++ # define PyInquiry inquiry
++ # define PyIntArgFunc intargfunc
++ # define PyIntIntArgFunc intintargfunc
++ # define PyIntObjArgProc intobjargproc
++ # define PyIntIntObjArgProc intintobjargproc
++ #endif
++
+ /* Parser flags */
+ #define single_input 256
+ #define file_input 257
+***************
+*** 150,160 ****
+ static long(*dll_PyInt_AsLong)(PyObject *);
+ static PyObject*(*dll_PyInt_FromLong)(long);
+ static PyTypeObject* dll_PyInt_Type;
+! static PyObject*(*dll_PyList_GetItem)(PyObject *, int);
+ static PyObject*(*dll_PyList_Append)(PyObject *, PyObject *);
+! static PyObject*(*dll_PyList_New)(int size);
+! static int(*dll_PyList_SetItem)(PyObject *, int, PyObject *);
+! static int(*dll_PyList_Size)(PyObject *);
+ static PyTypeObject* dll_PyList_Type;
+ static PyObject*(*dll_PyImport_ImportModule)(const char *);
+ static PyObject*(*dll_PyDict_New)(void);
+--- 168,178 ----
+ static long(*dll_PyInt_AsLong)(PyObject *);
+ static PyObject*(*dll_PyInt_FromLong)(long);
+ static PyTypeObject* dll_PyInt_Type;
+! static PyObject*(*dll_PyList_GetItem)(PyObject *, PyInt);
+ static PyObject*(*dll_PyList_Append)(PyObject *, PyObject *);
+! static PyObject*(*dll_PyList_New)(PyInt size);
+! static int(*dll_PyList_SetItem)(PyObject *, PyInt, PyObject *);
+! static PyInt(*dll_PyList_Size)(PyObject *);
+ static PyTypeObject* dll_PyList_Type;
+ static PyObject*(*dll_PyImport_ImportModule)(const char *);
+ static PyObject*(*dll_PyDict_New)(void);
+***************
+*** 163,170 ****
+ static int(*dll_PyRun_SimpleString)(char *);
+ static char*(*dll_PyString_AsString)(PyObject *);
+ static PyObject*(*dll_PyString_FromString)(const char *);
+! static PyObject*(*dll_PyString_FromStringAndSize)(const char *, int);
+! static int(*dll_PyString_Size)(PyObject *);
+ static PyTypeObject* dll_PyString_Type;
+ static int(*dll_PySys_SetObject)(char *, PyObject *);
+ static int(*dll_PySys_SetArgv)(int, char **);
+--- 181,188 ----
+ static int(*dll_PyRun_SimpleString)(char *);
+ static char*(*dll_PyString_AsString)(PyObject *);
+ static PyObject*(*dll_PyString_FromString)(const char *);
+! static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
+! static PyInt(*dll_PyString_Size)(PyObject *);
+ static PyTypeObject* dll_PyString_Type;
+ static int(*dll_PySys_SetObject)(char *, PyObject *);
+ static int(*dll_PySys_SetArgv)(int, char **);
+***************
+*** 367,376 ****
+ * ----------------------------------------------
+ */
+ static PyObject *GetBufferLine(buf_T *, int);
+! static PyObject *GetBufferLineList(buf_T *, int, int);
+
+ static int SetBufferLine(buf_T *, int, PyObject *, int *);
+! static int SetBufferLineList(buf_T *, int, int, PyObject *, int *);
+ static int InsertBufferLines(buf_T *, int, PyObject *, int *);
+
+ static PyObject *LineToString(const char *);
+--- 385,394 ----
+ * ----------------------------------------------
+ */
+ static PyObject *GetBufferLine(buf_T *, int);
+! static PyObject *GetBufferLineList(buf_T *, PyInt, PyInt);
+
+ static int SetBufferLine(buf_T *, int, PyObject *, int *);
+! static int SetBufferLineList(buf_T *, PyInt, PyInt, PyObject *, int *);
+ static int InsertBufferLines(buf_T *, int, PyObject *, int *);
+
+ static PyObject *LineToString(const char *);
+***************
+*** 773,780 ****
+ static PyObject *
+ OutputWritelines(PyObject *self, PyObject *args)
+ {
+! int n;
+! int i;
+ PyObject *list;
+ int error = ((OutputObject *)(self))->error;
+
+--- 791,798 ----
+ static PyObject *
+ OutputWritelines(PyObject *self, PyObject *args)
+ {
+! PyInt n;
+! PyInt i;
+ PyObject *list;
+ int error = ((OutputObject *)(self))->error;
+
+***************
+*** 986,996 ****
+ static PyObject *BufferGetattr(PyObject *, char *);
+ static PyObject *BufferRepr(PyObject *);
+
+! static int BufferLength(PyObject *);
+! static PyObject *BufferItem(PyObject *, int);
+! static PyObject *BufferSlice(PyObject *, int, int);
+! static int BufferAssItem(PyObject *, int, PyObject *);
+! static int BufferAssSlice(PyObject *, int, int, PyObject *);
+
+ static PyObject *BufferAppend(PyObject *, PyObject *);
+ static PyObject *BufferMark(PyObject *, PyObject *);
+--- 1004,1014 ----
+ static PyObject *BufferGetattr(PyObject *, char *);
+ static PyObject *BufferRepr(PyObject *);
+
+! static PyInt BufferLength(PyObject *);
+! static PyObject *BufferItem(PyObject *, PyInt);
+! static PyObject *BufferSlice(PyObject *, PyInt, PyInt);
+! static PyInt BufferAssItem(PyObject *, PyInt, PyObject *);
+! static PyInt BufferAssSlice(PyObject *, PyInt, PyInt, PyObject *);
+
+ static PyObject *BufferAppend(PyObject *, PyObject *);
+ static PyObject *BufferMark(PyObject *, PyObject *);
+***************
+*** 1017,1027 ****
+ static PyObject *RangeGetattr(PyObject *, char *);
+ static PyObject *RangeRepr(PyObject *);
+
+! static int RangeLength(PyObject *);
+! static PyObject *RangeItem(PyObject *, int);
+! static PyObject *RangeSlice(PyObject *, int, int);
+! static int RangeAssItem(PyObject *, int, PyObject *);
+! static int RangeAssSlice(PyObject *, int, int, PyObject *);
+
+ static PyObject *RangeAppend(PyObject *, PyObject *);
+
+--- 1035,1045 ----
+ static PyObject *RangeGetattr(PyObject *, char *);
+ static PyObject *RangeRepr(PyObject *);
+
+! static PyInt RangeLength(PyObject *);
+! static PyObject *RangeItem(PyObject *, PyInt);
+! static PyObject *RangeSlice(PyObject *, PyInt, PyInt);
+! static PyInt RangeAssItem(PyObject *, PyInt, PyObject *);
+! static PyInt RangeAssSlice(PyObject *, PyInt, PyInt, PyObject *);
+
+ static PyObject *RangeAppend(PyObject *, PyObject *);
+
+***************
+*** 1029,1043 ****
+ * -------------------------------------------
+ */
+
+! static int WinListLength(PyObject *);
+! static PyObject *WinListItem(PyObject *, int);
+
+ /* Buffer list type - Implementation functions
+ * -------------------------------------------
+ */
+
+! static int BufListLength(PyObject *);
+! static PyObject *BufListItem(PyObject *, int);
+
+ /* Current objects type - Implementation functions
+ * -----------------------------------------------
+--- 1047,1061 ----
+ * -------------------------------------------
+ */
+
+! static PyInt WinListLength(PyObject *);
+! static PyObject *WinListItem(PyObject *, PyInt);
+
+ /* Buffer list type - Implementation functions
+ * -------------------------------------------
+ */
+
+! static PyInt BufListLength(PyObject *);
+! static PyObject *BufListItem(PyObject *, PyInt);
+
+ /* Current objects type - Implementation functions
+ * -----------------------------------------------
+***************
+*** 1130,1135 ****
+--- 1148,1163 ----
+ result = Py_BuildValue("s", buf);
+ PyDict_SetItemString(lookupDict, ptrBuf, result);
+ }
++ #ifdef FEAT_FLOAT
++ else if (our_tv->v_type == VAR_FLOAT)
++ {
++ char buf[NUMBUFLEN];
++
++ sprintf(buf, "%f", our_tv->vval.v_float);
++ result = Py_BuildValue("s", buf);
++ PyDict_SetItemString(lookupDict, ptrBuf, result);
++ }
++ #endif
+ else if (our_tv->v_type == VAR_LIST)
+ {
+ list_T *list = our_tv->vval.v_list;
+***************
+*** 1245,1251 ****
+ }
+
+ static PyObject *
+! RBItem(BufferObject *self, int n, int start, int end)
+ {
+ if (CheckBuffer(self))
+ return NULL;
+--- 1273,1279 ----
+ }
+
+ static PyObject *
+! RBItem(BufferObject *self, PyInt n, int start, int end)
+ {
+ if (CheckBuffer(self))
+ return NULL;
+***************
+*** 1260,1268 ****
+ }
+
+ static PyObject *
+! RBSlice(BufferObject *self, int lo, int hi, int start, int end)
+ {
+! int size;
+
+ if (CheckBuffer(self))
+ return NULL;
+--- 1288,1296 ----
+ }
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list