Skip to content

Commit 98f9bf5

Browse files
authored
Merge pull request bruderstein#111 from chcg/docu_update
fix for bruderstein#110
2 parents c2495d7 + 2c04fe0 commit 98f9bf5

File tree

5 files changed

+211
-230
lines changed

5 files changed

+211
-230
lines changed

PythonScript/src/Scintilla.iface

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ enu IMEInteraction=SC_IME_
248248
val SC_IME_WINDOWED=0
249249
val SC_IME_INLINE=1
250250

251-
# Is the IME displayed in a winow or inline?
251+
# Is the IME displayed in a window or inline?
252252
get int GetIMEInteraction=2678(,)
253253

254-
# Choose to display the the IME in a winow or inline.
254+
# Choose to display the the IME in a window or inline.
255255
set void SetIMEInteraction=2679(int imeInteraction,)
256256

257257
enu MarkerSymbol=SC_MARK_
@@ -1396,7 +1396,7 @@ val SC_MULTIPASTE_EACH=1
13961396
# Change the effect of pasting when there are multiple selections.
13971397
set void SetMultiPaste=2614(int multiPaste,)
13981398

1399-
# Retrieve the effect of pasting when there are multiple selections..
1399+
# Retrieve the effect of pasting when there are multiple selections.
14001400
get int GetMultiPaste=2615(,)
14011401

14021402
# Retrieve the value of a tag from a regular expression search.
@@ -1413,8 +1413,9 @@ fun void LinesJoin=2288(,)
14131413
# where possible.
14141414
fun void LinesSplit=2289(int pixelWidth,)
14151415

1416-
# Set the colours used as a chequerboard pattern in the fold margin
1416+
# Set one of the colours used as a chequerboard pattern in the fold margin
14171417
fun void SetFoldMarginColour=2290(bool useSetting, colour back)
1418+
# Set the other colour used as a chequerboard pattern in the fold margin
14181419
fun void SetFoldMarginHiColour=2291(bool useSetting, colour fore)
14191420

14201421
## New messages go here
@@ -1578,17 +1579,28 @@ fun void LineEndDisplay=2347(,)
15781579
# caret position.
15791580
fun void LineEndDisplayExtend=2348(,)
15801581

1581-
# These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
1582-
# except they behave differently when word-wrap is enabled:
1583-
# They go first to the start / end of the display line, like (Home|LineEnd)Display
1584-
# The difference is that, the cursor is already at the point, it goes on to the start
1585-
# or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
1586-
1582+
# Like Home but when word-wrap is enabled goes first to start of display line
1583+
# HomeDisplay, then to start of document line Home.
15871584
fun void HomeWrap=2349(,)
1585+
1586+
# Like HomeExtend but when word-wrap is enabled extends first to start of display line
1587+
# HomeDisplayExtend, then to start of document line HomeExtend.
15881588
fun void HomeWrapExtend=2450(,)
1589+
1590+
# Like LineEnd but when word-wrap is enabled goes first to end of display line
1591+
# LineEndDisplay, then to start of document line LineEnd.
15891592
fun void LineEndWrap=2451(,)
1593+
1594+
# Like LineEndExtend but when word-wrap is enabled extends first to end of display line
1595+
# LineEndDisplayExtend, then to start of document line LineEndExtend.
15901596
fun void LineEndWrapExtend=2452(,)
1597+
1598+
# Like VCHome but when word-wrap is enabled goes first to start of display line
1599+
# VCHomeDisplay, then behaves like VCHome.
15911600
fun void VCHomeWrap=2453(,)
1601+
1602+
# Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
1603+
# VCHomeDisplayExtend, then behaves like VCHomeExtend.
15921604
fun void VCHomeWrapExtend=2454(,)
15931605

15941606
# Copy the line containing the caret.
@@ -1755,8 +1767,10 @@ fun void DelLineLeft=2395(,)
17551767
# Delete forwards from the current position to the end of the line.
17561768
fun void DelLineRight=2396(,)
17571769

1758-
# Get and Set the xOffset (ie, horizontal scroll position).
1770+
# Set the xOffset (ie, horizontal scroll position).
17591771
set void SetXOffset=2397(int newOffset,)
1772+
1773+
# Get the xOffset (ie, horizontal scroll position).
17601774
get int GetXOffset=2398(,)
17611775

17621776
# Set the last x chosen value to be the caret x position.
@@ -1785,7 +1799,7 @@ val CARET_STRICT=0x04
17851799
val CARET_JUMPS=0x10
17861800
# If CARET_EVEN is not set, instead of having symmetrical UZs,
17871801
# the left and bottom UZs are extended up to right and top UZs respectively.
1788-
# This way, we favour the displaying of useful information: the begining of lines,
1802+
# This way, we favour the displaying of useful information: the beginning of lines,
17891803
# where most code reside, and the lines after the caret, eg. the body of a function.
17901804
val CARET_EVEN=0x08
17911805

