aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-06-22 09:57:51 +1000
committerNeil <nyamatongwe@gmail.com>2019-06-22 09:57:51 +1000
commit749a53e09107c8720b917503fdb3257d1e624190 (patch)
tree68967d4c4447ed656221e716953cf75cbccf91de
parent4a8fbf62e45f8a5eb6ad06554c7b7ba8b402a5e5 (diff)
downloadscintilla-mirror-749a53e09107c8720b917503fdb3257d1e624190.tar.gz
Backport: Feature [feature-requests:#1297] Tweak aliases so that acronyms longer than 2
characters are treated as words and are also good SNAKE_CASE. This is consistent with coding guidelines such as from Google and Microsoft. https://google.github.io/styleguide/cppguide.html#General_Naming_Rules Backport of changeset 7592:d96faf819aba.
-rw-r--r--include/Scintilla.iface12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index eaea53334..9dc7cbac6 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -341,7 +341,7 @@ ali SC_MARK_CIRCLEMINUSCONNECTED=CIRCLE_MINUS_CONNECTED
ali SC_MARK_DOTDOTDOT=DOT_DOT_DOT
ali SC_MARK_FULLRECT=FULL_RECT
ali SC_MARK_LEFTRECT=LEFT_RECT
-ali SC_MARK_RGBAIMAGE=R_G_B_A_IMAGE
+ali SC_MARK_RGBAIMAGE=RGBA_IMAGE
ali SC_MARK_VERTICALBOOKMARK=VERTICAL_BOOKMARK
enu MarkerOutline=SC_MARKNUM_
@@ -513,10 +513,9 @@ val SC_CHARSET_8859_15=1000
ali SC_CHARSET_CHINESEBIG5=CHINESE_BIG5
ali SC_CHARSET_EASTEUROPE=EAST_EUROPE
ali SC_CHARSET_GB2312=G_B_2312
-ali SC_CHARSET_OEM=O_E_M
-ali SC_CHARSET_OEM866=O_E_M_866
-ali SC_CHARSET_SHIFTJIS=SHIFT_J_I_S
-ali SC_CHARSET_8859_15=I_S_O_8859_15
+ali SC_CHARSET_OEM866=OEM_866
+ali SC_CHARSET_SHIFTJIS=SHIFT_JIS
+ali SC_CHARSET_8859_15=ISO_8859_15
# Clear all the styles and make equivalent to the global default style.
fun void StyleClearAll=2050(,)
@@ -1062,8 +1061,7 @@ ali SCFIND_WHOLEWORD=WHOLE_WORD
ali SCFIND_MATCHCASE=MATCH_CASE
ali SCFIND_WORDSTART=WORD_START
ali SCFIND_REGEXP=REG_EXP
-ali SCFIND_POSIX=P_O_S_I_X
-ali SCFIND_CXX11REGEX=C_X_X_11_REG_EX
+ali SCFIND_CXX11REGEX=CXX11_REG_EX
# Find some text in the document.
fun position FindText=2150(FindOption searchFlags, findtext ft)