@@ -1827,10 +1841,13 @@ set void SetHotspotSingleLine=2421(bool singleLine,)
18271841
# Get the HotspotSingleLine property
18281842
get bool GetHotspotSingleLine=2497(,)
18291843

1830-
# Move caret between paragraphs (delimited by empty lines).
1844+
# Move caret down one paragraph (delimited by empty lines).
18311845
fun void ParaDown=2413(,)
1846+
# Extend selection down one paragraph (delimited by empty lines).
18321847
fun void ParaDownExtend=2414(,)
1848+
# Move caret up one paragraph (delimited by empty lines).
18331849
fun void ParaUp=2415(,)
1850+
# Extend selection up one paragraph (delimited by empty lines).
18341851
fun void ParaUpExtend=2416(,)
18351852

18361853
# Given a valid document position, return the previous position taking code
@@ -1968,7 +1985,7 @@ val SC_MULTIAUTOC_EACH=1
19681985
# Change the effect of autocompleting when there are multiple selections.
19691986
set void AutoCSetMulti=2636(int multi,)
19701987

1971-
# Retrieve the effect of autocompleting when there are multiple selections..
1988+
# Retrieve the effect of autocompleting when there are multiple selections.
19721989
get int AutoCGetMulti=2637(,)
19731990

19741991
enu Ordering=SC_ORDER_
@@ -2276,13 +2293,21 @@ set void SetMainSelection=2574(int selection,)
22762293
# Which selection is the main selection
22772294
get int GetMainSelection=2575(,)
22782295

2296+
# Set the caret position of the nth selection.
22792297
set void SetSelectionNCaret=2576(int selection, position pos)
2298+
# Return the caret position of the nth selection.
22802299
get position GetSelectionNCaret=2577(int selection,)
2300+
# Set the anchor position of the nth selection.
22812301
set void SetSelectionNAnchor=2578(int selection, position posAnchor)
2302+
# Return the anchor position of the nth selection.
22822303
get position GetSelectionNAnchor=2579(int selection,)
2304+
# Set the virtual space of the caret of the nth selection.
22832305
set void SetSelectionNCaretVirtualSpace=2580(int selection, int space)
2306+
# Return the virtual space of the caret of the nth selection.
22842307
get int GetSelectionNCaretVirtualSpace=2581(int selection,)
2308+
# Set the virtual space of the anchor of the nth selection.
22852309
set void SetSelectionNAnchorVirtualSpace=2582(int selection, int space)
2310+
# Return the virtual space of the anchor of the nth selection.
22862311
get int GetSelectionNAnchorVirtualSpace=2583(int selection,)
22872312

22882313
# Sets the position that starts the selection - this becomes the anchor.
@@ -2297,21 +2322,31 @@ set void SetSelectionNEnd=2586(int selection, position pos)
22972322
# Returns the position at the end of the selection.
22982323
get position GetSelectionNEnd=2587(int selection,)
22992324

2325+
# Set the caret position of the rectangular selection.
23002326
set void SetRectangularSelectionCaret=2588(position pos,)
2327+
# Return the caret position of the rectangular selection.
23012328
get position GetRectangularSelectionCaret=2589(,)
2329+
# Set the anchor position of the rectangular selection.
23022330
set void SetRectangularSelectionAnchor=2590(position posAnchor,)
2331+
# Return the anchor position of the rectangular selection.
23032332
get position GetRectangularSelectionAnchor=2591(,)
2333+
# Set the virtual space of the caret of the rectangular selection.
23042334
set void SetRectangularSelectionCaretVirtualSpace=2592(int space,)
2335+
# Return the virtual space of the caret of the rectangular selection.
23052336
get int GetRectangularSelectionCaretVirtualSpace=2593(,)
2337+
# Set the virtual space of the anchor of the rectangular selection.
23062338
set void SetRectangularSelectionAnchorVirtualSpace=2594(int space,)
2339+
# Return the virtual space of the anchor of the rectangular selection.
23072340
get int GetRectangularSelectionAnchorVirtualSpace=2595(,)
23082341

23092342
enu VirtualSpace=SCVS_
23102343
val SCVS_NONE=0
23112344
val SCVS_RECTANGULARSELECTION=1
23122345
val SCVS_USERACCESSIBLE=2
23132346

2347+
# Set options for virtual space behaviour.
23142348
set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,)
2349+
# Return options for virtual space behaviour.
23152350
get int GetVirtualSpaceOptions=2597(,)
23162351

23172352
# On GTK+, allow selecting the modifier key to use for mouse-based

0 commit comments

Comments
 (0)